!23 [sync] PR-22: upgrade to version 5.5.76
From: @openeuler-sync-bot Reviewed-by: @leeffo Signed-off-by: @leeffo
This commit is contained in:
openeuler-ci-bot
Gitee
commit
617fb35ce9
25
0001-Hidden-state.patch
Normal file
25
0001-Hidden-state.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 3fb294dfcd3369d687b1076782613ae48b13b6bd Mon Sep 17 00:00:00 2001
|
||||
From: root <root@localhost.localdomain>
|
||||
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<HideMode>(m_dockInter->hideMode());
|
||||
|
||||
QMenu *statusSubMenu = new QMenu(settingsMenu);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
45
0001-Mask-intelligent-hiding.patch
Normal file
45
0001-Mask-intelligent-hiding.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 59e9fb9918869197cbe52dd8475e263a0f8032ce Mon Sep 17 00:00:00 2001
|
||||
From: root <root@localhost.localdomain>
|
||||
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
|
||||
|
||||
26
0001-hide-status-box.patch
Normal file
26
0001-hide-status-box.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 080dfa8891d2dfc38430154a4b20024ab5c23f6e Mon Sep 17 00:00:00 2001
|
||||
From: songmingliang <songmingliang@uniontech.com>
|
||||
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<QString, int> g_stateMap = {{tr("Keep shown"), KeepShowing}
|
||||
, {tr("Keep hidden"), KeepHidden}
|
||||
, {tr("Smart hide"), SmartHide}};
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Binary file not shown.
BIN
dde-dock-5.5.76.tar.gz
Normal file
BIN
dde-dock-5.5.76.tar.gz
Normal file
Binary file not shown.
@ -1,19 +1,24 @@
|
||||
%global sname deepin-dock
|
||||
|
||||
Name: dde-dock
|
||||
Version: 5.4.56.2
|
||||
Version: 5.5.76
|
||||
Release: 1
|
||||
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/
|
||||
URL: https://github.com/linuxdeepin/dde-dock
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch1: 0001-Hidden-state.patch
|
||||
Patch2: 0001-hide-status-box.patch
|
||||
Patch3: 0001-Mask-intelligent-hiding.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libarchive
|
||||
BuildRequires: pkgconfig(dbusmenu-qt5)
|
||||
BuildRequires: pkgconfig(dde-network-utils)
|
||||
BuildRequires: dde-network-core-devel
|
||||
BuildRequires: dtkwidget-devel >= 5.1
|
||||
BuildRequires: dtkcore-devel >= 5.1
|
||||
BuildRequires: dtkcommon-devel
|
||||
BuildRequires: pkgconfig(dframeworkdbus) >= 2.0
|
||||
BuildRequires: pkgconfig(gsettings-qt)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
@ -33,13 +38,21 @@ BuildRequires: qt5-linguist
|
||||
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-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: libqtxdg-devel
|
||||
Requires: onboard
|
||||
|
||||
%description
|
||||
@ -60,18 +73,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
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
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
sed -i -E '32,39d' CMakeLists.txt
|
||||
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|/libexec|g' plugins/show-desktop/showdesktopplugin.cpp \
|
||||
frame/window/mainpanelcontrol.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
|
||||
@ -80,7 +100,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
|
||||
@ -96,8 +116,13 @@ export PATH=%{_qt5_bindir}:$PATH
|
||||
%{_datarootdir}/glib-2.0/schemas/com.deepin.dde.dock.module.gschema.xml
|
||||
%{_datarootdir}/polkit-1/actions/com.deepin.dde.dock.overlay.policy
|
||||
%config %{_sysconfdir}/%{name}/indicator/keybord_layout.json
|
||||
%{_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
|
||||
@ -107,6 +132,9 @@ export PATH=%{_qt5_bindir}:$PATH
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 02 2023 leeffo <liweiganga@uniontech.com> - 5.5.76-1
|
||||
- upgrade to version 5.5.76
|
||||
|
||||
* Wed Mar 29 2023 liweiganga <liweiganga@uniontech.com> - 5.4.56.2-1
|
||||
- update: update to 5.4.56.2
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user