From d6d5cbb7599d5d623a125c7a7688571686afb216 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Mar 12 2021 03:01:43 +0000 Subject: [packit] 5.3.0.45 upstream release Upstream tag: 5.3.0.45 Upstream commit: de9080f0 Signed-off-by: Robin Lee --- diff --git a/.gitignore b/.gitignore index fa43caa..4a04a5c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /dde-launcher-5.0.0.tar.gz /dde-launcher-5.3.0.22.tar.gz /dde-launcher-5.3.0.27.tar.gz +/dde-launcher-5.3.0.45.tar.gz diff --git a/.packit.yaml b/.packit.yaml index af5455e..cc4e329 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -8,6 +8,7 @@ synced_files: - rpm/deepin-launcher.spec - .packit.yaml +upstream_ref: 5.3.0.45 upstream_package_name: dde-launcher # downstream (Fedora) RPM package name downstream_package_name: deepin-launcher diff --git a/0001-fix-fix-build-on-Fedora.patch b/0001-fix-fix-build-on-Fedora.patch new file mode 100644 index 0000000..a4eae85 --- /dev/null +++ b/0001-fix-fix-build-on-Fedora.patch @@ -0,0 +1,33 @@ +From f43faeecdd9d072bd6baaad8a1cbe2639946e716 Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Sat, 6 Mar 2021 17:52:46 +0800 +Subject: [PATCH 1/4] fix: fix build on Fedora + +--- + rpm/dde-launcher.spec | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/rpm/dde-launcher.spec b/rpm/dde-launcher.spec +index 3556077..b3d535e 100644 +--- a/rpm/dde-launcher.spec ++++ b/rpm/dde-launcher.spec +@@ -6,7 +6,7 @@ Name: %{sname} + %else + Name: %{repo} + %endif +-Version: 5.3.0.27 ++Version: 5.3.0.45 + Release: 1%{?fedora:%dist} + Summary: Deepin desktop-environment - Launcher module + License: GPLv3 +@@ -29,6 +29,7 @@ BuildRequires: pkgconfig(Qt5Core) + BuildRequires: pkgconfig(Qt5DBus) + BuildRequires: pkgconfig(Qt5Svg) + BuildRequires: pkgconfig(Qt5X11Extras) ++BuildRequires: gtest-devel + BuildRequires: qt5-qtbase-private-devel + %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + Requires: deepin-menu +-- +2.26.2 + diff --git a/0002-fix-fix-typo.patch b/0002-fix-fix-typo.patch new file mode 100644 index 0000000..048d64c --- /dev/null +++ b/0002-fix-fix-typo.patch @@ -0,0 +1,69 @@ +From 81ae9e29f615faccc825cf3f28904321152761a9 Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Sat, 6 Mar 2021 20:24:22 +0800 +Subject: [PATCH 2/4] fix: fix typo + +--- + CMakeLists.txt | 2 +- + dde-launcher-wapper => dde-launcher-wrapper | 0 + rpm/dde-launcher.spec | 6 ++++-- + src/dbusservices/com.deepin.dde.Launcher.service | 2 +- + 4 files changed, 6 insertions(+), 4 deletions(-) + rename dde-launcher-wapper => dde-launcher-wrapper (100%) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0f1163b..c4b5270 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,7 +88,7 @@ install (FILES ${INTERFACES} DESTINATION include/dde-launcher) + + ## desktop file + install(FILES dde-launcher.desktop DESTINATION share/applications/) +-install(FILES dde-launcher-wapper DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++install(FILES dde-launcher-wrapper DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + + ## services files + install(FILES src/dbusservices/com.deepin.dde.Launcher.service DESTINATION /usr/share/dbus-1/services) +diff --git a/dde-launcher-wapper b/dde-launcher-wrapper +similarity index 100% +rename from dde-launcher-wapper +rename to dde-launcher-wrapper +diff --git a/rpm/dde-launcher.spec b/rpm/dde-launcher.spec +index b3d535e..0c564d2 100644 +--- a/rpm/dde-launcher.spec ++++ b/rpm/dde-launcher.spec +@@ -45,11 +45,11 @@ Requires: hicolor-icon-theme + %{summary}. + + %package devel +-Summary: Development package for %{sname} ++Summary: Development package for %{name} + Requires: %{name}%{?_isa} = %{version}-%{release} + + %description devel +-Header files and libraries for %{sname}. ++Header files and libraries for %{name}. + + %prep + %autosetup -p1 -n %{repo}-%{version} +@@ -74,6 +74,8 @@ sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh + %files + %license LICENSE + %{_bindir}/%{repo} ++%{_bindir}/%{repo}-wrapper ++%{_datadir}/applications/%{repo}.desktop + %{_datadir}/%{repo}/ + %{_datadir}/dbus-1/services/*.service + %{_datadir}/icons/hicolor/scalable/apps/%{sname}.svg +diff --git a/src/dbusservices/com.deepin.dde.Launcher.service b/src/dbusservices/com.deepin.dde.Launcher.service +index d71b593..9488f47 100644 +--- a/src/dbusservices/com.deepin.dde.Launcher.service ++++ b/src/dbusservices/com.deepin.dde.Launcher.service +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=com.deepin.dde.Launcher +-Exec=/usr/bin/dde-launcher-wapper ++Exec=/usr/bin/dde-launcher-wrapper +-- +2.26.2 + diff --git a/0003-fix-rpm-BuildRequires-make.patch b/0003-fix-rpm-BuildRequires-make.patch new file mode 100644 index 0000000..5f84059 --- /dev/null +++ b/0003-fix-rpm-BuildRequires-make.patch @@ -0,0 +1,28 @@ +From 614900ad5de97d5c6548b2fa90fcda05b079d055 Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Fri, 12 Mar 2021 10:46:06 +0800 +Subject: [PATCH 3/4] fix: rpm BuildRequires make + +Fedora no longer installs make in the default build environment. + +Log: +Signed-off-by: Robin Lee +--- + rpm/dde-launcher.spec | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/rpm/dde-launcher.spec b/rpm/dde-launcher.spec +index 0c564d2..960062a 100644 +--- a/rpm/dde-launcher.spec ++++ b/rpm/dde-launcher.spec +@@ -31,6 +31,7 @@ BuildRequires: pkgconfig(Qt5Svg) + BuildRequires: pkgconfig(Qt5X11Extras) + BuildRequires: gtest-devel + BuildRequires: qt5-qtbase-private-devel ++BuildRequires: make + %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + Requires: deepin-menu + %if 0%{?fedora} +-- +2.26.2 + diff --git a/0004-fix-fix-qdbus-executable-name-in-Fedora.patch b/0004-fix-fix-qdbus-executable-name-in-Fedora.patch new file mode 100644 index 0000000..be20d79 --- /dev/null +++ b/0004-fix-fix-qdbus-executable-name-in-Fedora.patch @@ -0,0 +1,28 @@ +From de9080f0f0e6ca0210ced19ac492a86b338cf96b Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Fri, 12 Mar 2021 10:48:30 +0800 +Subject: [PATCH 4/4] fix: fix qdbus executable name in Fedora + +Fedora has qdbus-qt5 instead of qdbus. + +Log: +Signed-off-by: Robin Lee +--- + rpm/dde-launcher.spec | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/rpm/dde-launcher.spec b/rpm/dde-launcher.spec +index 960062a..4afa5a6 100644 +--- a/rpm/dde-launcher.spec ++++ b/rpm/dde-launcher.spec +@@ -54,6 +54,7 @@ Header files and libraries for %{name}. + + %prep + %autosetup -p1 -n %{repo}-%{version} ++sed -i 's/qdbus /qdbus-qt5 /' %{repo}-wrapper + + %build + sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh +-- +2.26.2 + diff --git a/README.packit b/README.packit index cd7d6b0..332e553 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.19.0. +The file was generated using packit 0.26.0. diff --git a/deepin-launcher.spec b/deepin-launcher.spec index c82c1c1..63934a9 100644 --- a/deepin-launcher.spec +++ b/deepin-launcher.spec @@ -6,8 +6,8 @@ Name: %{sname} %else Name: %{repo} %endif -Version: 5.3.0.27 -Release: 2%{?fedora:%dist} +Version: 5.3.0.45 +Release: 1%{?fedora:%dist} Summary: Deepin desktop-environment - Launcher module License: GPLv3 %if 0%{?fedora} @@ -18,6 +18,25 @@ URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candida Source0: %{name}_%{version}.orig.tar.xz %endif +# fix: fix qdbus executable name in Fedora +# Author: Robin Lee +Patch0004: 0004-fix-fix-qdbus-executable-name-in-Fedora.patch + + +# fix: rpm BuildRequires make +# Author: Robin Lee +Patch0003: 0003-fix-rpm-BuildRequires-make.patch + + +# fix: fix typo +# Author: Robin Lee +Patch0002: 0002-fix-fix-typo.patch + + +# fix: fix build on Fedora +# Author: Robin Lee +Patch0001: 0001-fix-fix-build-on-Fedora.patch + BuildRequires: cmake BuildRequires: cmake(Qt5LinguistTools) BuildRequires: dtkwidget-devel @@ -29,8 +48,9 @@ BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: gtest-devel BuildRequires: qt5-qtbase-private-devel -BuildRequires: make +BuildRequires: make %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: deepin-menu %if 0%{?fedora} @@ -45,14 +65,15 @@ Requires: hicolor-icon-theme %{summary}. %package devel -Summary: Development package for %{sname} +Summary: Development package for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -Header files and libraries for %{sname}. +Header files and libraries for %{name}. %prep %autosetup -p1 -n %{repo}-%{version} +sed -i 's/qdbus /qdbus-qt5 /' %{repo}-wrapper %build sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh @@ -74,6 +95,8 @@ sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh %files %license LICENSE %{_bindir}/%{repo} +%{_bindir}/%{repo}-wrapper +%{_datadir}/applications/%{repo}.desktop %{_datadir}/%{repo}/ %{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/scalable/apps/%{sname}.svg @@ -82,6 +105,14 @@ sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh %{_includedir}/%{repo}/ %changelog +* Fri Mar 12 2021 Robin Lee - 5.3.0.45-1 +- fix: 修复启动器自动化标记错误的问题 (chenwei) +- fix: 窗口模式排序被还原到初始状态 (聂成) +- feat: 规范代码中直接调用系统命令的部分 (聂成) +- fix: 修复启动器全屏模式按键操作的bug (chenwei) +- fix(launcher): 修改了切换为英文后注销，点开启动器，小窗口模式下，应用为中文显示问题 (Li Tao) +- Merge branch 'uos' into maintain/5.2 (聂成) + * Tue Jan 26 2021 Fedora Release Engineering - 5.3.0.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 9a2b5a6..34cf911 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-launcher-5.3.0.27.tar.gz) = aa8b0f6e68b70b1a355c66fd9348a96eafbac061c932d1c9a4f214416ec60794c45f573b302620e35bdcf6e961e15229d47a1c00082f343413a79a0a4a0da7cd +SHA512 (dde-launcher-5.3.0.45.tar.gz) = a927e6fad369d07dc9044457ba8b81ac624d1386a63a9496a617ee2248061de541a6c0234d6575a30c77ec93cf8bd13483288bff485a720dfc2cd3440f05b711