File do-not-hardcode-module-dir.patch of Package deepin-session-shell
diff -Nur dde-session-shell-snipe-6.0.37/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/CMakeLists.txt 2025-05-15 21:50:23.153988360 +0800
@@ -6,6 +6,8 @@
set(CMAKE_INSTALL_PREFIX /usr)
endif ()
+add_definitions(-DCMAKE_INSTALL_FULL_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\")
+
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/assist_login/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/assist_login/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/assist_login/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/assist_login/CMakeLists.txt 2025-05-15 21:52:29.044776748 +0800
@@ -20,4 +20,4 @@
add_library(${LIB_NAME} SHARED ${SRCS})
add_subdirectory(interface)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
\ 文件末尾没有换行符
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/assist_login/interface/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/assist_login/interface/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/assist_login/interface/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/assist_login/interface/CMakeLists.txt 2025-05-15 21:52:58.823726688 +0800
@@ -28,4 +28,4 @@
# 安装/user/lib
install(FILES include/assist_login_interface.h DESTINATION /usr/include/dde-session-shell)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-basic/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-basic/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-basic/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-basic/CMakeLists.txt 2025-05-15 21:53:30.227673932 +0800
@@ -81,4 +81,4 @@
set(CMAKE_INSTALL_PREFIX "/usr")
# 设置执行 make install 时哪个目标应该被 install 到哪个位置
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-complex/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-complex/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-complex/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-complex/CMakeLists.txt 2025-05-15 21:53:37.831661158 +0800
@@ -12,4 +12,4 @@
add_library(${LIB_NAME} SHARED ${SRCS})
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt 2025-05-15 21:53:45.492648295 +0800
@@ -12,4 +12,4 @@
add_library(${LIB_NAME} SHARED ${SRCS})
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-udcp/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-udcp/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/examples/login-plugins/login-udcp/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/examples/login-plugins/login-udcp/CMakeLists.txt 2025-05-15 21:53:53.601634679 +0800
@@ -12,4 +12,4 @@
add_library(${LIB_NAME} SHARED ${SRCS} login-plugin.qrc)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/examples/tray-plugins/network/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/examples/tray-plugins/network/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/examples/tray-plugins/network/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/examples/tray-plugins/network/CMakeLists.txt 2025-05-15 21:53:17.488695328 +0800
@@ -12,4 +12,4 @@
add_library(${LIB_NAME} SHARED ${SRCS})
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/examples/tray-plugins/webview/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/examples/tray-plugins/webview/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/examples/tray-plugins/webview/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/examples/tray-plugins/webview/CMakeLists.txt 2025-05-15 21:54:06.929612291 +0800
@@ -23,4 +23,4 @@
Qt${QT_VERSION_MAJOR}::WebEngineWidgets
)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/plugins/one-key-login/CMakeLists.txt dde-session-shell-snipe-6.0.37-new/plugins/one-key-login/CMakeLists.txt
--- dde-session-shell-snipe-6.0.37/plugins/one-key-login/CMakeLists.txt 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/plugins/one-key-login/CMakeLists.txt 2025-05-15 21:54:16.838595649 +0800
@@ -12,4 +12,4 @@
add_library(${LIB_NAME} SHARED ${SRCS})
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
diff -Nur dde-session-shell-snipe-6.0.37/src/global_util/plugin_manager/modules_loader.cpp dde-session-shell-snipe-6.0.37-new/src/global_util/plugin_manager/modules_loader.cpp
--- dde-session-shell-snipe-6.0.37/src/global_util/plugin_manager/modules_loader.cpp 2025-05-13 20:00:47.000000000 +0800
+++ dde-session-shell-snipe-6.0.37-new/src/global_util/plugin_manager/modules_loader.cpp 2025-05-15 22:23:25.875736179 +0800
@@ -16,8 +16,8 @@
#include <unistd.h>
-const QString ModulesDir = "/usr/lib/dde-session-shell/modules";
-const QString ModulesConfigDir = "/usr/lib/dde-session-shell/modules/config.d/";
+const QString ModulesDir = QString("%1/dde-session-shell/modules").arg(CMAKE_INSTALL_FULL_LIBDIR);
+const QString ModulesConfigDir = QString("%1/dde-session-shell/modules/config.d/").arg(CMAKE_INSTALL_FULL_LIBDIR);
const QString LOWEST_VERSION = "1.1.0";
const QString LoginType = "Login";
const QString TrayType = "Tray";
