From 2ab364d046004912928f8809aeb44ad81a960f91 Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Thu, 18 Sep 2025 13:34:35 +0000 Subject: [PATCH] sync: from linuxdeepin/dde-session-shell Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: https://github.com/linuxdeepin/dde-session-shell/pull/48 --- .reuse/dep5 | 73 --------------- CMakeLists.txt | 2 + REUSE.toml | 88 +++++++++++++++++++ plugins/assist_login/CMakeLists.txt | 2 +- plugins/assist_login/interface/CMakeLists.txt | 2 +- .../login-plugins/login-basic/CMakeLists.txt | 2 +- .../login-complex/CMakeLists.txt | 2 +- .../login-fullManaged/CMakeLists.txt | 2 +- .../login-plugins/login-udcp/CMakeLists.txt | 2 +- .../tray-plugins/network/CMakeLists.txt | 2 +- .../tray-plugins/webview/CMakeLists.txt | 2 +- plugins/one-key-login/CMakeLists.txt | 2 +- .../plugin_manager/modules_loader.cpp | 4 +- 13 files changed, 101 insertions(+), 84 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index dd9221ebd..000000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,73 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: dde-session-shell -Upstream-Contact: UnionTech Software Technology Co., Ltd. -Source: https://github.com/linuxdeepin/dde-session-shell - -# README -Files: README.md README.zh_CN.md -Copyright: None -License: CC-BY-4.0 - -# cmake -Files: cmake/*.in cmake/*.cmake -Copyright: None -License: CC0-1.0 - -# xml2cpp -Files: src/global_util/dbus/* -Copyright: The Qt Company Ltd. -License: CC0-1.0 - -# Project file -Files: *.pro *.qrc *CMakeLists.txt *.cmake qt-theme.ini files/* scripts/* src/lightdm-deepin-greeter/deepin-greeter .project .syncexclude -Copyright: None -License: CC0-1.0 - -# docs -Files: docs/* -Copyright: UnionTech Software Technology Co., Ltd. -License: GPL-3.0-or-later - -# png svg -Files: src/widgets/img/* misc/images/* src/session-widgets/img/* plugins/examples/login-plugins/login-udcp/images/* -Copyright: UnionTech Software Technology Co., Ltd. -License: GPL-3.0-or-later - -# translation -Files: translations/* .tx/* -Copyright: UnionTech Software Technology Co., Ltd. -License: GPL-3.0-or-later - -# sh -Files: lupdate.sh tests/test-recoverage.sh translate_generation.sh -Copyright: None -License: CC0-1.0 - -# gitignore -Files: .gitignore -Copyright: None -License: CC0-1.0 - -# ci -Files: .github/* .gitlab-ci.yml .obs/* -Copyright: None -License: CC0-1.0 - -# xml toml json conf yaml -Files: xml/*.xml *.json *.conf -Copyright: UnionTech Software Technology Co., Ltd. -License: GPL-3.0-or-later - -# qss -Files: src/widgets/skin/*.qss -Copyright: UnionTech Software Technology Co., Ltd. -License: GPL-3.0-or-later - -# debian rpm archlinux -Files: debian/* rpm/* archlinux/* -Copyright: None -License: CC0-1.0 - -Files: toolGenerate/**/* -Copyright: None -License: CC0-1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 903028dcd..ec64831da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,8 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 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 --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 000000000..18a1d5358 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,88 @@ +version = 1 +SPDX-PackageName = "dde-session-shell" +SPDX-PackageSupplier = "UnionTech Software Technology Co., Ltd." +SPDX-PackageDownloadLocation = "https://github.com/linuxdeepin/dde-session-shell" + +[[annotations]] +path = ["README.md", "README.zh_CN.md"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC-BY-4.0" + +[[annotations]] +path = ["cmake/**.in", "cmake/**.cmake"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = "src/global_util/dbus/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "The Qt Company Ltd." +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["**.pro", "**.qrc", "**CMakeLists.txt", "**.cmake", "qt-theme.ini", "files/**", "scripts/**", "src/lightdm-deepin-greeter/deepin-greeter", ".project", ".syncexclude"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = "docs/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "GPL-3.0-or-later" + +[[annotations]] +path = ["src/widgets/img/**", "misc/images/**", "src/session-widgets/img/**", "plugins/examples/login-plugins/login-udcp/images/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "GPL-3.0-or-later" + +[[annotations]] +path = ["translations/**", "plugins/login-gesture/translations/**", ".tx/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "GPL-3.0-or-later" + +[[annotations]] +path = ["lupdate.sh", "tests/test-recoverage.sh", "translate_generation.sh"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ".gitignore" +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = [".github/**", ".gitlab-ci.yml", ".obs/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["xml/**.xml", "**.json", "**.conf"] +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "GPL-3.0-or-later" + +[[annotations]] +path = "src/widgets/skin/**.qss" +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "GPL-3.0-or-later" + +[[annotations]] +path = ["debian/**", "rpm/**", "archlinux/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = "toolGenerate/**/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" diff --git a/plugins/assist_login/CMakeLists.txt b/plugins/assist_login/CMakeLists.txt index 6cfeea0df..a177d20ee 100644 --- a/plugins/assist_login/CMakeLists.txt +++ b/plugins/assist_login/CMakeLists.txt @@ -20,4 +20,4 @@ aux_source_directory(. SRCS) add_library(${LIB_NAME} SHARED ${SRCS}) add_subdirectory(interface) -install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules) \ No newline at end of file +install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules) diff --git a/plugins/assist_login/interface/CMakeLists.txt b/plugins/assist_login/interface/CMakeLists.txt index 4035bd97f..c62c9e35a 100644 --- a/plugins/assist_login/interface/CMakeLists.txt +++ b/plugins/assist_login/interface/CMakeLists.txt @@ -28,4 +28,4 @@ link_libraries( # 安装/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 --git a/plugins/examples/login-plugins/login-basic/CMakeLists.txt b/plugins/examples/login-plugins/login-basic/CMakeLists.txt index 65c1e5dc7..9a4910427 100644 --- a/plugins/examples/login-plugins/login-basic/CMakeLists.txt +++ b/plugins/examples/login-plugins/login-basic/CMakeLists.txt @@ -81,4 +81,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE 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 --git a/plugins/examples/login-plugins/login-complex/CMakeLists.txt b/plugins/examples/login-plugins/login-complex/CMakeLists.txt index 5edcf6129..ba2814d81 100644 --- a/plugins/examples/login-plugins/login-complex/CMakeLists.txt +++ b/plugins/examples/login-plugins/login-complex/CMakeLists.txt @@ -12,4 +12,4 @@ aux_source_directory(. SRCS) 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 --git a/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt b/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt index bba76f7ac..6728045b2 100644 --- a/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt +++ b/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt @@ -12,4 +12,4 @@ aux_source_directory(. SRCS) 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 --git a/plugins/examples/login-plugins/login-udcp/CMakeLists.txt b/plugins/examples/login-plugins/login-udcp/CMakeLists.txt index bdbc6f3f8..cc8a78f8b 100644 --- a/plugins/examples/login-plugins/login-udcp/CMakeLists.txt +++ b/plugins/examples/login-plugins/login-udcp/CMakeLists.txt @@ -12,4 +12,4 @@ aux_source_directory(. SRCS) 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 --git a/plugins/examples/tray-plugins/network/CMakeLists.txt b/plugins/examples/tray-plugins/network/CMakeLists.txt index b2cf5755f..f401b97a6 100644 --- a/plugins/examples/tray-plugins/network/CMakeLists.txt +++ b/plugins/examples/tray-plugins/network/CMakeLists.txt @@ -12,4 +12,4 @@ aux_source_directory(. SRCS) 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 --git a/plugins/examples/tray-plugins/webview/CMakeLists.txt b/plugins/examples/tray-plugins/webview/CMakeLists.txt index d74ad2d5b..c45855bb1 100644 --- a/plugins/examples/tray-plugins/webview/CMakeLists.txt +++ b/plugins/examples/tray-plugins/webview/CMakeLists.txt @@ -23,4 +23,4 @@ target_link_libraries(${LIB_NAME} PRIVATE 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 --git a/plugins/one-key-login/CMakeLists.txt b/plugins/one-key-login/CMakeLists.txt index 0c64477e9..5eafdc970 100644 --- a/plugins/one-key-login/CMakeLists.txt +++ b/plugins/one-key-login/CMakeLists.txt @@ -12,4 +12,4 @@ aux_source_directory(. SRCS) 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 --git a/src/global_util/plugin_manager/modules_loader.cpp b/src/global_util/plugin_manager/modules_loader.cpp index bb97f0a2c..1e8b2358a 100644 --- a/src/global_util/plugin_manager/modules_loader.cpp +++ b/src/global_util/plugin_manager/modules_loader.cpp @@ -16,8 +16,8 @@ #include -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";