diff --git a/0001-Hidden-state.patch b/0001-Hidden-state.patch new file mode 100644 index 0000000000000000000000000000000000000000..b8411844e21fbb3d8814053c845bf9bab7e8dc51 --- /dev/null +++ b/0001-Hidden-state.patch @@ -0,0 +1,25 @@ +From 3fb294dfcd3369d687b1076782613ae48b13b6bd Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 18 Apr 2023 17:45:20 +0800 +Subject: [PATCH] Hidden state + +--- + frame/util/menuworker.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/frame/util/menuworker.cpp b/frame/util/menuworker.cpp +index 86a46fb..49d7dd0 100644 +--- a/frame/util/menuworker.cpp ++++ b/frame/util/menuworker.cpp +@@ -97,7 +97,7 @@ QMenu *MenuWorker::createMenu(QMenu *settingsMenu) + } + + // 状态 +- if (!menuSettings || !menuSettings->keys().contains("statusVisible") || menuSettings->get("statusVisible").toBool()) { ++ if (0) { + const HideMode hideMode = static_cast(m_dockInter->hideMode()); + + QMenu *statusSubMenu = new QMenu(settingsMenu); +-- +2.31.1 + diff --git a/0001-Mask-intelligent-hiding.patch b/0001-Mask-intelligent-hiding.patch new file mode 100644 index 0000000000000000000000000000000000000000..fde499a190dfb85d1c78c424aba2cc43ac099034 --- /dev/null +++ b/0001-Mask-intelligent-hiding.patch @@ -0,0 +1,45 @@ +From 59e9fb9918869197cbe52dd8475e263a0f8032ce Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 11 Apr 2023 13:26:54 +0800 +Subject: [PATCH] Mask intelligent hiding + +--- + frame/util/menuworker.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/frame/util/menuworker.cpp b/frame/util/menuworker.cpp +index 61094b6..86a46fb 100644 +--- a/frame/util/menuworker.cpp ++++ b/frame/util/menuworker.cpp +@@ -105,23 +105,23 @@ QMenu *MenuWorker::createMenu(QMenu *settingsMenu) + + QAction *keepShownAct = new QAction(tr("Keep Shown"), this); + QAction *keepHiddenAct = new QAction(tr("Keep Hidden"), this); +- QAction *smartHideAct = new QAction(tr("Smart Hide"), this); ++ //QAction *smartHideAct = new QAction(tr("Smart Hide"), this); + + keepShownAct->setCheckable(true); + keepHiddenAct->setCheckable(true); +- smartHideAct->setCheckable(true); ++ //smartHideAct->setCheckable(true); + + keepShownAct->setChecked(hideMode == KeepShowing); + keepHiddenAct->setChecked(hideMode == KeepHidden); +- smartHideAct->setChecked(hideMode == SmartHide); ++ //smartHideAct->setChecked(hideMode == SmartHide); + + connect(keepShownAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(KeepShowing); }); + connect(keepHiddenAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(KeepHidden); }); +- connect(smartHideAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(SmartHide); }); ++ //connect(smartHideAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(SmartHide); }); + + statusSubMenu->addAction(keepShownAct); + statusSubMenu->addAction(keepHiddenAct); +- statusSubMenu->addAction(smartHideAct); ++ //statusSubMenu->addAction(smartHideAct); + + QAction *act = new QAction(tr("Status"), this); + act->setMenu(statusSubMenu); +-- +2.31.1 + diff --git a/0001-hide-status-box.patch b/0001-hide-status-box.patch new file mode 100644 index 0000000000000000000000000000000000000000..0dccc566d1b561df0418ed2f6c166264c5807ed5 --- /dev/null +++ b/0001-hide-status-box.patch @@ -0,0 +1,26 @@ +From 080dfa8891d2dfc38430154a4b20024ab5c23f6e Mon Sep 17 00:00:00 2001 +From: songmingliang +Date: Sat, 6 May 2023 16:33:03 +0800 +Subject: [PATCH] hide status box + +--- + plugins/dcc-dock-plugin/module_widget.cpp | 3 ++- + 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 +--- a/plugins/dcc-dock-plugin/module_widget.cpp ++++ b/plugins/dcc-dock-plugin/module_widget.cpp +@@ -151,7 +151,8 @@ void ModuleWidget::initUI() + } + + // 状态 +- 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) { + static QMap g_stateMap = {{tr("Keep shown"), KeepShowing} + , {tr("Keep hidden"), KeepHidden} + , {tr("Smart hide"), SmartHide}}; +-- +2.27.0 + diff --git a/dde-dock-5.4.69.tar.gz b/dde-dock-5.4.69.tar.gz deleted file mode 100644 index da14df1c731130478452bf916291f7898d6e4f96..0000000000000000000000000000000000000000 Binary files a/dde-dock-5.4.69.tar.gz and /dev/null differ diff --git a/dde-dock-5.5.76.tar.gz b/dde-dock-5.5.76.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a47ccbbde8ae0024d42859469236481fceb9f35b Binary files /dev/null and b/dde-dock-5.5.76.tar.gz differ diff --git a/dde-dock.spec b/dde-dock.spec index 13629ba4dc13405aa718be3d3cc92c3eb316ce20..b610a7c08dc9c5ab1390f0174e0986a42bb67053 100644 --- a/dde-dock.spec +++ b/dde-dock.spec @@ -1,20 +1,26 @@ %global sname deepin-dock Name: dde-dock -Version: 5.4.69 -Release: 2%{?dist} +Version: 5.5.76 +Release: 8%{?dist} Summary: Deepin desktop-environment - Dock module License: GPLv3 -URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/dde-dock/ -Source0: %{name}-%{version}.tar.gz +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 BuildRequires: cmake +BuildRequires: libarchive BuildRequires: gcc-c++ BuildRequires: pkgconfig(dbusmenu-qt5) -BuildRequires: pkgconfig(dde-network-utils) -BuildRequires: dtkwidget-devel >= 5.1 -BuildRequires: dtkcore-devel >= 5.1 -BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 +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) @@ -29,17 +35,30 @@ BuildRequires: pkgconfig(xcb-composite) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) +BuildRequires: pkgconfig(xcb-damage) BuildRequires: qt5-linguist BuildRequires: gtest-devel BuildRequires: gmock-devel -BuildRequires: dtkcommon-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-utils +Requires: dde-network-core 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. @@ -60,17 +79,23 @@ deepin desktop-environment - dock plugin. %prep %setup -q -n %{name}-%{version} -sed -i '/TARGETS/s|lib|%{_lib}|' plugins/*/CMakeLists.txt \ - plugins/plugin-guide/plugins-developer-guide.md +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +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 -E '30,39d' CMakeLists.txt +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|/libexec|g' plugins/show-desktop/showdesktopplugin.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 sed -i 's|/usr/lib/dde-dock/plugins|%{_libdir}/dde-dock/plugins|' plugins/plugin-guide/plugins-developer-guide.md sed -i 's|local/lib/dde-dock/plugins|local/%{_lib}/dde-dock/plugins|' plugins/plugin-guide/plugins-developer-guide.md @@ -79,7 +104,7 @@ sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh %build export PATH=%{_qt5_bindir}:$PATH -%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} . +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} -DCMAKE_INSTALL_SYSCONFDIR=/etc . %make_build %install @@ -88,15 +113,19 @@ export PATH=%{_qt5_bindir}:$PATH %ldconfig_scriptlets %files +%{_datadir}/%{name}/translations/*.qm %license LICENSE %{_bindir}/%{name} %{_libdir}/%{name}/ %{_datarootdir}/glib-2.0/schemas/com.deepin.dde.dock.module.gschema.xml %{_datarootdir}/polkit-1/actions/com.deepin.dde.dock.overlay.policy -/etc/dde-dock/indicator/keybord_layout.json -%{_datadir}/dde-dock/translations/*.qm +%{_datadir}/dsg/ +%{_datadir}/dcc-dock-plugin/ +%{_prefix}/lib/dde-control-center/modules/ +%{_sysconfdir}/%{name}/ %files devel +%doc plugins/plugin-guide %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/DdeDock/DdeDockConfig.cmake @@ -106,9 +135,32 @@ export PATH=%{_qt5_bindir}:$PATH %changelog -* Thu Jul 21 2022 liuxingwei liuxingwei@uniontech.com - 5.4.69-2 -- rebuild for an8.6 +* Sat May 06 2023 songmingliang - 5.5.76-8 +- fix: Mask dcc state(bugid:187109) + +* Tue Apr 18 2023 mahailiang - 5.5.76-7 +- fix: Mask state(bugid:187109) + +* Tue Apr 11 2023 mahailiang - 5.5.76-6 +- fix: Mask intelligent hiding(bugid:187109) + +* Thu Mar 09 2023 liweiganga - 5.5.76-5 +- feat: fix show desktop function + +* Fri Feb 03 2023 liweiganga - 5.5.76-3 +- spec: modify dde-control-center plugin path + +* Fri Feb 03 2023 liweiganga - 5.5.76-2 +- spec: dde-network-utils replace for dde-network-core + +* Tue Jan 17 2023 liweiganga - 5.5.76-1.01 +- spec: fix /etc/dde-dock path + +* Mon Jan 09 2023 liweiganga - 5.5.76-1 +- update: update to 5.5.76 -* Thu Nov 11 2021 huzhengming - 5.4.69-1 -- Update to 5.4.69 +* Fri Jun 10 2022 haomimi - 5.4.56.2-1.02 +- Fix the desktop feature displayed in the lower right corner(bugID:112852) +* Fri Jun 10 2022 uoser - 5.4.56.2-1 +- package init