File fix-hardcode-plugin-dir.patch of Package deepin-tray-loader

Overview Repositories Revisions Requests Users Attributes Meta

File fix-hardcode-plugin-dir.patch of Package deepin-tray-loader (Revision 2bddb9b11e6dbab06b305f0480475456)

Currently displaying revision 2bddb9b11e6dbab06b305f0480475456 , Show latest

diff -Nur dde-tray-loader-0.0.5/plugins/application-tray/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/application-tray/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/application-tray/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/application-tray/CMakeLists.txt	2024-08-03 22:27:53.519209045 +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-0.0.5/plugins/dde-dock/airplane-mode/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/airplane-mode/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/airplane-mode/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/airplane-mode/CMakeLists.txt	2024-08-03 22:28:57.549005031 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "airplane-mode")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -49,5 +50,5 @@
   ${Qt5Svg_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}/system-trays)
 install(FILES "resources/airplane-mode.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/bluetooth/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/bluetooth/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/bluetooth/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/bluetooth/CMakeLists.txt	2024-08-03 22:29:32.358894124 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "bluetooth")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -54,5 +55,5 @@
   ${Qt5Svg_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}/system-trays)
 install(FILES "resources/bluetooth.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/brightness/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/brightness/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/brightness/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/brightness/CMakeLists.txt	2024-08-03 22:30:05.375455594 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "brightness")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -50,5 +51,5 @@
     ${Qt5Concurrent_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
 install(FILES "resources/dde-brightness.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/datetime/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/datetime/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/datetime/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/datetime/CMakeLists.txt	2024-08-03 22:32:41.344958637 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "datetime")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -41,5 +42,5 @@
   ${QGSettings_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
 install(FILES "resources/datetime.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/dnd-mode/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/dnd-mode/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/dnd-mode/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/dnd-mode/CMakeLists.txt	2024-08-03 22:31:11.718577543 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "dnd-mode")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -46,5 +47,5 @@
     ${Qt5Svg_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
 install(FILES "resources/dnd-mode.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/eye-comfort-mode/CMakeLists.txt	2024-08-03 22:31:44.635139327 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "eye-comfort-mode")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -46,5 +47,5 @@
     ${QGSettings_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
 install(FILES "resources/eye-comfort-mode.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/keyboard-layout/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/keyboard-layout/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/keyboard-layout/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/keyboard-layout/CMakeLists.txt	2024-08-03 22:32:25.641675338 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "keyboard-layout")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -49,5 +50,5 @@
     ${Qt5DBus_LIBRARIES}
 )
 
-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-0.0.5/plugins/dde-dock/media/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/media/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/media/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/media/CMakeLists.txt	2024-08-03 22:32:55.524913458 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "media")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -45,4 +46,4 @@
     ${QGSettings_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/notification/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/notification/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/notification/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/notification/CMakeLists.txt	2024-08-03 22:33:20.688166616 +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(Qt5 REQUIRED COMPONENTS DBus)
 find_package(Dtk REQUIRED COMPONENTS Widget Gui)
 
@@ -29,5 +30,5 @@
     Dtk::Gui
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
 install(FILES "icons/notification.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/onboard/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/onboard/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/onboard/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/onboard/CMakeLists.txt	2024-08-03 22:33:46.831416648 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "onboard")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -45,5 +46,5 @@
     ${QGSettings_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
 install(FILES "icon/onboard.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/plugin-guide/home-monitor/CMakeLists.txt	2024-08-03 22:35:00.761181068 +0800
@@ -12,6 +12,8 @@
 
 # 使用 set 命令设置一个变量
 set(PLUGIN_NAME "home-monitor")
+# Set plugin dir
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 # 设置项目名称
 project(${PLUGIN_NAME})
@@ -102,4 +104,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-0.0.10/plugins/dde-dock/power/CMakeLists.txt dde-tray-loader-0.0.10-new/plugins/dde-dock/power/CMakeLists.txt
--- dde-tray-loader-0.0.10/plugins/dde-dock/power/CMakeLists.txt	2024-08-14 13:06:54.000000000 +0800
+++ dde-tray-loader-0.0.10-new/plugins/dde-dock/power/CMakeLists.txt	2024-08-17 10:33:56.939574042 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "power")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -45,7 +46,7 @@
     ${QGSettings_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}//system-trays)
 install(FILES "resources/battery.svg" DESTINATION share/dde-dock/icons/dcc-setting)
 
 dconfig_meta_files(APPID org.deepin.dde.dock FILES ../configs/org.deepin.dde.dock.plugin.power.json) # compat
diff -Nur dde-tray-loader-0.0.5/plugins/dde-dock/shutdown/CMakeLists.txt dde-tray-loader-0.0.5-new/plugins/dde-dock/shutdown/CMakeLists.txt
--- dde-tray-loader-0.0.5/plugins/dde-dock/shutdown/CMakeLists.txt	2024-07-31 17:09:20.000000000 +0800
+++ dde-tray-loader-0.0.5-new/plugins/dde-dock/shutdown/CMakeLists.txt	2024-08-03 22:36:05.544307972 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "shutdown")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -48,5 +49,5 @@
     ${QGSettings_LIBRARIES}
 )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR})
 install(FILES "resources/shutdown.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff -Nur dde-tray-loader-0.0.10/plugins/dde-dock/sound/CMakeLists.txt dde-tray-loader-0.0.10-new/plugins/dde-dock/sound/CMakeLists.txt
--- dde-tray-loader-0.0.10/plugins/dde-dock/sound/CMakeLists.txt	2024-08-14 13:06:54.000000000 +0800
+++ dde-tray-loader-0.0.10-new/plugins/dde-dock/sound/CMakeLists.txt	2024-08-17 10:34:21.512850930 +0800
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 set(PLUGIN_NAME "sound")
+set(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/plugins)
 
 project(${PLUGIN_NAME})
 
@@ -53,7 +54,7 @@
     ${Qt5Svg_LIBRARIES}
     )
 
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGINDIR}//system-trays)
 
 dconfig_meta_files(APPID org.deepin.dde.dock FILES ../configs/org.deepin.dde.dock.plugin.sound.json) # compat
 dconfig_meta_files(APPID org.deepin.dde.tray-loader FILES ../configs/org.deepin.dde.dock.plugin.sound.json)

Places

File fix-hardcode-plugin-dir.patch of Package deepin-tray-loader (Revision 2bddb9b11e6dbab06b305f0480475456)

Places