File fix-hardcode-plugin-dir.patch of Package deepin-tray-loader
diff -Nur dde-tray-loader-2.0.9/plugins/application-tray/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/application-tray/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/application-tray/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/application-tray/CMakeLists.txt 2025-09-07 16:27:22.709291669 +0800
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
set(PLUGIN_NAME "application-tray")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
project(${PLUGIN_NAME})
@@ -62,4 +63,4 @@
)
set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/dde-dock)
# 设置执行 make install 时哪个目标应该被 install 到哪个位置
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
\ 文件末尾没有换行符
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/airplane-mode/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/airplane-mode/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/airplane-mode/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/airplane-mode/CMakeLists.txt 2025-09-07 16:27:11.115322787 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "airplane-mode")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -66,5 +67,5 @@
Qt${QT_VERSION_MAJOR}::Svg
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}/system-trays)
install(FILES "resources/dcc-airplane-mode.dci" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/bluetooth/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/bluetooth/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/bluetooth/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/bluetooth/CMakeLists.txt 2025-09-07 16:27:48.649219832 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "bluetooth")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -60,5 +61,5 @@
Qt${QT_VERSION_MAJOR}::DBus
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}/system-trays)
install(FILES "resources/dcc-bluetooth.dci" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/brightness/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/brightness/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/brightness/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/brightness/CMakeLists.txt 2025-09-07 16:28:12.572152179 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "brightness")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -54,5 +55,5 @@
Qt${QT_VERSION_MAJOR}::Concurrent
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
install(FILES "resources/dcc-dde-brightness.dci" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/datetime/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/datetime/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/datetime/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/datetime/CMakeLists.txt 2025-09-07 16:28:46.499056244 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "datetime")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS "*.h" "*.cpp"
@@ -45,5 +46,5 @@
Qt${QT_VERSION_MAJOR}::DBus
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
install(FILES "resources/dcc-datetime.dci" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/dnd-mode/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/dnd-mode/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/dnd-mode/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/dnd-mode/CMakeLists.txt 2025-09-07 16:29:16.764970662 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "dnd-mode")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -42,5 +43,5 @@
Qt${QT_VERSION_MAJOR}::DBus
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
install(FILES "resources/dcc-dnd-mode.dci" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt 2025-09-07 16:29:41.336901182 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "eye-comfort-mode")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -43,5 +44,5 @@
Qt${QT_VERSION_MAJOR}::DBus
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
install(FILES "resources/dcc-eye-comfort-mode.dci" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/keyboard-layout/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/keyboard-layout/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/keyboard-layout/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/keyboard-layout/CMakeLists.txt 2025-09-07 16:30:00.584846759 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "keyboard-layout")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS "*.h" "*.cpp"
@@ -48,5 +49,5 @@
Qt${QT_VERSION_MAJOR}::DBus
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays/)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}/system-trays/)
install(FILES ./keybord_layout.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dde-dock/indicator)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/media/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/media/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/media/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/media/CMakeLists.txt 2025-09-07 16:30:20.541790337 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "media")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -35,4 +36,4 @@
Qt${QT_VERSION_MAJOR}::Svg
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/notification/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/notification/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/notification/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/notification/CMakeLists.txt 2025-09-07 16:30:39.543736592 +0800
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: CC0-1.0
set(PLUGIN_NAME "notification")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENTS Widget Gui)
@@ -30,7 +31,7 @@
Dtk${DTK_VERSION_MAJOR}::Gui
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
install(FILES "icons/dcc-notification.dci" DESTINATION share/dde-dock/icons/dcc-setting)
dtk_add_config_meta_files(APPID org.deepin.dde.tray-loader FILES ../configs/org.deepin.dde.dock.plugin.notification.json)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/onboard/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/onboard/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/onboard/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/onboard/CMakeLists.txt 2025-09-07 16:31:02.561671480 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "onboard")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -36,5 +37,5 @@
Dtk${DTK_VERSION_MAJOR}::Widget
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
install(FILES "icon/dcc-onboard.dci" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt 2025-09-07 16:31:28.258598803 +0800
@@ -12,6 +12,7 @@
# 使用 set 命令设置一个变量
set(PLUGIN_NAME "home-monitor")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# 设置项目名称
project(${PLUGIN_NAME})
@@ -102,4 +103,4 @@
set(CMAKE_INSTALL_PREFIX "/usr")
# 设置执行 make install 时哪个目标应该被 install 到哪个位置
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/power/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/power/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/power/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/power/CMakeLists.txt 2025-09-07 16:31:55.870520712 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "power")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -45,7 +46,7 @@
Dtk${DTK_VERSION_MAJOR}::Widget
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}/system-trays)
install(FILES "resources/dcc-battery.dci" DESTINATION share/dde-dock/icons/dcc-setting)
dtk_add_config_meta_files(APPID org.deepin.dde.dock FILES ../configs/org.deepin.dde.dock.plugin.power.json) # compat
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/shutdown/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/shutdown/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/shutdown/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/shutdown/CMakeLists.txt 2025-09-07 16:32:16.609462062 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "shutdown")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -43,7 +44,7 @@
Qt${QT_VERSION_MAJOR}::Svg
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
install(FILES "resources/dcc-shutdown.dci" DESTINATION share/dde-dock/icons/dcc-setting)
dtk_add_config_meta_files(APPID org.deepin.dde.dock FILES ../configs/org.deepin.dde.dock.plugin.shutdown.json) # compat
diff -Nur dde-tray-loader-2.0.9/plugins/dde-dock/sound/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-dock/sound/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-dock/sound/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-dock/sound/CMakeLists.txt 2025-09-07 16:32:33.190415165 +0800
@@ -5,6 +5,7 @@
set(PLUGIN_NAME "sound")
project(${PLUGIN_NAME})
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Sources files
file(GLOB_RECURSE SRCS
@@ -61,7 +62,7 @@
Qt${QT_VERSION_MAJOR}::Svg
)
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}/system-trays)
dtk_add_config_meta_files(APPID org.deepin.dde.dock FILES ../configs/org.deepin.dde.dock.plugin.sound.json) # compat
dtk_add_config_meta_files(APPID org.deepin.dde.tray-loader FILES ../configs/org.deepin.dde.dock.plugin.sound.json)
diff -Nur dde-tray-loader-2.0.9/plugins/dde-network-display-ui/plugins/CMakeLists.txt dde-tray-loader-2.0.9-new/plugins/dde-network-display-ui/plugins/CMakeLists.txt
--- dde-tray-loader-2.0.9/plugins/dde-network-display-ui/plugins/CMakeLists.txt 2025-08-28 17:59:37.000000000 +0800
+++ dde-tray-loader-2.0.9-new/plugins/dde-network-display-ui/plugins/CMakeLists.txt 2025-09-07 16:33:24.573269852 +0800
@@ -9,6 +9,7 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
# Find the library
find_package(PkgConfig REQUIRED)
@@ -73,7 +74,7 @@
)
# 设置执行 make install 时哪个目标应该被 install 到哪个位置
-install(TARGETS ${Dock_Plugin_Name} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${Dock_Plugin_Name} LIBRARY DESTINATION ${PLUGINDIR})
# 翻译文件
file(GLOB TS_FILES_DOCK "dock-wirelesscasting-plugin/translations/*.ts")
qt_add_translation(QM_FILES_DOCK ${TS_FILES_DOCK})
