diff --git a/0001-feat-add-missing-header-QPainterPath.patch b/0001-feat-add-missing-header-QPainterPath.patch new file mode 100644 index 0000000000000000000000000000000000000000..e831b0aef254d9dbe1431eb8f7ff879c842c4d3f --- /dev/null +++ b/0001-feat-add-missing-header-QPainterPath.patch @@ -0,0 +1,38 @@ +From 6661895463dfe019c1635e0786a9faa7f78534dc Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Wed, 23 Oct 2024 10:23:48 +0000 +Subject: [PATCH] feat: add missing header QPainterPath + +Signed-off-by: liweigang +--- + common/chameleonwidget.cpp | 1 + + frame/util/roundscrollarea.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/common/chameleonwidget.cpp b/common/chameleonwidget.cpp +index 5094f00..b757991 100644 +--- a/common/chameleonwidget.cpp ++++ b/common/chameleonwidget.cpp +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + + ChameleonWidget::ChameleonWidget(QWidget *parent) +diff --git a/frame/util/roundscrollarea.cpp b/frame/util/roundscrollarea.cpp +index 23966e8..f4105fd 100644 +--- a/frame/util/roundscrollarea.cpp ++++ b/frame/util/roundscrollarea.cpp +@@ -5,6 +5,7 @@ + #include "roundscrollarea.h" + + #include ++#include + #include + + #include +-- +2.47.0 + diff --git a/0001-fix-the-crash-issue-in-the-plugin-library.patch b/0001-fix-the-crash-issue-in-the-plugin-library.patch new file mode 100644 index 0000000000000000000000000000000000000000..db25abbcd3de972c70ebecf90c4f83d792d3f3dd --- /dev/null +++ b/0001-fix-the-crash-issue-in-the-plugin-library.patch @@ -0,0 +1,72 @@ +From e29800d8df3a7301bf2edce60fc7478dc22290bc Mon Sep 17 00:00:00 2001 +From: Zhang Haidong +Date: Mon, 2 Feb 2026 09:41:48 +0800 +Subject: [PATCH] fix: the crash issue in the plugin library + +Root Cause: The libtray contained only the declaration of DOCK_APP but lacked its implementation, causing a crash when the function was called. + +Fix: Added the implementation for DOCK_APP in a dedicated .cpp file, which is then compiled into the current project by libtray. +--- + common/dock-constants.cpp | 7 +++++++ + frame/window/mainwindow.cpp | 2 -- + plugins/datetime/CMakeLists.txt | 3 ++- + plugins/sound/soundapplet.h | 2 +- + 4 files changed, 10 insertions(+), 4 deletions(-) + create mode 100644 common/dock-constants.cpp + +diff --git a/common/dock-constants.cpp b/common/dock-constants.cpp +new file mode 100644 +index 0000000..ffa2a9d +--- /dev/null ++++ b/common/dock-constants.cpp +@@ -0,0 +1,7 @@ ++// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd. ++// ++// SPDX-License-Identifier: LGPL-3.0-or-later ++ ++#include "dock-constants.h" ++ ++Q_LOGGING_CATEGORY(DOCK_APP, "org.deepin.dde.dock.app") +diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp +index e4b6b20..2af56db 100644 +--- a/frame/window/mainwindow.cpp ++++ b/frame/window/mainwindow.cpp +@@ -48,8 +48,6 @@ const int BORDER_WIDTH = 1; + + using org::kde::StatusNotifierWatcher; + +-Q_LOGGING_CATEGORY(DOCK_APP, "org.deepin.dde.dock.app") +- + // let startdde know that we've already started. + void MainWindow::RegisterDdeSession() + { +diff --git a/plugins/datetime/CMakeLists.txt b/plugins/datetime/CMakeLists.txt +index f0033d4..4d048a3 100644 +--- a/plugins/datetime/CMakeLists.txt ++++ b/plugins/datetime/CMakeLists.txt +@@ -4,7 +4,8 @@ set(PLUGIN_NAME "datetime") + project(${PLUGIN_NAME}) + + # Sources files +-file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp" "../common/*.h" "../common/*.cpp") ++file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp" "../common/*.h" "../common/*.cpp" ++ "../../common/dock-constants.*" "../../common/settingmanager.*" "../../common/plugin-wrapper.*") + + find_package(PkgConfig REQUIRED) + find_package(Qt5Widgets REQUIRED) +diff --git a/plugins/sound/soundapplet.h b/plugins/sound/soundapplet.h +index 436f73b..c719770 100644 +--- a/plugins/sound/soundapplet.h ++++ b/plugins/sound/soundapplet.h +@@ -53,7 +53,7 @@ private slots: + void updatePorts(); + void removePort(const QString& key); + void addPort(const SoundCardPort* port); +- void activePort(const QString& portId, const uint& cardId); ++ // void activePort(const QString& portId, const uint& cardId); + + signals: + void requestHideApplet(); +-- +2.43.0 + diff --git a/0001-hide-status-box.patch b/0001-hide-status-box.patch index 0dccc566d1b561df0418ed2f6c166264c5807ed5..f6df4b13efb41134a5738041423b5d461b86262d 100644 --- a/0001-hide-status-box.patch +++ b/0001-hide-status-box.patch @@ -1,6 +1,6 @@ -From 080dfa8891d2dfc38430154a4b20024ab5c23f6e Mon Sep 17 00:00:00 2001 -From: songmingliang -Date: Sat, 6 May 2023 16:33:03 +0800 +From 34f47f0b8fcfd3d8fd26581e40169f1907868a1e Mon Sep 17 00:00:00 2001 +From: Super User +Date: Thu, 24 Apr 2025 11:02:52 +0800 Subject: [PATCH] hide status box --- @@ -8,13 +8,13 @@ Subject: [PATCH] hide status box 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/dcc-dock-plugin/module_widget.cpp b/plugins/dcc-dock-plugin/module_widget.cpp -index 03f3bbf..f111ff8 100644 +index 56081fb..c41a88b 100644 --- a/plugins/dcc-dock-plugin/module_widget.cpp +++ b/plugins/dcc-dock-plugin/module_widget.cpp -@@ -151,7 +151,8 @@ void ModuleWidget::initUI() - } +@@ -227,7 +227,8 @@ void ModuleWidget::initPositionArea() - // 状态 + void ModuleWidget::initStatusArea() + { - if (Utils::SettingValue("com.deepin.dde.dock.module.menu", QByteArray(), "statusVisible", true).toBool()) { + //if (Utils::SettingValue("com.deepin.dde.dock.module.menu", QByteArray(), "statusVisible", true).toBool()) { + if (0) { @@ -22,5 +22,5 @@ index 03f3bbf..f111ff8 100644 , {tr("Keep hidden"), KeepHidden} , {tr("Smart hide"), SmartHide}}; -- -2.27.0 +2.43.0 diff --git a/dde-dock-5.5.76.tar.gz b/dde-dock-5.5.76.tar.gz deleted file mode 100644 index a47ccbbde8ae0024d42859469236481fceb9f35b..0000000000000000000000000000000000000000 Binary files a/dde-dock-5.5.76.tar.gz and /dev/null differ diff --git a/dde-dock.spec b/dde-dock.spec index 6d04e0e81648175e4a6d0604d43419d3fd8265f3..8b0f7a4ecd8dd68ac12394ce7c7950cfc36d5575 100644 --- a/dde-dock.spec +++ b/dde-dock.spec @@ -1,66 +1,71 @@ -%define anolis_release 2 -%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global sname deepin-dock Name: dde-dock -Version: 5.5.76 -Release: 8.%{anolis_release}%{?dist} -Summary: Deepin desktop-environment - Dock module -License: GPLv3 -URL: https://github.com/linuxdeepin/dde-dock/ -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch1: 0001-Mask-intelligent-hiding.patch -Patch2: 0001-Hidden-state.patch -Patch3: 0001-hide-status-box.patch +Version: 5.7.35.4 +Release: 1%{?dist}.05 +Summary: The dock of Deepin Desktop Environment +License: LGPL-3.0-or-later +URL: https://github.com/linuxdeepin/dde-dock +Source0: dde-dock_5.7.35.4.orig.tar.xz + +Patch1: 0001-Mask-intelligent-hiding.patch +Patch2: 0001-Hidden-state.patch +Patch3: 0001-feat-add-missing-header-QPainterPath.patch +Patch4: 0001-hide-status-box.patch +Patch5: 0001-fix-the-crash-issue-in-the-plugin-library.patch -BuildRequires: cmake -BuildRequires: libarchive BuildRequires: gcc-c++ -BuildRequires: pkgconfig(dbusmenu-qt5) -BuildRequires: dde-network-core-devel -BuildRequires: dtkcommon-devel -BuildRequires: dtkwidget-devel >= 5.4.19 -BuildRequires: dtkcore-devel >= 5.4.14 -BuildRequires: dtkgui-devel >= 5.4.13 -BuildRequires: pkgconfig(dframeworkdbus) -BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: make +BuildRequires: cmake + +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Concurrent) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5WaylandClient) +BuildRequires: cmake(Qt5XkbCommonSupport) +BuildRequires: qt5-qtbase-private-devel +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-linguist +# provides /usr/lib64/libQt5XkbCommonSupport.a +BuildRequires: qt5-qtbase-static + +BuildRequires: cmake(DtkGui) +BuildRequires: cmake(DtkWidget) +BuildRequires: cmake(DtkCore) +BuildRequires: cmake(dbusmenu-qt5) +BuildRequires: cmake(DFrameworkdbus) +BuildRequires: cmake(DdeControlCenter) +# libdccwidgets.so +BuildRequires: dde-control-center +BuildRequires: dde-api-devel + BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xcb-composite) -BuildRequires: pkgconfig(xcb-ewmh) +BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) -BuildRequires: pkgconfig(xcb-damage) -BuildRequires: qt5-linguist +BuildRequires: pkgconfig(xcb-ewmh) +BuildRequires: pkgconfig(xcb-composite) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(dbusmenu-qt5) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xres) +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-cursor) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(gio-2.0) + BuildRequires: gtest-devel BuildRequires: gmock-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-qttools-devel -BuildRequires: libXtst-devel -BuildRequires: libxcb -BuildRequires: dde-control-center-devel >= 5.5.77 -BuildRequires: dde-control-center >= 5.5.77 - -Requires: dbusmenu-qt5 -Requires: dde-network-core + +Requires: dde-common >= 2026 Requires: dde-qt-dbus-factory Requires: xcb-util-wm Requires: xcb-util-image -Requires: libxcb -Requires: deepin-desktop-schemas -Requires: dde-daemon -Requires: startdde -Requires: libqtxdg-devel -Requires: onboard - - %description Deepin desktop-environment - Dock module. @@ -72,29 +77,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Header files and libraries for %{sname}. -%package onboard-plugin -Summary: deepin desktop-environment - dock plugin -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description onboard-plugin -deepin desktop-environment - dock plugin. - %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n %{name}-%{version} + find plugins/ -mindepth 2 -maxdepth 2 -type f -name CMakeLists.txt | grep -vE 'dcc-dock-plugin/CMakeLists.txt' | xargs -I '{file_name}' sed -i '/TARGETS/s|lib|%{_lib}|' '{file_name}' sed -i '/TARGETS/s|lib|%{_lib}|' plugins/plugin-guide/plugins-developer-guide.md -sed -i 's|/lib|/%{_lib}|' frame/controller/dockpluginscontroller.cpp \ - frame/window/mainpanelcontrol.cpp \ - plugins/tray/system-trays/systemtrayscontroller.cpp - +sed -i 's|/lib|/%{_lib}|' frame/controller/dockpluginscontroller.cpp sed -i 's|/lib|/libexec|g' plugins/show-desktop/showdesktopplugin.cpp \ - frame/window/mainpanelcontrol.cpp \ frame/window/components/desktop_widget.cpp sed -i 's:libdir.*:libdir=%{_libdir}:' dde-dock.pc.in @@ -106,11 +98,14 @@ sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh %build export PATH=%{_qt5_bindir}:$PATH + %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} -DCMAKE_INSTALL_SYSCONFDIR=/etc . -%make_build -C %{_vpath_builddir} + +%make_build %install -%make_install INSTALL_ROOT=%{buildroot} -C %{_vpath_builddir} +%make_install INSTALL_ROOT=%{buildroot} +chmod +x %{buildroot}/%{_bindir}/%{name}-wrapper %ldconfig_scriptlets @@ -118,13 +113,18 @@ export PATH=%{_qt5_bindir}:$PATH %{_datadir}/%{name}/translations/*.qm %license LICENSE %{_bindir}/%{name} +%{_bindir}/%{name}-wrapper %{_libdir}/%{name}/ %{_datarootdir}/glib-2.0/schemas/com.deepin.dde.dock.module.gschema.xml %{_datarootdir}/polkit-1/actions/com.deepin.dde.dock.overlay.policy %{_datadir}/dsg/ -%{_datadir}/dcc-dock-plugin/ %{_prefix}/lib/dde-control-center/modules/ %{_sysconfdir}/%{name}/ +%{_datadir}/applications/dde-dock.desktop +%{_datadir}/dcc-dock-plugin/translations +%{_datadir}/%{name}/icons +%{_datadir}/deepin-debug-config/deepin-debug-config.d/org.deepin.dde.dock.json +%{_datadir}/deepin-log-viewer/deepin-log.conf.d/org.deepin.dde.dock.json %files devel %doc plugins/plugin-guide @@ -132,16 +132,57 @@ export PATH=%{_qt5_bindir}:$PATH %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/DdeDock/DdeDockConfig.cmake -%files onboard-plugin -%{_libdir}/dde-dock/plugins/libonboard.so +%changelog +* Mon Mar 16 2026 zhanghaidong - 5.7.35.4-1.05 +- chore: fix version for koki build again + +* Mon Feb 02 2026 zhanghaidong - 5.7.35.4-1.04 +- feat: fix the crash issue in the plugin(347965) +* Mon Jan 05 2026 liweigang - 5.7.35.4-1.03 +- feat: fix loading plugin error -%changelog -* Tue Nov 07 2023 yangxianzhao - 5.5.76-8.2 -- rebuild for qt +* Mon Dec 29 2025 liweigang - 5.7.35.4-1.02 +- spec: revert "modify file exec path" + +* Tue Dec 23 2025 liweigang - 5.7.35.4-1.01 +- spec: modify file exec path + +* Fri Dec 19 2025 liweigang - 5.7.35.4-1 +- update: update to version 5.7.35.4 + +* Tue May 06 2025 zhaoshuang - 5.7.28.2-1.06 +- fix: fix err window show issue(bugid:296215) + +* Thu Apr 24 2025 mahailiang - 5.7.28.2-1.05 +- fix: hide taskbar status box(bugid:309385) + +* Tue Apr 08 2025 lvgenggeng - 5.7.28.2-1.04 +- rebuild: rebuild without gcc_secure + +* Tue Nov 12 2024 zhaoshuang - 5.7.28.2-1.03 +- fix: re-work to fix loading plugin err(bugid:283061) + +* Tue Nov 12 2024 zhaoshuang - 5.7.28.2-1.02 +- fix: modify link option to fix loading plugin err(bugid:283061) + +* Thu Oct 24 2024 liweigang - 5.7.28.2-1.01 +- spec: modify requires + +* Wed Oct 23 2024 liweigang - 5.7.28.2-1 +- update: update to version 5.7.28.2 + +* Thu Dec 28 2023 liuzhilin - 5.6.22-1.02 +- fix: fix-dde-trash-error(bugid:226971) + +* Mon Oct 16 2023 liweigang - 5.6.22-1.01 +- chore: dde-dock-wrapper add +x + +* Mon Oct 09 2023 liweigang - 5.6.22-1 +- update: update to version 5.6.22 -* Wed Nov 01 2023 yangxianzhao - 5.5.76-8.1 -- fix build error +* Thu Aug 17 2023 liuzhilin - 5.6.11.1-1 +- update: update to 5.6.11.1 and fix build error * Sat May 06 2023 songmingliang - 5.5.76-8 - fix: Mask dcc state(bugid:187109) diff --git a/dde-dock_5.7.35.4.orig.tar.xz b/dde-dock_5.7.35.4.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..b1b017fd6cd789480728778b9cbae973c044ead7 Binary files /dev/null and b/dde-dock_5.7.35.4.orig.tar.xz differ