diff --git a/dde-dock-5.4.56.2.tar.gz b/dde-dock-5.4.56.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f4b84dde80c8d17625cdaa7be5ca61532d41b521 Binary files /dev/null and b/dde-dock-5.4.56.2.tar.gz differ diff --git a/dde-dock.spec b/dde-dock.spec old mode 100755 new mode 100644 index 22a1de130c816ce464e75d76e2429e34166d4d90..32d4fd18e0c531b85e2e096b656cd9cdfc15177a --- a/dde-dock.spec +++ b/dde-dock.spec @@ -1,20 +1,23 @@ %global sname deepin-dock Name: dde-dock -Version: 5.1.0.13 -Release: 2 +Version: 5.4.56.2 +Release: 1%{?dist}.02 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: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/%{name}/%{name}_%{version}.orig.tar.xz +Source0: %{name}-%{version}.tar.gz 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: 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,13 +32,28 @@ 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: qt5-qtbase-private-devel +BuildRequires: qt5-qttools-devel +BuildRequires: libXtst-devel +BuildRequires: libxcb + Requires: dbusmenu-qt5 Requires: dde-network-utils 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. @@ -59,18 +77,20 @@ deepin desktop-environment - dock plugin. sed -i '/TARGETS/s|lib|%{_lib}|' plugins/*/CMakeLists.txt \ plugins/plugin-guide/plugins-developer-guide.md -sed -i -E '30,39d' CMakeLists.txt +sed -i -E '32,39d' CMakeLists.txt sed -i 's|/lib|/%{_lib}|' frame/controller/dockpluginscontroller.cpp \ - frame/panel/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 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 +sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh + %build export PATH=%{_qt5_bindir}:$PATH %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} . @@ -82,12 +102,10 @@ export PATH=%{_qt5_bindir}:$PATH %ldconfig_scriptlets %files +%{_datadir}/%{name}/translations/*.qm %license LICENSE -%{_sysconfdir}/%{name}/indicator/keybord_layout.json %{_bindir}/%{name} %{_libdir}/%{name}/ -%{_datadir}/%{name}/ -%{_datadir}/dbus-1/services/*.service %{_datarootdir}/glib-2.0/schemas/com.deepin.dde.dock.module.gschema.xml %{_datarootdir}/polkit-1/actions/com.deepin.dde.dock.overlay.policy @@ -95,14 +113,15 @@ export PATH=%{_qt5_bindir}:$PATH %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/DdeDock/DdeDockConfig.cmake +%{_sysconfdir}/dde-dock/indicator/keybord_layout.json %files onboard-plugin %{_libdir}/dde-dock/plugins/libonboard.so %changelog -* Thu Sep 3 2020 weidong - 5.1.0.13-2 -- fix source url in spec +* Fri Jun 10 2022 haomimi - 5.4.56.2-1.02 +- Fix the desktop feature displayed in the lower right corner(bugID:112852) -* Thu Jul 30 2020 openEuler Buildteam - 5.1.0.13-1 -- Package init +* Fri Jun 10 2022 uoser - 5.4.56.2-1 +- package init diff --git a/dde-dock_5.1.0.13.orig.tar.xz b/dde-dock_5.1.0.13.orig.tar.xz deleted file mode 100755 index 0ab883c114b770cd31a348cf0a01d9465a85a765..0000000000000000000000000000000000000000 Binary files a/dde-dock_5.1.0.13.orig.tar.xz and /dev/null differ diff --git a/images/20210817112439.png b/images/20210817112439.png deleted file mode 100644 index 2ff9aafdc7ec66b9e29909cee8fea46013a60bcb..0000000000000000000000000000000000000000 Binary files a/images/20210817112439.png and /dev/null differ diff --git a/images/20210817113315.png b/images/20210817113315.png deleted file mode 100644 index 839424e79f063b5fa41fc9ec9c8bac2c01cbb6d2..0000000000000000000000000000000000000000 Binary files a/images/20210817113315.png and /dev/null differ diff --git a/images/20210817114321.png b/images/20210817114321.png deleted file mode 100644 index b6d28cebdc0a46f67275d76444402a2bc21d8fac..0000000000000000000000000000000000000000 Binary files a/images/20210817114321.png and /dev/null differ