fix: compile errors

fix compile errors

Log:

CMakeLists.txt

@@ -55,10 +55,10 @@ install(FILES ${CMAKE_BINARY_DIR}/dde-tray-loader.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 configure_file(
-    ${CMAKE_SOURCE_DIR}/cmake/DdeTrayLoader/DdeTrayLoader.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/DdeTrayLoader.cmake
+    ${CMAKE_SOURCE_DIR}/cmake/DdeTrayLoader/DdeTrayLoaderConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/DdeTrayLoaderConfig.cmake
     @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DdeTrayLoader.cmake
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DdeTrayLoaderConfig.cmake
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DdeTrayLoader)
 
 configure_file(

debian/control

@@ -5,6 +5,7 @@ Maintainer: Deepin Packages Builder <[email protected]>
 Build-Depends: debhelper (>= 8.0.0),
  pkg-config,
  cmake,
+ extra-cmake-modules,
  qt5-qmake,
  libxcb-image0-dev,
  libxcb-composite0-dev,
@@ -29,7 +30,10 @@ Build-Depends: debhelper (>= 8.0.0),
  libxcursor-dev,
  dde-api-dev (>>5.6.3),
  libkf5networkmanagerqt-dev (>=5.103.0-1deepin2),
- libkf5wayland-dev
+ libkf5wayland-dev,
+ libqt5waylandclient5-dev,
+ qtwayland5-dev-tools,
+ qtwayland5-private-dev
 Standards-Version: 3.9.8
 Homepage: http://www.deepin.org/
 
@@ -45,7 +49,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  dde-daemon (>=5.13.12),
  startdde (>=5.8.9),
  lastore-daemon (>=5.2.9),
- qtxdg-dev-tools
+ qtxdg-dev-tools,
+ deepin-service-plugin-network
 Conflicts:
  dde-dock
 Replaces:

debian/dde-tray-loader-dev.install

@@ -1,4 +1,5 @@
 usr/include/dde-dock
 usr/include/dde-tray-loader/protocol
+usr/include/libddetraynetworkcore
 usr/lib/*/pkgconfig
 usr/lib/*/cmake

debian/dde-tray-loader.install

@@ -1,5 +1,5 @@
-usr/share
-usr/libexec/
+usr/libexec/dockplugin-loader
+usr/lib/*/libdde-dockplugin-interface.so.*
 usr/lib/dde-dock/plugins/libdatetime.so
 usr/lib/dde-dock/plugins/libshutdown.so
 usr/lib/dde-dock/plugins/libdnd-mode.so
@@ -9,14 +9,16 @@ usr/lib/dde-dock/plugins/libbrightness.so
 usr/lib/dde-dock/plugins/libdock-wirelesscasting-plugin.so
 usr/lib/dde-dock/plugins/libnotification.so
 usr/lib/dde-dock/plugins/system-trays
-usr/lib/dde-dock/plugins/system-trays/libdock-network-plugin.so
+usr/lib/dde-dock/plugins/system-trays/libdock-tray-network-plugin.so
 usr/lib/dde-dock/plugins/system-trays/libbluetooth.so
 usr/lib/dde-dock/plugins/system-trays/libpower.so
 usr/lib/dde-dock/plugins/system-trays/libsound.so
 usr/lib/dde-dock/plugins/system-trays/libairplane-mode.so
 usr/lib/dde-dock/plugins/system-trays/libkeyboard-layout.so
-usr/share/dock-network-plugin/translations
+usr/share/dock-tray-network-plugin/translations
 usr/share/dde-dock/icons/dcc-setting
 usr/share/dock-wirelesscasting-plugin/translations
-usr/share/dsg/configs/org.deepin.dde.dock/
-usr/share/glib-2.0/schemas/
+usr/share/dsg/configs/org.deepin.dde.dock/org.deepin.dde.dock.plugin.common.json
+usr/share/dsg/configs/org.deepin.dde.tray.network/org.deepin.dde.network.json
+usr/share/glib-2.0/schemas/com.deepin.dde.control-center.gschema.xml
+usr/lib/*/qt5/plugins/wayland-shell-integration/libplugin-shell.so

plugins/dde-dock/CMakeLists.txt

@@ -2,22 +2,18 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
-include_directories(../../interfaces)
-include_directories(util)
-include_directories(widgets)
-include_directories(dbus)
-
-add_subdirectory("datetime")
-add_subdirectory("shutdown")
-add_subdirectory("power")
-add_subdirectory("sound")
-add_subdirectory("keyboard-layout")
-add_subdirectory("bluetooth")
 add_subdirectory("airplane-mode")
+add_subdirectory("bluetooth")
+add_subdirectory("brightness")
+add_subdirectory("datetime")
 add_subdirectory("dnd-mode")
 add_subdirectory("eye-comfort-mode")
+add_subdirectory("keyboard-layout")
 add_subdirectory("media")
-add_subdirectory("brightness")
+add_subdirectory("onboard")
+add_subdirectory("power")
+add_subdirectory("shutdown")
+add_subdirectory("sound")
 
 if (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug"))
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Ofast")

plugins/dde-dock/airplane-mode/CMakeLists.txt

@@ -10,14 +10,12 @@ project(${PLUGIN_NAME})
 file(GLOB_RECURSE SRCS
     "*.h"
     "*.cpp"
-    "../../widgets/*.h"
-    "../../widgets/*.cpp"
-    "../../frame/util/imageutil.h"
-    "../../frame/util/imageutil.cpp"
+    "../widgets/*.h"
+    "../widgets/*.cpp"
+    "../util/imageutil.h"
+    "../util/imageutil.cpp"
     "../common/*.h"
     "../common/*.cpp"
-    "../../common/*.h"
-    "../../common/*.cpp"
 )
 
 find_package(PkgConfig REQUIRED)
@@ -36,10 +34,9 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../syst
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   ${DFrameworkDBus_INCLUDE_DIRS}
   ${QGSettings_INCLUDE_DIRS}
-  ../../interfaces
-  ../../widgets
-  ../../frame
-  ../../frame/util
+  ../../../interfaces
+  ../widgets
+  ../util
   ../common
 )
 target_link_libraries(${PLUGIN_NAME} PRIVATE

plugins/dde-dock/bluetooth/CMakeLists.txt

@@ -38,8 +38,10 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../syst
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   ${DFrameworkDBus_INCLUDE_DIRS}
   ${QGSettings_INCLUDE_DIRS}
-  ../../interfaces
+  ../../../interfaces
   ../common
+  ../util
+  ../widgets
   componments)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE

plugins/dde-dock/brightness/CMakeLists.txt

@@ -10,14 +10,12 @@ project(${PLUGIN_NAME})
 file(GLOB_RECURSE SRCS
     "*.h"
     "*.cpp"
-    "../../widgets/*.h"
-    "../../widgets/*.cpp"
+    "../widgets/*.h"
+    "../widgets/*.cpp"
     "../common/*.h"
     "../common/*.cpp"
-    "../../common/*.h"
-    "../../common/*.cpp"
-    "../../frame/util/roundscrollarea.h"
-    "../../frame/util/roundscrollarea.cpp"
+    "../util/roundscrollarea.h"
+    "../util/roundscrollarea.cpp"
 )
 
 find_package(PkgConfig REQUIRED)
@@ -37,10 +35,9 @@ target_include_directories(${PLUGIN_NAME} PUBLIC
     ${DtkWidget_INCLUDE_DIRS}
     ${QGSettings_INCLUDE_DIRS}
     ${DFrameworkDBus_INCLUDE_DIRS}
-    ../../interfaces
-    ../../widgets
-    ../../frame
-    ../../frame/util
+    ../../../interfaces
+    ../widgets
+    ../util
     ../common
 )
 target_link_libraries(${PLUGIN_NAME} PRIVATE