From 4f27efd3f527e06dadcb22ecf4e711da1d002360 Mon Sep 17 00:00:00 2001
From: haruyukilxz <lxz@ilxz.me>
Date: Wed, 8 Aug 2018 14:37:20 +0800
Subject: [PATCH] remove clang depend

Change-Id: I4f7363c0a716dd33a380754a738fe9cf9cd9fdab
---
 debian/control                                         | 1 -
 frame/CMakeLists.txt                                   | 2 +-
 frame/item/{resources.qrc => item.qrc}                 | 0
 plugins/datetime/CMakeLists.txt                        | 2 +-
 plugins/datetime/{resources.qrc => datetime.qrc}       | 0
 plugins/network/CMakeLists.txt                         | 2 +-
 plugins/network/{resources.qrc => network.qrc}         | 0
 plugins/shutdown/CMakeLists.txt                        | 2 +-
 plugins/shutdown/{resources.qrc => shutdown.qrc}       | 0
 plugins/sound/CMakeLists.txt                           | 2 +-
 plugins/sound/resources/{resources.qrc => sound.qrc}   | 0
 plugins/system-tray/CMakeLists.txt                     | 2 +-
 plugins/system-tray/{resources.qrc => system-tray.qrc} | 0
 13 files changed, 6 insertions(+), 7 deletions(-)
 rename frame/item/{resources.qrc => item.qrc} (100%)
 rename plugins/datetime/{resources.qrc => datetime.qrc} (100%)
 rename plugins/network/{resources.qrc => network.qrc} (100%)
 rename plugins/shutdown/{resources.qrc => shutdown.qrc} (100%)
 rename plugins/sound/resources/{resources.qrc => sound.qrc} (100%)
 rename plugins/system-tray/{resources.qrc => system-tray.qrc} (100%)

diff --git a/debian/control b/debian/control
index 742a759a2..8fca036f0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 8.0.0), pkg-config,
  libdframeworkdbus-dev,
  libgsettings-qt-dev,
  cmake,
- clang,
  libdde-network-utils-dev
 Standards-Version: 3.9.8
 Homepage: http://www.deepin.org/
diff --git a/frame/CMakeLists.txt b/frame/CMakeLists.txt
index f4bd8183f..8dc490f3b 100644
--- a/frame/CMakeLists.txt
+++ b/frame/CMakeLists.txt
@@ -20,7 +20,7 @@ pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
 pkg_check_modules(QGSettings REQUIRED gsettings-qt)
 
 # driver-manager
-add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} item/resources.qrc frame.qrc)
+add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} item/item.qrc frame.qrc)
 target_include_directories(${BIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
                                               ${XCB_EWMH_INCLUDE_DIRS}
                                               ${DFrameworkDBus_INCLUDE_DIRS}
diff --git a/frame/item/resources.qrc b/frame/item/item.qrc
similarity index 100%
rename from frame/item/resources.qrc
rename to frame/item/item.qrc
diff --git a/plugins/datetime/CMakeLists.txt b/plugins/datetime/CMakeLists.txt
index 83faf795f..346652900 100644
--- a/plugins/datetime/CMakeLists.txt
+++ b/plugins/datetime/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
-add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+add_library(${PLUGIN_NAME} SHARED ${SRCS} datetime.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces)
 target_link_libraries(${PLUGIN_NAME} PRIVATE
diff --git a/plugins/datetime/resources.qrc b/plugins/datetime/datetime.qrc
similarity index 100%
rename from plugins/datetime/resources.qrc
rename to plugins/datetime/datetime.qrc
diff --git a/plugins/network/CMakeLists.txt b/plugins/network/CMakeLists.txt
index 9cae2c00d..a16044064 100644
--- a/plugins/network/CMakeLists.txt
+++ b/plugins/network/CMakeLists.txt
@@ -16,7 +16,7 @@ pkg_check_modules(DDE-Network-Utils REQUIRED dde-network-utils)
 pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
-add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+add_library(${PLUGIN_NAME} SHARED ${SRCS} network.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
                                                  ${Qt5DBus_INCLUDE_DIRS}
diff --git a/plugins/network/resources.qrc b/plugins/network/network.qrc
similarity index 100%
rename from plugins/network/resources.qrc
rename to plugins/network/network.qrc
diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
index d47839b87..ca89c2d14 100644
--- a/plugins/shutdown/CMakeLists.txt
+++ b/plugins/shutdown/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
-add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+add_library(${PLUGIN_NAME} SHARED ${SRCS} shutdown.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
                                                  ${Qt5DBus_INCLUDE_DIRS}
diff --git a/plugins/shutdown/resources.qrc b/plugins/shutdown/shutdown.qrc
similarity index 100%
rename from plugins/shutdown/resources.qrc
rename to plugins/shutdown/shutdown.qrc
diff --git a/plugins/sound/CMakeLists.txt b/plugins/sound/CMakeLists.txt
index 46ffd0322..b5a2a3d8b 100644
--- a/plugins/sound/CMakeLists.txt
+++ b/plugins/sound/CMakeLists.txt
@@ -16,7 +16,7 @@ pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
 pkg_check_modules(QGSettings REQUIRED gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
-add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/resources.qrc)
+add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/sound.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   ${DFrameworkDBus_INCLUDE_DIRS}
diff --git a/plugins/sound/resources/resources.qrc b/plugins/sound/resources/sound.qrc
similarity index 100%
rename from plugins/sound/resources/resources.qrc
rename to plugins/sound/resources/sound.qrc
diff --git a/plugins/system-tray/CMakeLists.txt b/plugins/system-tray/CMakeLists.txt
index 16e22ff45..758f7c782 100644
--- a/plugins/system-tray/CMakeLists.txt
+++ b/plugins/system-tray/CMakeLists.txt
@@ -16,7 +16,7 @@ find_package(DtkWidget REQUIRED)
 pkg_check_modules(XCB_LIBS REQUIRED xcb-ewmh xcb xcb-image xcb-composite xtst xcb-icccm)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
-add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+add_library(${PLUGIN_NAME} SHARED ${SRCS} system-tray.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
                                                  ${Qt5DBus_INCLUDE_DIRS}
diff --git a/plugins/system-tray/resources.qrc b/plugins/system-tray/system-tray.qrc
similarity index 100%
rename from plugins/system-tray/resources.qrc
rename to plugins/system-tray/system-tray.qrc