From 80af45ce6df4699251df1ef8a6f08cb7a2c25225 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 26 Oct 2011 19:48:01 -0500 Subject: [PATCH 001/111] - Rebuilt for glibc bug#747377 --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index b443060..371e487 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.7.1 -Release: 0.3.%{snap}%{?dist} +Release: 0.4.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -99,6 +99,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Wed Oct 26 2011 Fedora Release Engineering - 0.7.1-0.4.20111021 +- Rebuilt for glibc bug#747377 + * Fri Oct 21 2011 Rex Dieter 0.7.1-0.3.20111021 - 20111021 snapshot, checkbox fixes, translations. From ceefc73321ea05e2769993b464bcd550713e0afa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 Jun 2012 13:44:51 -0500 Subject: [PATCH 002/111] apper-0.8.0 snapshot --- .gitignore | 1 + apper.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 01e292b..b1424d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /apper-0.7.2.tar.bz2 +/apper-0.8.0-20120628git.tar.bz2 diff --git a/apper.spec b/apper.spec index a3b6402..88d2a9d 100644 --- a/apper.spec +++ b/apper.spec @@ -1,17 +1,19 @@ -%define pk_min_version 0.6.17 +%define pk_min_version 0.8 ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 +%define snap 20120628git + Name: apper -Version: 0.7.2 -Release: 2%{?dist} +Version: 0.8.0 +Release: 0.1.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ -%if 0%{?snap} -# use releaseme/apper.rc --version 0.7.1 -Source0: apper-%{version}-%{snap}.tar.xz +%if 0%{?snap:1} +# use releaseme/apper.rc --version 0.8.0 +Source0: apper-%{version}-%{snap}.tar.bz2 %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 %endif @@ -102,6 +104,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Thu Jun 28 2012 Rex Dieter 0.8.0-0.1.20120628git +- apper-0.8.0 snapshot + * Thu Jun 28 2012 Rex Dieter 0.7.2-2 - rebuild (PackageKit) diff --git a/sources b/sources index 82034c8..5c01dbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11d8a03cb9f885a36fcf4d5e396e4875 apper-0.7.2.tar.bz2 +7fc8be5555dbc4be220cc4f701eddae4 apper-0.8.0-20120628git.tar.bz2 From 2da64b4124b547f993fd90a556d1aa25630cae20 Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Fri, 20 Jul 2012 14:13:38 +0200 Subject: [PATCH 003/111] re-apply patch to not check for updates when on battery --- apper-conserve-resources.patch | 21 +++++++++++++++++++++ apper.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 apper-conserve-resources.patch diff --git a/apper-conserve-resources.patch b/apper-conserve-resources.patch new file mode 100644 index 0000000..97f5c0b --- /dev/null +++ b/apper-conserve-resources.patch @@ -0,0 +1,21 @@ +commit cf0bdce8bac567a4b56a9af787e2dc65bb3faf5c +Author: Daniel Nicoletti +Date: Tue Jun 19 13:43:51 2012 -0300 + + Libsolid now reports the right valeu when it should conserve resources + +diff --git a/apperd/ApperdThread.cpp b/apperd/ApperdThread.cpp +index d10a3f4..cd99343 100644 +--- a/apperd/ApperdThread.cpp ++++ b/apperd/ApperdThread.cpp +@@ -303,8 +303,8 @@ bool ApperdThread::isSystemReady(bool ignoreBattery, bool ignoreMobile) const + // check how applications should behave (e.g. on battery power) + if (!ignoreBattery && Solid::PowerManagement::appShouldConserveResources()) { + kDebug() << "System is not ready, application should conserve resources"; +- // FIXME this always return true even on AC +-// return false; ++ // This was fixed for KDElibs 4.8.5 ++ return false; + } + + // TODO it would be nice is Solid provided this diff --git a/apper.spec b/apper.spec index a3b6402..57baf95 100644 --- a/apper.spec +++ b/apper.spec @@ -5,7 +5,7 @@ Name: apper Version: 0.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -20,6 +20,7 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 ## upstreamable patches ## upstream patches +Patch0: apper-conserve-resources.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -45,6 +46,7 @@ KDE interface for PackageKit. %prep %setup -q +%patch0 -p1 -b .conserve-resources %build @@ -102,6 +104,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Fri Jul 2012 Lukas Tinkl 0.7.2-3 +- re-apply patch to not check for updates when on battery + * Thu Jun 28 2012 Rex Dieter 0.7.2-2 - rebuild (PackageKit) From e88fecf40662c65a0520909cc710c3f438be6905 Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Fri, 20 Jul 2012 14:18:25 +0200 Subject: [PATCH 004/111] fix changelog --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 57baf95..8746632 100644 --- a/apper.spec +++ b/apper.spec @@ -104,7 +104,7 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog -* Fri Jul 2012 Lukas Tinkl 0.7.2-3 +* Fri Jul 20 2012 Lukas Tinkl 0.7.2-3 - re-apply patch to not check for updates when on battery * Thu Jun 28 2012 Rex Dieter 0.7.2-2 From 1f74f49ec7a3f49a900116905b9bc11017390b68 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2012 08:32:04 -0500 Subject: [PATCH 005/111] rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 88d2a9d..31e5ba5 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -104,6 +104,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Tue Jul 24 2012 Rex Dieter 0.8.0-0.2.20120628git +- rebuild + * Thu Jun 28 2012 Rex Dieter 0.8.0-0.1.20120628git - apper-0.8.0 snapshot From 1e127365663af69f40115ff346adeb656b1868f0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2012 10:33:26 -0500 Subject: [PATCH 006/111] 20120724git snapshot --- .gitignore | 2 +- apper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b1424d6..c114118 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /apper-0.7.2.tar.bz2 -/apper-0.8.0-20120628git.tar.bz2 +/apper-0.8.0-20120724.tar.bz diff --git a/apper.spec b/apper.spec index 31e5ba5..303d310 100644 --- a/apper.spec +++ b/apper.spec @@ -1,9 +1,9 @@ -%define pk_min_version 0.8 +%define pk_min_version 0.8.2 ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20120628git +%define snap 20120724git Name: apper Version: 0.8.0 @@ -104,6 +104,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Tue Jul 24 2012 Rex Dieter 0.8.0-0.2.20120724git +- 20120724git snapshot + * Tue Jul 24 2012 Rex Dieter 0.8.0-0.2.20120628git - rebuild diff --git a/sources b/sources index 5c01dbe..6dbce7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fc8be5555dbc4be220cc4f701eddae4 apper-0.8.0-20120628git.tar.bz2 +735dc4fb0c30289a33b2ec0ecc13cb4c apper-0.8.0-20120724.tar.bz From 9d068009ccb0dffcac2c7fbb239e3b7b386a396c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2012 19:48:06 -0500 Subject: [PATCH 007/111] Release++ --- apper.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apper.spec b/apper.spec index 303d310..8099d0b 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 0.2.%{snap}%{?dist} +Release: 0.3.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -104,7 +104,7 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog -* Tue Jul 24 2012 Rex Dieter 0.8.0-0.2.20120724git +* Tue Jul 24 2012 Rex Dieter 0.8.0-0.3.20120724git - 20120724git snapshot * Tue Jul 24 2012 Rex Dieter 0.8.0-0.2.20120628git From 014ce3d84ed31c6af58a1d9a213ef24652fede65 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2012 20:17:28 -0500 Subject: [PATCH 008/111] fix sources --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c114118..07edc14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /apper-0.7.2.tar.bz2 -/apper-0.8.0-20120724.tar.bz +/apper-0.8.0-20120724.tar.bz2 diff --git a/sources b/sources index 6dbce7d..1e99c80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -735dc4fb0c30289a33b2ec0ecc13cb4c apper-0.8.0-20120724.tar.bz +735dc4fb0c30289a33b2ec0ecc13cb4c apper-0.8.0-20120724.tar.bz2 From ce19afefc1ff15e47d6f31cb81a8450950bd56ed Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2012 20:27:58 -0500 Subject: [PATCH 009/111] fix snap --- apper.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apper.spec b/apper.spec index 8099d0b..9ef250b 100644 --- a/apper.spec +++ b/apper.spec @@ -3,11 +3,11 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20120724git +%define snap 20120724 Name: apper Version: 0.8.0 -Release: 0.3.%{snap}%{?dist} +Release: 0.3.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ From bba5611f306d4cae30983ee097b6ff4da46c75a6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 26 Jul 2012 23:40:31 -0500 Subject: [PATCH 010/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 9ef250b..4e04092 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 0.3.%{snap}git%{?dist} +Release: 0.4.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -104,6 +104,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Fri Jul 27 2012 Fedora Release Engineering - 0.8.0-0.4.20120724git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jul 24 2012 Rex Dieter 0.8.0-0.3.20120724git - 20120724git snapshot From 49e7d0fc11b99ee44d15321f9e2756087543585e Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Wed, 5 Sep 2012 13:17:45 +0200 Subject: [PATCH 011/111] 20120905git snapshot --- .gitignore | 1 + apper.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 07edc14..f44443d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20120724.tar.bz2 +/apper-0.8.0-20120905.tar.bz2 diff --git a/apper.spec b/apper.spec index 4e04092..052e1ea 100644 --- a/apper.spec +++ b/apper.spec @@ -3,16 +3,16 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20120724 +%define snap 20120905 Name: apper Version: 0.8.0 -Release: 0.4.%{snap}git%{?dist} +Release: 0.5.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rc --version 0.8.0 +# use releaseme/apper.rb --version 0.8.0 Source0: apper-%{version}-%{snap}.tar.bz2 %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 @@ -104,6 +104,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Wed Sep 05 2012 Lukas Tinkl - 0.8.0-0.5.20120905git +- 20120905git snapshot + * Fri Jul 27 2012 Fedora Release Engineering - 0.8.0-0.4.20120724git - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 1e99c80..008a899 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -735dc4fb0c30289a33b2ec0ecc13cb4c apper-0.8.0-20120724.tar.bz2 +b83db16312140cb62eb024e17be3b3e8 apper-0.8.0-20120905.tar.bz2 From 0715c5372f59471d8046f8ff13662a0b39c86284 Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Wed, 5 Sep 2012 16:25:50 +0200 Subject: [PATCH 012/111] Revert "20120905git snapshot" Depends on unreleased PackageKit version and doesn't solve #854209 anyway This reverts commit 49e7d0fc11b99ee44d15321f9e2756087543585e. --- .gitignore | 1 - apper.spec | 9 +++------ sources | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f44443d..07edc14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20120724.tar.bz2 -/apper-0.8.0-20120905.tar.bz2 diff --git a/apper.spec b/apper.spec index 052e1ea..4e04092 100644 --- a/apper.spec +++ b/apper.spec @@ -3,16 +3,16 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20120905 +%define snap 20120724 Name: apper Version: 0.8.0 -Release: 0.5.%{snap}git%{?dist} +Release: 0.4.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rb --version 0.8.0 +# use releaseme/apper.rc --version 0.8.0 Source0: apper-%{version}-%{snap}.tar.bz2 %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 @@ -104,9 +104,6 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog -* Wed Sep 05 2012 Lukas Tinkl - 0.8.0-0.5.20120905git -- 20120905git snapshot - * Fri Jul 27 2012 Fedora Release Engineering - 0.8.0-0.4.20120724git - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 008a899..1e99c80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b83db16312140cb62eb024e17be3b3e8 apper-0.8.0-20120905.tar.bz2 +735dc4fb0c30289a33b2ec0ecc13cb4c apper-0.8.0-20120724.tar.bz2 From 301a97ca5d22c4b447dd23d0453208de7c9b9b48 Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Wed, 5 Sep 2012 16:27:31 +0200 Subject: [PATCH 013/111] Revert "20120905git snapshot" This reverts commit 49e7d0fc11b99ee44d15321f9e2756087543585e. --- .gitignore | 1 - apper.spec | 9 +++------ sources | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f44443d..07edc14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20120724.tar.bz2 -/apper-0.8.0-20120905.tar.bz2 diff --git a/apper.spec b/apper.spec index 052e1ea..4e04092 100644 --- a/apper.spec +++ b/apper.spec @@ -3,16 +3,16 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20120905 +%define snap 20120724 Name: apper Version: 0.8.0 -Release: 0.5.%{snap}git%{?dist} +Release: 0.4.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rb --version 0.8.0 +# use releaseme/apper.rc --version 0.8.0 Source0: apper-%{version}-%{snap}.tar.bz2 %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 @@ -104,9 +104,6 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog -* Wed Sep 05 2012 Lukas Tinkl - 0.8.0-0.5.20120905git -- 20120905git snapshot - * Fri Jul 27 2012 Fedora Release Engineering - 0.8.0-0.4.20120724git - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 008a899..1e99c80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b83db16312140cb62eb024e17be3b3e8 apper-0.8.0-20120905.tar.bz2 +735dc4fb0c30289a33b2ec0ecc13cb4c apper-0.8.0-20120724.tar.bz2 From a1a4a25484d9fe3efde134488e8ae1fc78a46d03 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 7 Sep 2012 13:46:28 -0500 Subject: [PATCH 014/111] add scriptlet to register mimetypes (#836559) --- apper.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 4e04092..2b43dde 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 0.4.%{snap}git%{?dist} +Release: 0.6.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -79,6 +79,14 @@ chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.desktop +%posttrans +update-desktop-database -q 2> /dev/null ||: + +%postun +if [ $1 -eq 0 ] ; then +update-desktop-database -q 2> /dev/null ||: +fi + %files -f apper.lang %doc COPYING TODO %{_kde4_bindir}/apper @@ -104,6 +112,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Fri Sep 07 2012 Rex Dieter 0.8.0-0.6.20120724git +- add scriptlet to register mimetypes (#836559) + * Fri Jul 27 2012 Fedora Release Engineering - 0.8.0-0.4.20120724git - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From c43e74c161eb53e0c2208dc0df8f3c7123e47986 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 7 Sep 2012 13:48:38 -0500 Subject: [PATCH 015/111] add scriptlet to register mimetypes (#836559) --- apper.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 8746632..7876195 100644 --- a/apper.spec +++ b/apper.spec @@ -5,7 +5,7 @@ Name: apper Version: 0.7.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -79,6 +79,14 @@ chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.desktop +%posttrans +update-desktop-database -q 2> /dev/null ||: + +%postun +if [ $1 -eq 0 ] ; then +update-desktop-database -q 2> /dev/null ||: +fi + %files -f apper.lang %doc COPYING TODO %{_kde4_bindir}/apper @@ -104,6 +112,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt %changelog +* Fri Sep 07 2012 Rex Dieter 0.7.2-4 +- add scriptlet to register mimetypes (#836559) + * Fri Jul 20 2012 Lukas Tinkl 0.7.2-3 - re-apply patch to not check for updates when on battery From a2379acb6d8fa9467d7a5401dc35687e621ccea5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 2 Oct 2012 13:57:20 -0500 Subject: [PATCH 016/111] 20121002git snapshot - initial systemd_inhibit support (#830181) - displays wrong warning when no updates are available (#851864) --- apper-0.8.0-systemd_inhibit.patch | 96 +++++++++++++++++++++++++++++++ apper.spec | 29 ++++++++-- 2 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 apper-0.8.0-systemd_inhibit.patch diff --git a/apper-0.8.0-systemd_inhibit.patch b/apper-0.8.0-systemd_inhibit.patch new file mode 100644 index 0000000..0c2cade --- /dev/null +++ b/apper-0.8.0-systemd_inhibit.patch @@ -0,0 +1,96 @@ +diff --git a/Sentinel/TransactionWatcher.cpp b/Sentinel/TransactionWatcher.cpp +index 05b49cc..12201fd 100644 +--- a/Sentinel/TransactionWatcher.cpp ++++ b/Sentinel/TransactionWatcher.cpp +@@ -2,6 +2,8 @@ + * Copyright (C) 2008-2011 by Daniel Nicoletti * + * dantti12@gmail.com * + * * ++ * (c) 2012 Lukáš Tinkl * ++ * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * +@@ -18,6 +20,8 @@ + * Boston, MA 02110-1301, USA. * + ***************************************************************************/ + ++#include ++ + #include "TransactionWatcher.h" + + #include "TransactionJob.h" +@@ -40,6 +44,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + +@@ -53,7 +60,8 @@ TransactionWatcher::TransactionWatcher(QObject *parent) : + m_currentTransaction(0), + m_messagesSNI(0), + m_restartSNI(0), +- m_inhibitCookie(-1) ++ m_inhibitCookie(-1), ++ m_sdInhibitDescriptor(-1) + { + m_transHasJob = false; + m_tracker = new KUiServerJobTracker(this); +@@ -412,12 +420,36 @@ void TransactionWatcher::suppressSleep(bool enable, const QString &reason) + if (m_inhibitCookie == -1) { + kDebug() << "Sleep suppression denied!"; + } ++ ++ // also tell systemd-inhibit ++ QDBusInterface managerIface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1", QDBusConnection::systemBus()); ++ QVariantList args; ++ args << "shutdown:sleep:idle"; // what ++ args << i18n("apper"); // who ++ args << reason; // why ++ args << "block"; // mode ++ QDBusPendingReply desc = managerIface.asyncCallWithArgumentList("Inhibit", args); ++ desc.waitForFinished(); ++ if (desc.isValid() && desc.value().isValid()) { ++ m_sdInhibitDescriptor = dup(desc.value().fileDescriptor()); ++ } ++ else ++ kWarning() << "failed to inhibit shutdown using systemd"; + } +- } else if (m_inhibitCookie != -1) { +- kDebug() << "Stop Suppressing Sleep"; +- if (!Solid::PowerManagement::stopSuppressingSleep(m_inhibitCookie)) { +- kDebug() << "Stop failed: invalid cookie."; ++ } else { ++ if (m_inhibitCookie != -1) { ++ kDebug() << "Stop Suppressing Sleep"; ++ if (!Solid::PowerManagement::stopSuppressingSleep(m_inhibitCookie)) { ++ kDebug() << "Stop failed: invalid cookie."; ++ } ++ m_inhibitCookie = -1; ++ } ++ ++ if (m_sdInhibitDescriptor != -1) { ++ ::close(m_sdInhibitDescriptor); ++ m_sdInhibitDescriptor = -1; + } +- m_inhibitCookie = -1; ++ else ++ kWarning() << "invalid systemd-inhibit cookie"; + } + } +diff --git a/Sentinel/TransactionWatcher.h b/Sentinel/TransactionWatcher.h +index b498718..c4a9d9a 100644 +--- a/Sentinel/TransactionWatcher.h ++++ b/Sentinel/TransactionWatcher.h +@@ -78,6 +78,7 @@ private: + + // cookie to suppress sleep + int m_inhibitCookie; ++ int m_sdInhibitDescriptor; + KUiServerJobTracker *m_tracker; + }; + diff --git a/apper.spec b/apper.spec index 2b43dde..401f1cf 100644 --- a/apper.spec +++ b/apper.spec @@ -1,13 +1,14 @@ -%define pk_min_version 0.8.2 +%define pk_min_version 0.8.4 +%define pk_version 0.8.4-2 ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20120724 +%define snap 20121002 Name: apper Version: 0.8.0 -Release: 0.6.%{snap}git%{?dist} +Release: 0.7.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -20,6 +21,7 @@ Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.ta URL: http://kde-apps.org/content/show.php/Apper?content=84745 ## upstreamable patches +Patch50: apper-0.8.0-systemd_inhibit.patch ## upstream patches @@ -34,11 +36,15 @@ BuildRequires: gettext BuildRequires: kdelibs4-devel BuildRequires: kdebase-workspace-devel BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(packagekit-qt2) >= %{pk_min_version} +%if 0%{?pk_version:1} +BuildRequires: PackageKit-qt-devel >= %{pk_version} +%else +BuildRequires: pkgconfig(packagekit-qt2) >= %{pk_min_version}} +%global pk_version %(pkg-config --modversion packagekit-qt 2> /dev/null || echo %{pk_min_version}) +%endif %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} -Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}} -%global pk_version %(pkg-config --modversion packagekit-qt 2> /dev/null || echo %{pk_min_version}) +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} Requires: PackageKit-qt%{?_isa} >= %{pk_version} %description @@ -48,6 +54,12 @@ KDE interface for PackageKit. %prep %setup -q +%patch50 -p1 -b .systemd_inhibit + +# hack, allow to build against our patched pk-0.8.4 +sed -i -e \ + "s|^set(QPACKAGEKIT_MIN_VERSION 0.8.5)|set(QPACKAGEKIT_MIN_VERSION 0.8.4)|" \ + CMakeLists.txt %build mkdir -p %{_target_platform} @@ -112,6 +124,11 @@ fi %changelog +* Tue Oct 02 2012 Rex Dieter 0.8.0-0.7.20121002git +- 20121002git snapshot +- initial systemd_inhibit support (#830181) +- displays wrong warning when no updates are available (#851864) + * Fri Sep 07 2012 Rex Dieter 0.8.0-0.6.20120724git - add scriptlet to register mimetypes (#836559) From dad8ad5700a572a624166660e6380ec0152bd415 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 2 Oct 2012 14:05:19 -0500 Subject: [PATCH 017/111] update sources --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 07edc14..3c9d074 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /apper-0.7.2.tar.bz2 -/apper-0.8.0-20120724.tar.bz2 +/apper-0.8.0-20121002.tar.bz2 diff --git a/sources b/sources index 1e99c80..9445f22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -735dc4fb0c30289a33b2ec0ecc13cb4c apper-0.8.0-20120724.tar.bz2 +84227ffb6c4d3e623d56a3794680ea57 apper-0.8.0-20121002.tar.bz2 From f72c997f867ac0203ebab9c91c9f48e58dbd340d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Mon, 15 Oct 2012 18:22:52 +0200 Subject: [PATCH 018/111] 20121015git snapshot, hopefully solving #866486 - Apper: cannot perform system update --- .gitignore | 1 + apper.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3c9d074..a13876d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20121002.tar.bz2 +/apper-0.8.0-20121015.tar.bz2 diff --git a/apper.spec b/apper.spec index 401f1cf..65c4847 100644 --- a/apper.spec +++ b/apper.spec @@ -4,16 +4,16 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20121002 +%define snap 20121015 Name: apper Version: 0.8.0 -Release: 0.7.%{snap}git%{?dist} +Release: 0.8.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rc --version 0.8.0 +# use releaseme/apper.rb --version 0.8.0 Source0: apper-%{version}-%{snap}.tar.bz2 %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 @@ -124,6 +124,10 @@ fi %changelog +* Mon Oct 15 2012 Lukáš Tinkl 0.8.0-0.8.20121015git +- 20121015git snapshot, hopefully solving #866486 - Apper: cannot perform + system update + * Tue Oct 02 2012 Rex Dieter 0.8.0-0.7.20121002git - 20121002git snapshot - initial systemd_inhibit support (#830181) diff --git a/sources b/sources index 9445f22..48938c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84227ffb6c4d3e623d56a3794680ea57 apper-0.8.0-20121002.tar.bz2 +052a08962528a10cabe551358227a143 apper-0.8.0-20121015.tar.bz2 From f8e7084b80d167e30bd386f25e20b857c49008ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Mon, 15 Oct 2012 19:41:38 +0200 Subject: [PATCH 019/111] disable temporarily --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 65c4847..742b352 100644 --- a/apper.spec +++ b/apper.spec @@ -54,7 +54,7 @@ KDE interface for PackageKit. %prep %setup -q -%patch50 -p1 -b .systemd_inhibit +#%patch50 -p1 -b .systemd_inhibit # hack, allow to build against our patched pk-0.8.4 sed -i -e \ From 9a17d210e9a2e23eb499e6a1fa0faad5fc953358 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 Oct 2012 13:35:41 -0500 Subject: [PATCH 020/111] Revert "20121015git snapshot, hopefully solving #866486 - Apper: cannot perform" This reverts commit f72c997f867ac0203ebab9c91c9f48e58dbd340d. --- .gitignore | 1 - apper.spec | 10 +++------- sources | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a13876d..3c9d074 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20121002.tar.bz2 -/apper-0.8.0-20121015.tar.bz2 diff --git a/apper.spec b/apper.spec index 742b352..1e10a6d 100644 --- a/apper.spec +++ b/apper.spec @@ -4,16 +4,16 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20121015 +%define snap 20121002 Name: apper Version: 0.8.0 -Release: 0.8.%{snap}git%{?dist} +Release: 0.7.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rb --version 0.8.0 +# use releaseme/apper.rc --version 0.8.0 Source0: apper-%{version}-%{snap}.tar.bz2 %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 @@ -124,10 +124,6 @@ fi %changelog -* Mon Oct 15 2012 Lukáš Tinkl 0.8.0-0.8.20121015git -- 20121015git snapshot, hopefully solving #866486 - Apper: cannot perform - system update - * Tue Oct 02 2012 Rex Dieter 0.8.0-0.7.20121002git - 20121002git snapshot - initial systemd_inhibit support (#830181) diff --git a/sources b/sources index 48938c1..9445f22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -052a08962528a10cabe551358227a143 apper-0.8.0-20121015.tar.bz2 +84227ffb6c4d3e623d56a3794680ea57 apper-0.8.0-20121002.tar.bz2 From ef7b57ffb196a1357d8177341341da8e285d5134 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 Oct 2012 13:38:00 -0500 Subject: [PATCH 021/111] 0.8.0-0.8.20121002git - drop systemd_inhibit (here at least, PK or elsewhere is better) - Apper: cannot perform system update (#866486) --- apper-0.8.0-systemd_inhibit.patch | 96 ------------------------------- apper.spec | 8 ++- 2 files changed, 5 insertions(+), 99 deletions(-) delete mode 100644 apper-0.8.0-systemd_inhibit.patch diff --git a/apper-0.8.0-systemd_inhibit.patch b/apper-0.8.0-systemd_inhibit.patch deleted file mode 100644 index 0c2cade..0000000 --- a/apper-0.8.0-systemd_inhibit.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/Sentinel/TransactionWatcher.cpp b/Sentinel/TransactionWatcher.cpp -index 05b49cc..12201fd 100644 ---- a/Sentinel/TransactionWatcher.cpp -+++ b/Sentinel/TransactionWatcher.cpp -@@ -2,6 +2,8 @@ - * Copyright (C) 2008-2011 by Daniel Nicoletti * - * dantti12@gmail.com * - * * -+ * (c) 2012 Lukáš Tinkl * -+ * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * -@@ -18,6 +20,8 @@ - * Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -+#include -+ - #include "TransactionWatcher.h" - - #include "TransactionJob.h" -@@ -40,6 +44,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #include - -@@ -53,7 +60,8 @@ TransactionWatcher::TransactionWatcher(QObject *parent) : - m_currentTransaction(0), - m_messagesSNI(0), - m_restartSNI(0), -- m_inhibitCookie(-1) -+ m_inhibitCookie(-1), -+ m_sdInhibitDescriptor(-1) - { - m_transHasJob = false; - m_tracker = new KUiServerJobTracker(this); -@@ -412,12 +420,36 @@ void TransactionWatcher::suppressSleep(bool enable, const QString &reason) - if (m_inhibitCookie == -1) { - kDebug() << "Sleep suppression denied!"; - } -+ -+ // also tell systemd-inhibit -+ QDBusInterface managerIface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1", QDBusConnection::systemBus()); -+ QVariantList args; -+ args << "shutdown:sleep:idle"; // what -+ args << i18n("apper"); // who -+ args << reason; // why -+ args << "block"; // mode -+ QDBusPendingReply desc = managerIface.asyncCallWithArgumentList("Inhibit", args); -+ desc.waitForFinished(); -+ if (desc.isValid() && desc.value().isValid()) { -+ m_sdInhibitDescriptor = dup(desc.value().fileDescriptor()); -+ } -+ else -+ kWarning() << "failed to inhibit shutdown using systemd"; - } -- } else if (m_inhibitCookie != -1) { -- kDebug() << "Stop Suppressing Sleep"; -- if (!Solid::PowerManagement::stopSuppressingSleep(m_inhibitCookie)) { -- kDebug() << "Stop failed: invalid cookie."; -+ } else { -+ if (m_inhibitCookie != -1) { -+ kDebug() << "Stop Suppressing Sleep"; -+ if (!Solid::PowerManagement::stopSuppressingSleep(m_inhibitCookie)) { -+ kDebug() << "Stop failed: invalid cookie."; -+ } -+ m_inhibitCookie = -1; -+ } -+ -+ if (m_sdInhibitDescriptor != -1) { -+ ::close(m_sdInhibitDescriptor); -+ m_sdInhibitDescriptor = -1; - } -- m_inhibitCookie = -1; -+ else -+ kWarning() << "invalid systemd-inhibit cookie"; - } - } -diff --git a/Sentinel/TransactionWatcher.h b/Sentinel/TransactionWatcher.h -index b498718..c4a9d9a 100644 ---- a/Sentinel/TransactionWatcher.h -+++ b/Sentinel/TransactionWatcher.h -@@ -78,6 +78,7 @@ private: - - // cookie to suppress sleep - int m_inhibitCookie; -+ int m_sdInhibitDescriptor; - KUiServerJobTracker *m_tracker; - }; - diff --git a/apper.spec b/apper.spec index 1e10a6d..987532c 100644 --- a/apper.spec +++ b/apper.spec @@ -8,7 +8,7 @@ Name: apper Version: 0.8.0 -Release: 0.7.%{snap}git%{?dist} +Release: 0.8.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -54,8 +54,6 @@ KDE interface for PackageKit. %prep %setup -q -#%patch50 -p1 -b .systemd_inhibit - # hack, allow to build against our patched pk-0.8.4 sed -i -e \ "s|^set(QPACKAGEKIT_MIN_VERSION 0.8.5)|set(QPACKAGEKIT_MIN_VERSION 0.8.4)|" \ @@ -124,6 +122,10 @@ fi %changelog +* Mon Oct 15 2012 Rex Dieter - 0.8.0-0.8.20121002git +- drop systemd_inhibit (here at least, PK or elsewhere is better) +- Apper: cannot perform system update (#866486) + * Tue Oct 02 2012 Rex Dieter 0.8.0-0.7.20121002git - 20121002git snapshot - initial systemd_inhibit support (#830181) From 3a576ae0fe14bf0349d9f90d217d2f8bf261f59d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 Oct 2012 13:43:44 -0500 Subject: [PATCH 022/111] *really* drop systemd_inhibit patch --- apper.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apper.spec b/apper.spec index 987532c..e030897 100644 --- a/apper.spec +++ b/apper.spec @@ -21,7 +21,6 @@ Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.ta URL: http://kde-apps.org/content/show.php/Apper?content=84745 ## upstreamable patches -Patch50: apper-0.8.0-systemd_inhibit.patch ## upstream patches From 4a3bde1526f3fd4c499cb6f96f305ebe711b6565 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 30 Oct 2012 11:14:30 -0500 Subject: [PATCH 023/111] 20121024git snapshot (for pk-0.8.5) --- .gitignore | 1 + apper.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3c9d074..8f1d3a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20121002.tar.bz2 +/apper-0.8.0-20121024.tar.bz2 diff --git a/apper.spec b/apper.spec index 987532c..5cc337b 100644 --- a/apper.spec +++ b/apper.spec @@ -1,14 +1,14 @@ -%define pk_min_version 0.8.4 -%define pk_version 0.8.4-2 +%define pk_min_version 0.8.5 +#define pk_version 0.8.5 ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20121002 +%define snap 20121024 Name: apper Version: 0.8.0 -Release: 0.8.%{snap}git%{?dist} +Release: 0.9.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -54,10 +54,6 @@ KDE interface for PackageKit. %prep %setup -q -# hack, allow to build against our patched pk-0.8.4 -sed -i -e \ - "s|^set(QPACKAGEKIT_MIN_VERSION 0.8.5)|set(QPACKAGEKIT_MIN_VERSION 0.8.4)|" \ - CMakeLists.txt %build mkdir -p %{_target_platform} @@ -119,9 +115,18 @@ fi %{_datadir}/app-install/categories.xml %endif %{_mandir}/man1/apper.1* +# should probably omit this, but meh -- rex +%if 1 +%{_kde4_libdir}/kde4/plasma_applet_updater.so +%{_kde4_appsdir}/plasma/packages/org.packagekit.updater/ +%{_kde4_datadir}/kde4/services/plasma-applet-updater.desktop +%endif %changelog +* Tue Oct 30 2012 Rex Dieter 0.8.0-0.9.20121024git +- 20121024git snapshot (for pk-0.8.5) + * Mon Oct 15 2012 Rex Dieter - 0.8.0-0.8.20121002git - drop systemd_inhibit (here at least, PK or elsewhere is better) - Apper: cannot perform system update (#866486) diff --git a/sources b/sources index 9445f22..a0f049e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84227ffb6c4d3e623d56a3794680ea57 apper-0.8.0-20121002.tar.bz2 +ad98c3bee8a506485412c3e0d75dac71 apper-0.8.0-20121024.tar.bz2 From 205eba9d598bc8deea2df5cdab8b039cd9e90744 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 2 Nov 2012 13:36:46 -0500 Subject: [PATCH 024/111] 20121102git snapshot --- .gitignore | 2 +- apper.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8f1d3a7..6870c45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20121002.tar.bz2 -/apper-0.8.0-20121024.tar.bz2 +/apper-0.8.0-20121102.tar.bz2 diff --git a/apper.spec b/apper.spec index 5cc337b..98109f7 100644 --- a/apper.spec +++ b/apper.spec @@ -4,11 +4,11 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20121024 +%define snap 20121102 Name: apper Version: 0.8.0 -Release: 0.9.%{snap}git%{?dist} +Release: 0.10.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -39,7 +39,7 @@ BuildRequires: pkgconfig(dbus-1) %if 0%{?pk_version:1} BuildRequires: PackageKit-qt-devel >= %{pk_version} %else -BuildRequires: pkgconfig(packagekit-qt2) >= %{pk_min_version}} +BuildRequires: pkgconfig(packagekit-qt2) >= %{pk_min_version} %global pk_version %(pkg-config --modversion packagekit-qt 2> /dev/null || echo %{pk_min_version}) %endif @@ -71,7 +71,7 @@ make %{?_smp_mflags} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang apper --with-kde || echo "WARNING: missing translations" +%find_lang apper --all-name --with-kde || echo "WARNING: missing translations" # hack around gnome-packagekit conflict mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ @@ -81,6 +81,7 @@ mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ chrpath --list %{buildroot}%{_kde4_bindir}/apper chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper + %check desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.desktop @@ -115,15 +116,16 @@ fi %{_datadir}/app-install/categories.xml %endif %{_mandir}/man1/apper.1* -# should probably omit this, but meh -- rex -%if 1 +# plasma-applet-updater %{_kde4_libdir}/kde4/plasma_applet_updater.so %{_kde4_appsdir}/plasma/packages/org.packagekit.updater/ %{_kde4_datadir}/kde4/services/plasma-applet-updater.desktop -%endif %changelog +* Fri Nov 02 2012 Rex Dieter 0.8.0-0.10.20121102git +- 20121102git snapshot + * Tue Oct 30 2012 Rex Dieter 0.8.0-0.9.20121024git - 20121024git snapshot (for pk-0.8.5) diff --git a/sources b/sources index a0f049e..3ed0201 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad98c3bee8a506485412c3e0d75dac71 apper-0.8.0-20121024.tar.bz2 +4cd7973fe19aacd55c428df1ea4c3dc8 apper-0.8.0-20121102.tar.bz2 From 8c2ddfe818368cea154fe84e04518997655faee5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 2 Nov 2012 15:03:32 -0500 Subject: [PATCH 025/111] drop old patch reference --- apper.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/apper.spec b/apper.spec index 98109f7..b8bc402 100644 --- a/apper.spec +++ b/apper.spec @@ -20,9 +20,6 @@ Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.ta %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 -## upstreamable patches -Patch50: apper-0.8.0-systemd_inhibit.patch - ## upstream patches Obsoletes: kpackagekit < 0.7.0 From 934ed3c79587864afa1d1c0f91f9e66ba59f28b7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Nov 2012 14:08:26 -0600 Subject: [PATCH 026/111] 0.8.0-0.11.20121126git - 20121126git snapshot - use PackageKit-Qt --- .gitignore | 3 +-- apper.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 6870c45..7548970 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /apper-0.7.2.tar.bz2 -/apper-0.8.0-20121002.tar.bz2 -/apper-0.8.0-20121102.tar.bz2 +/apper-0.8.0-20121126.tar.bz2 diff --git a/apper.spec b/apper.spec index b8bc402..f1290fd 100644 --- a/apper.spec +++ b/apper.spec @@ -1,10 +1,9 @@ -%define pk_min_version 0.8.5 -#define pk_version 0.8.5 +%define pk_min_version 0.8.6 ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20121102 +%define snap 20121126 Name: apper Version: 0.8.0 @@ -31,18 +30,18 @@ BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs4-devel -BuildRequires: kdebase-workspace-devel +BuildRequires: kde-workspace-devel BuildRequires: pkgconfig(dbus-1) %if 0%{?pk_version:1} -BuildRequires: PackageKit-qt-devel >= %{pk_version} +BuildRequires: PackageKit-Qt-devel >= %{pk_version} %else BuildRequires: pkgconfig(packagekit-qt2) >= %{pk_min_version} -%global pk_version %(pkg-config --modversion packagekit-qt 2> /dev/null || echo %{pk_min_version}) +%global pk_version %(pkg-config --modversion packagekit-qt2 2> /dev/null || echo %{pk_min_version}) %endif %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} -Requires: PackageKit-qt%{?_isa} >= %{pk_version} +Requires: PackageKit-Qt%{?_isa} >= %{pk_version} %description KDE interface for PackageKit. @@ -120,6 +119,10 @@ fi %changelog +* Mon Nov 26 2012 Rex Dieter 0.8.0-0.11.20121126git +- 20121126git snapshot +- use PackageKit-Qt + * Fri Nov 02 2012 Rex Dieter 0.8.0-0.10.20121102git - 20121102git snapshot diff --git a/sources b/sources index 3ed0201..7bdeec0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cd7973fe19aacd55c428df1ea4c3dc8 apper-0.8.0-20121102.tar.bz2 +d3ee1deed2f54de114ecef536af5088b apper-0.8.0-20121126.tar.bz2 From 154d6a89e142e9fa3b36de6add568fa53bc98eba Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Nov 2012 14:10:10 -0600 Subject: [PATCH 027/111] Release++ --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index f1290fd..002a5a7 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 0.10.%{snap}git%{?dist} +Release: 0.11.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ From ed99b0c6803b945bc9704a7bf20028d1d66ca262 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 1 Jan 2013 17:23:10 -0600 Subject: [PATCH 028/111] 0.8.0-0.12.20121231git - 20121231 snapshot - enable apper updater systray applet --- .gitignore | 1 + 01-fedora-apper-updater.js | 47 ++++++++++++++++++++++++++++++++++++++ apper.spec | 22 ++++++++++++++---- sources | 2 +- 4 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 01-fedora-apper-updater.js diff --git a/.gitignore b/.gitignore index 7548970..af33826 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0-20121126.tar.bz2 +/apper-0.8.0-20121231.tar.bz2 diff --git a/01-fedora-apper-updater.js b/01-fedora-apper-updater.js new file mode 100644 index 0000000..c9afb36 --- /dev/null +++ b/01-fedora-apper-updater.js @@ -0,0 +1,47 @@ +/* + 01-fedora-apper.js - Add Apper updater plasmoid to the systray + Copyright (C) 2010-2012 Kevin Kofler + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Portions lifted from 01-kubuntu-10.04.js: + Harald Sitter, apachelogger@ubuntu.com 2010-04-02 + Jonathan Riddell, jriddell@ubuntu.com 2010-02-18 + Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later +*/ + +systrayFound = false; +pids = panelIds; +for (i = 0; i < pids.length; ++i) { + p = panelById(pids[i]); + if (!p) continue; + ids = p.widgetIds; + for (j = 0; j < ids.length; ++j) { + w = p.widgetById(ids[j]); + if (!w || w.type != "systemtray") continue; + systrayFound = true; + w.currentConfigGroup = new Array("Applets"); + max = 0; + for (k = 0; k < w.configGroups.length; ++k) + if (parseInt(w.configGroups[k]) > max) + max = parseInt(w.configGroups[k]); + w.currentConfigGroup = new Array("Applets", max + 1); + w.writeConfig("plugin", "updater"); + print("Apper updater plasmoid added to the systray"); + break; + } + if (systrayFound) break; +} +if (!systrayFound) + print("No systray found"); diff --git a/apper.spec b/apper.spec index 002a5a7..76ba271 100644 --- a/apper.spec +++ b/apper.spec @@ -3,7 +3,7 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20121126 +%define snap 20121231 Name: apper Version: 0.8.0 @@ -19,6 +19,9 @@ Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.ta %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 +# plasma js to enable apper updater +Source10: 01-fedora-apper-updater.js + ## upstream patches Obsoletes: kpackagekit < 0.7.0 @@ -77,6 +80,12 @@ mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ chrpath --list %{buildroot}%{_kde4_bindir}/apper chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper +# show apper updater systray applet by default +install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-apper-updater.js +mkdir -p %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/ +ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-apper-updater.js\ + %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-apper-updater.js + %check desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.desktop @@ -96,15 +105,14 @@ fi %{_kde4_libdir}/apper/ %{_kde4_libdir}/kde4/kcm_apper.so %{_kde4_libdir}/kde4/kded_apperd.so -%{_kde4_libexecdir}/apper-sentinel %{_kde4_datadir}/applications/kde4/apper.desktop %{_kde4_datadir}/applications/kde4/apper_*.desktop %{_kde4_datadir}/kde4/services/kcm_apper.desktop %{_kde4_datadir}/kde4/services/kded/apperd.desktop %{_kde4_appsdir}/apper/ -%{_kde4_appsdir}/ApperSentinel/ +%{_kde4_appsdir}/apperd/ %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -%{_datadir}/dbus-1/services/org.kde.ApperSentinel.service +%{_kde4_libexecdir}/apper-pk-session %if 0%{?app_install} # own this until app-install or something better comes along -- Rex %dir %{_datadir}/app-install @@ -116,9 +124,15 @@ fi %{_kde4_libdir}/kde4/plasma_applet_updater.so %{_kde4_appsdir}/plasma/packages/org.packagekit.updater/ %{_kde4_datadir}/kde4/services/plasma-applet-updater.desktop +%{_kde4_appsdir}/plasma-desktop/init/01-fedora-apper-updater.js +%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-apper-updater.js %changelog +* Tue Jan 01 2013 Rex Dieter - 0.8.0-0.12.20121231git +- 20121231 snapshot +- enable apper updater systray applet + * Mon Nov 26 2012 Rex Dieter 0.8.0-0.11.20121126git - 20121126git snapshot - use PackageKit-Qt diff --git a/sources b/sources index 7bdeec0..f6bfe6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3ee1deed2f54de114ecef536af5088b apper-0.8.0-20121126.tar.bz2 +7151be6644386439165339be0a1b3ee2 apper-0.8.0-20121231.tar.bz2 From e3f164677b9298acfa0e651bfa258215f653bb4f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 1 Jan 2013 17:24:04 -0600 Subject: [PATCH 029/111] Release++ (oops) --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 76ba271..a72aa2a 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 0.11.%{snap}git%{?dist} +Release: 0.12.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ From 08e0e12e94419bdb67731ac81c16124fe4977681 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 5 Jan 2013 15:11:19 -0600 Subject: [PATCH 030/111] Problems with the display of software origins (#891294) --- ...o-origins-page-and-debug-checked-but.patch | 85 +++++++++++++++++++ apper.spec | 7 +- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 Fix-going-back-to-origins-page-and-debug-checked-but.patch diff --git a/Fix-going-back-to-origins-page-and-debug-checked-but.patch b/Fix-going-back-to-origins-page-and-debug-checked-but.patch new file mode 100644 index 0000000..26ce868 --- /dev/null +++ b/Fix-going-back-to-origins-page-and-debug-checked-but.patch @@ -0,0 +1,85 @@ +From b3410a124e19a5d904aa37bd308c4233ebc69e53 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Sat, 5 Jan 2013 13:12:03 -0200 +Subject: [PATCH] Fix going back to origins page and debug checked but not + honored Fixes RedHat bug: 891294 + +--- + ApperKCM/ApperKCM.cpp | 3 ++- + ApperKCM/Settings/Settings.cpp | 15 ++++++++++++++- + plasmoid/updaterapplet.cpp | 5 ----- + 3 files changed, 16 insertions(+), 7 deletions(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index c6103a3..a7b8640 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -482,9 +482,10 @@ void ApperKCM::setPage(const QString &page) + setButtons(KCModule::Default | KCModule::Apply); + emit changed(true); // THIS IS DUMB setButtons only take effect after changed goes true + emit changed(false); ++ generalSettingsPB->setChecked(true); ++ stackedWidgetBar->setCurrentIndex(BAR_SETTINGS); + stackedWidget->setCurrentWidget(m_settingsPage); + m_settingsPage->load(); +- stackedWidgetBar->setCurrentIndex(BAR_SETTINGS); + titleL->clear(); + backTB->setEnabled(true); + } +diff --git a/ApperKCM/Settings/Settings.cpp b/ApperKCM/Settings/Settings.cpp +index 2c27810..7f54adb 100644 +--- a/ApperKCM/Settings/Settings.cpp ++++ b/ApperKCM/Settings/Settings.cpp +@@ -156,6 +156,13 @@ void Settings::on_showOriginsCB_stateChanged(int state) + if (!transaction->error()) { + m_busySeq->start(); + } ++ ++ KConfig config("apper"); ++ KConfigGroup originsDialog(&config, "originsDialog"); ++ bool showDevel = originsDialog.readEntry("showDevel", false); ++ if (showDevel != ui->showOriginsCB->isChecked()) { ++ originsDialog.writeEntry("showDevel", ui->showOriginsCB->isChecked()); ++ } + } + + bool Settings::hasChanges() const +@@ -254,7 +261,13 @@ void Settings::load() + + // Load origns list + if (m_roles & Transaction::RoleGetRepoList) { +- on_showOriginsCB_stateChanged(Qt::Unchecked); ++ KConfigGroup originsDialog(&config, "originsDialog"); ++ bool showDevel = originsDialog.readEntry("showDevel", false); ++ ui->showOriginsCB->setChecked(showDevel); ++ on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); ++ ui->originTV->setEnabled(true); ++ } else { ++ ui->originTV->setEnabled(false); + } + + // hide battery options if we are on a desktop computer +diff --git a/plasmoid/updaterapplet.cpp b/plasmoid/updaterapplet.cpp +index 1570629..961c18f 100644 +--- a/plasmoid/updaterapplet.cpp ++++ b/plasmoid/updaterapplet.cpp +@@ -29,16 +29,11 @@ + #include + #include + +-#include +-#include +- + #include + #include + #include + #include + +-#include +- + #include + #include + #include +-- +1.8.1 + diff --git a/apper.spec b/apper.spec index a72aa2a..177bd39 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 0.12.%{snap}git%{?dist} +Release: 0.13.%{snap}git%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -23,6 +23,7 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-apper-updater.js ## upstream patches +Patch100: Fix-going-back-to-origins-page-and-debug-checked-but.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -52,6 +53,7 @@ KDE interface for PackageKit. %prep %setup -q +%patch100 -p1 -b .100 %build @@ -129,6 +131,9 @@ fi %changelog +* Sat Jan 05 2013 Rex Dieter 0.8.0-0.13.20121231git +- Problems with the display of software origins (#891294) + * Tue Jan 01 2013 Rex Dieter - 0.8.0-0.12.20121231git - 20121231 snapshot - enable apper updater systray applet From dfc27be4d1dd8718302235bc379f5682f2a0fbd7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 8 Jan 2013 22:29:36 -0600 Subject: [PATCH 031/111] 0.8.0 --- .gitignore | 3 +- ...sing-double-click-on-the-desktop-BUG.patch | 39 +++++++++ ...o-origins-page-and-debug-checked-but.patch | 85 ------------------- apper.spec | 11 ++- sources | 2 +- 5 files changed, 48 insertions(+), 92 deletions(-) create mode 100644 0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch delete mode 100644 Fix-going-back-to-origins-page-and-debug-checked-but.patch diff --git a/.gitignore b/.gitignore index af33826..d6b00ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /apper-0.7.2.tar.bz2 -/apper-0.8.0-20121126.tar.bz2 -/apper-0.8.0-20121231.tar.bz2 +/apper-0.8.0.tar.bz2 diff --git a/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch b/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch new file mode 100644 index 0000000..2d4c33e --- /dev/null +++ b/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch @@ -0,0 +1,39 @@ +From 808ed3e2cc55415fcff70686afdacf1a8190db72 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Tue, 8 Jan 2013 20:03:31 -0200 +Subject: [PATCH] Fixed bug when using double click on the desktop, BUG:302786 + +--- + ApperKCM/ApperKCM.cpp | 2 +- + ApperKCM/ApperKCM.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index 2a83f69..14a5cd6 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -370,7 +370,7 @@ void ApperKCM::on_actionFindFile_triggered() + } + } + +-void ApperKCM::on_homeView_clicked(const QModelIndex &index) ++void ApperKCM::on_homeView_activated(const QModelIndex &index) + { + if (index.isValid()) { + const QSortFilterProxyModel *proxy; +diff --git a/ApperKCM/ApperKCM.h b/ApperKCM/ApperKCM.h +index 3989f13..07660ec 100644 +--- a/ApperKCM/ApperKCM.h ++++ b/ApperKCM/ApperKCM.h +@@ -76,7 +76,7 @@ private slots: + void on_actionFindDescription_triggered(); + void on_actionFindFile_triggered(); + +- void on_homeView_clicked(const QModelIndex &index); ++ void on_homeView_activated(const QModelIndex &index); + + void finished(); + void errorCode(PackageKit::Transaction::Error error, const QString &detail); +-- +1.8.1 + diff --git a/Fix-going-back-to-origins-page-and-debug-checked-but.patch b/Fix-going-back-to-origins-page-and-debug-checked-but.patch deleted file mode 100644 index 26ce868..0000000 --- a/Fix-going-back-to-origins-page-and-debug-checked-but.patch +++ /dev/null @@ -1,85 +0,0 @@ -From b3410a124e19a5d904aa37bd308c4233ebc69e53 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Sat, 5 Jan 2013 13:12:03 -0200 -Subject: [PATCH] Fix going back to origins page and debug checked but not - honored Fixes RedHat bug: 891294 - ---- - ApperKCM/ApperKCM.cpp | 3 ++- - ApperKCM/Settings/Settings.cpp | 15 ++++++++++++++- - plasmoid/updaterapplet.cpp | 5 ----- - 3 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index c6103a3..a7b8640 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -482,9 +482,10 @@ void ApperKCM::setPage(const QString &page) - setButtons(KCModule::Default | KCModule::Apply); - emit changed(true); // THIS IS DUMB setButtons only take effect after changed goes true - emit changed(false); -+ generalSettingsPB->setChecked(true); -+ stackedWidgetBar->setCurrentIndex(BAR_SETTINGS); - stackedWidget->setCurrentWidget(m_settingsPage); - m_settingsPage->load(); -- stackedWidgetBar->setCurrentIndex(BAR_SETTINGS); - titleL->clear(); - backTB->setEnabled(true); - } -diff --git a/ApperKCM/Settings/Settings.cpp b/ApperKCM/Settings/Settings.cpp -index 2c27810..7f54adb 100644 ---- a/ApperKCM/Settings/Settings.cpp -+++ b/ApperKCM/Settings/Settings.cpp -@@ -156,6 +156,13 @@ void Settings::on_showOriginsCB_stateChanged(int state) - if (!transaction->error()) { - m_busySeq->start(); - } -+ -+ KConfig config("apper"); -+ KConfigGroup originsDialog(&config, "originsDialog"); -+ bool showDevel = originsDialog.readEntry("showDevel", false); -+ if (showDevel != ui->showOriginsCB->isChecked()) { -+ originsDialog.writeEntry("showDevel", ui->showOriginsCB->isChecked()); -+ } - } - - bool Settings::hasChanges() const -@@ -254,7 +261,13 @@ void Settings::load() - - // Load origns list - if (m_roles & Transaction::RoleGetRepoList) { -- on_showOriginsCB_stateChanged(Qt::Unchecked); -+ KConfigGroup originsDialog(&config, "originsDialog"); -+ bool showDevel = originsDialog.readEntry("showDevel", false); -+ ui->showOriginsCB->setChecked(showDevel); -+ on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); -+ ui->originTV->setEnabled(true); -+ } else { -+ ui->originTV->setEnabled(false); - } - - // hide battery options if we are on a desktop computer -diff --git a/plasmoid/updaterapplet.cpp b/plasmoid/updaterapplet.cpp -index 1570629..961c18f 100644 ---- a/plasmoid/updaterapplet.cpp -+++ b/plasmoid/updaterapplet.cpp -@@ -29,16 +29,11 @@ - #include - #include - --#include --#include -- - #include - #include - #include - #include - --#include -- - #include - #include - #include --- -1.8.1 - diff --git a/apper.spec b/apper.spec index 177bd39..bb7aa12 100644 --- a/apper.spec +++ b/apper.spec @@ -3,11 +3,11 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20121231 +#define snap 20121231 Name: apper Version: 0.8.0 -Release: 0.13.%{snap}git%{?dist} +Release: 1%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -23,7 +23,7 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-apper-updater.js ## upstream patches -Patch100: Fix-going-back-to-origins-page-and-debug-checked-but.patch +Patch101: 0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -53,7 +53,7 @@ KDE interface for PackageKit. %prep %setup -q -%patch100 -p1 -b .100 +%patch101 -p1 -b .0001 %build @@ -131,6 +131,9 @@ fi %changelog +* Tue Jan 08 2013 Rex Dieter 0.8.0-1 +- 0.8.0 + * Sat Jan 05 2013 Rex Dieter 0.8.0-0.13.20121231git - Problems with the display of software origins (#891294) diff --git a/sources b/sources index f6bfe6a..3f05623 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7151be6644386439165339be0a1b3ee2 apper-0.8.0-20121231.tar.bz2 +5838b449268e27d688a8c9bc2a8b31fc apper-0.8.0.tar.bz2 From 66beaf03ea446fb008f68ab5061ed845df249348 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 9 Jan 2013 11:07:39 -0600 Subject: [PATCH 032/111] pull in a few upstream fixes, including followup for kde#302786 --- ...sing-double-click-on-the-desktop-BUG.patch | 3 +- ...d-to-watch-a-transaction-when-it-s-j.patch | 26 +++++++++ ...sage-by-not-setting-an-initial-state.patch | 26 +++++++++ ...Adds-a-Help-menu-to-Apper-BUG-293440.patch | 53 +++++++++++++++++++ ...ction-caused-by-a-fix-for-BUG-302786.patch | 25 +++++++++ apper.spec | 22 +++++++- 6 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch create mode 100644 0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch create mode 100644 0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch create mode 100644 0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch diff --git a/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch b/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch index 2d4c33e..9c086ec 100644 --- a/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch +++ b/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch @@ -1,7 +1,8 @@ From 808ed3e2cc55415fcff70686afdacf1a8190db72 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Tue, 8 Jan 2013 20:03:31 -0200 -Subject: [PATCH] Fixed bug when using double click on the desktop, BUG:302786 +Subject: [PATCH 1/5] Fixed bug when using double click on the desktop, + BUG:302786 --- ApperKCM/ApperKCM.cpp | 2 +- diff --git a/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch b/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch new file mode 100644 index 0000000..14d5c63 --- /dev/null +++ b/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch @@ -0,0 +1,26 @@ +From 7fb3d6dff1705e9a49953e775cadcf22c5bd2699 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 12:49:29 -0200 +Subject: [PATCH 2/5] Don't tell apperd to watch a transaction when it's just + simulating + +--- + libapper/PkTransaction.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp +index c81f8bf..9ab949b 100644 +--- a/libapper/PkTransaction.cpp ++++ b/libapper/PkTransaction.cpp +@@ -395,7 +395,7 @@ void PkTransaction::slotChanged() + } + + QDBusObjectPath _tid = tid(); +- if (d->tid != _tid) { ++ if (d->tid != _tid && !(d->flags & Transaction::TransactionFlagSimulate)) { + // if the transaction changed and + // the user wants the watcher send the tid + QDBusMessage message; +-- +1.8.1 + diff --git a/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch b/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch new file mode 100644 index 0000000..1323846 --- /dev/null +++ b/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch @@ -0,0 +1,26 @@ +From 2990121024410801e9767871297f369512cf0c72 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 13:02:59 -0200 +Subject: [PATCH 3/5] Reduce the CPU usage by not setting an initial state when + starting (makes BusyCurso not run which eats CPU) + +--- + plasmoid/package/contents/ui/main.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml +index 222ce97..89bcef9 100644 +--- a/plasmoid/package/contents/ui/main.qml ++++ b/plasmoid/package/contents/ui/main.qml +@@ -23,7 +23,7 @@ import org.packagekit 0.1 as PackageKit + FocusScope { + id: root + +- state: "BUSY" ++ state: "" + + property int minimumHeight: 320 + property int minimumWidth: 370 +-- +1.8.1 + diff --git a/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch b/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch new file mode 100644 index 0000000..d209927 --- /dev/null +++ b/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch @@ -0,0 +1,53 @@ +From a7d3614e0cc9bb4dcd0720281f8760578a93465c Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 13:50:59 -0200 +Subject: [PATCH 4/5] Adds a Help menu to Apper BUG 293440 + +--- + Apper/MainUi.cpp | 3 ++- + ApperKCM/ApperKCM.cpp | 8 ++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/Apper/MainUi.cpp b/Apper/MainUi.cpp +index 587d75a..31c2092 100644 +--- a/Apper/MainUi.cpp ++++ b/Apper/MainUi.cpp +@@ -39,7 +39,8 @@ MainUi::MainUi(QWidget *parent) + // Set Apply and Cancel buttons + setButtons(KDialog::Apply /*| KDialog::Help*/ | KDialog::Default | KDialog::Reset); + +- KPageWidgetItem *page = addModule("kcm_apper.desktop"); ++ KPageWidgetItem *page = addModule(QLatin1String("kcm_apper.desktop"), ++ QStringList() << QLatin1String("apper")); + if (page) { + KCModuleProxy *proxy = static_cast(page->widget()); + if (proxy) { +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index 14a5cd6..a6677b0 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -221,6 +222,13 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : + connect(signalMapper, SIGNAL(mapped(QString)), + this, SLOT(setPage(QString))); + ++ // Only show help menu if not on System Settings ++ if (!args.isEmpty()) { ++ // adds the help menu ++ KHelpMenu *helpMenu = new KHelpMenu(this); ++ menu->addMenu(helpMenu->menu()); ++ } ++ + // Make sure the search bar is visible + ui->stackedWidgetBar->setCurrentIndex(BAR_SEARCH); + } +-- +1.8.1 + diff --git a/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch b/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch new file mode 100644 index 0000000..ef1f74f --- /dev/null +++ b/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch @@ -0,0 +1,25 @@ +From decb93370d447c368cf2255c6b2c7f4502844cc8 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 14:48:49 -0200 +Subject: [PATCH 5/5] Fix a connection caused by a fix for BUG:302786 + +--- + ApperKCM/ApperKCM.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index a6677b0..b408fe9 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -110,7 +110,7 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : + toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + + connect(ui->browseView, SIGNAL(categoryActivated(QModelIndex)), +- this, SLOT(on_homeView_clicked(QModelIndex))); ++ this, SLOT(on_homeView_activated(QModelIndex))); + + QMenu *findMenu = new QMenu(this); + // find is just a generic name in case we don't have any search method +-- +1.8.1 + diff --git a/apper.spec b/apper.spec index bb7aa12..171d2b1 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -24,12 +24,17 @@ Source10: 01-fedora-apper-updater.js ## upstream patches Patch101: 0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch +Patch102: 0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch +Patch103: 0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch +Patch104: 0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch +Patch105: 0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} # required because gnome-packagekit provides exactly the same interface Provides: PackageKit-session-service +BuildRequires: git-core BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext @@ -53,7 +58,17 @@ KDE interface for PackageKit. %prep %setup -q -%patch101 -p1 -b .0001 + +git init +if [ -z "$GIT_COMMITTER_NAME" ]; then +git config user.email "kde@lists.fedoraproject.org" +git config user.name "Fedora KDE SIG" +fi +git add . +git commit -a -q -m "%{version} baseline." + +# Apply all the patches +git am -p1 %{patches} < /dev/null %build @@ -131,6 +146,9 @@ fi %changelog +* Wed Jan 09 2013 Rex Dieter 0.8.0-2 +- pull in a few upstream fixes, including followup for kde#302786 + * Tue Jan 08 2013 Rex Dieter 0.8.0-1 - 0.8.0 From 8c64312f48bf1ac2c4389a2c1a5a4947077ac2bd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Feb 2013 07:33:26 -0600 Subject: [PATCH 033/111] a few more upstream fixes --- ...sing-double-click-on-the-desktop-BUG.patch | 4 +- ...d-to-watch-a-transaction-when-it-s-j.patch | 4 +- ...sage-by-not-setting-an-initial-state.patch | 6 +- ...Adds-a-Help-menu-to-Apper-BUG-293440.patch | 4 +- ...ction-caused-by-a-fix-for-BUG-302786.patch | 4 +- ...stallation-of-files-in-non-latin-pat.patch | 84 ++++ ...ke-hide-button-more-clear-BUG-263309.patch | 68 ++++ 0008-Fix-about-application-icon.patch | 29 ++ ...plication-dialog-in-Apper-BUG-293440.patch | 33 ++ ...lication-status-in-window-title-BUG-.patch | 378 ++++++++++++++++++ 0014-Fix-browsing-groups.patch | 26 ++ ...e-toggle-repos-so-that-we-can-report.patch | 303 ++++++++++++++ ...wnload-is-left-and-use-QPointers-ins.patch | 349 ++++++++++++++++ ...er-a-refresh-cache-made-the-package-.patch | 66 +++ ...-tell-the-user-to-refresh-his-cache-.patch | 158 ++++++++ ...hed-signal-of-ApplicationLaunch-in-o.patch | 41 ++ ...ails-to-show-screenshots-from-softwa.patch | 167 ++++++++ ...refresh-cache-time-from-the-update-c.patch | 83 ++++ 0022-Add-some-margins-to-the-plasmoid.patch | 49 +++ apper.spec | 27 +- 20 files changed, 1870 insertions(+), 13 deletions(-) create mode 100644 0006-Fixes-package-installation-of-files-in-non-latin-pat.patch create mode 100644 0007-Make-hide-button-more-clear-BUG-263309.patch create mode 100644 0008-Fix-about-application-icon.patch create mode 100644 0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch create mode 100644 0010-Feature-show-application-status-in-window-title-BUG-.patch create mode 100644 0014-Fix-browsing-groups.patch create mode 100644 0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch create mode 100644 0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch create mode 100644 0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch create mode 100644 0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch create mode 100644 0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch create mode 100644 0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch create mode 100644 0021-Update-the-last-refresh-cache-time-from-the-update-c.patch create mode 100644 0022-Add-some-margins-to-the-plasmoid.patch diff --git a/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch b/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch index 9c086ec..d81eede 100644 --- a/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch +++ b/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch @@ -1,7 +1,7 @@ From 808ed3e2cc55415fcff70686afdacf1a8190db72 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Tue, 8 Jan 2013 20:03:31 -0200 -Subject: [PATCH 1/5] Fixed bug when using double click on the desktop, +Subject: [PATCH 01/30] Fixed bug when using double click on the desktop, BUG:302786 --- @@ -36,5 +36,5 @@ index 3989f13..07660ec 100644 void finished(); void errorCode(PackageKit::Transaction::Error error, const QString &detail); -- -1.8.1 +1.8.1.2 diff --git a/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch b/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch index 14d5c63..37e5c5a 100644 --- a/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch +++ b/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch @@ -1,7 +1,7 @@ From 7fb3d6dff1705e9a49953e775cadcf22c5bd2699 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Wed, 9 Jan 2013 12:49:29 -0200 -Subject: [PATCH 2/5] Don't tell apperd to watch a transaction when it's just +Subject: [PATCH 02/30] Don't tell apperd to watch a transaction when it's just simulating --- @@ -22,5 +22,5 @@ index c81f8bf..9ab949b 100644 // the user wants the watcher send the tid QDBusMessage message; -- -1.8.1 +1.8.1.2 diff --git a/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch b/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch index 1323846..f881213 100644 --- a/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch +++ b/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch @@ -1,8 +1,8 @@ From 2990121024410801e9767871297f369512cf0c72 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Wed, 9 Jan 2013 13:02:59 -0200 -Subject: [PATCH 3/5] Reduce the CPU usage by not setting an initial state when - starting (makes BusyCurso not run which eats CPU) +Subject: [PATCH 03/30] Reduce the CPU usage by not setting an initial state + when starting (makes BusyCurso not run which eats CPU) --- plasmoid/package/contents/ui/main.qml | 2 +- @@ -22,5 +22,5 @@ index 222ce97..89bcef9 100644 property int minimumHeight: 320 property int minimumWidth: 370 -- -1.8.1 +1.8.1.2 diff --git a/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch b/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch index d209927..3039145 100644 --- a/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch +++ b/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch @@ -1,7 +1,7 @@ From a7d3614e0cc9bb4dcd0720281f8760578a93465c Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Wed, 9 Jan 2013 13:50:59 -0200 -Subject: [PATCH 4/5] Adds a Help menu to Apper BUG 293440 +Subject: [PATCH 04/30] Adds a Help menu to Apper BUG 293440 --- Apper/MainUi.cpp | 3 ++- @@ -49,5 +49,5 @@ index 14a5cd6..a6677b0 100644 ui->stackedWidgetBar->setCurrentIndex(BAR_SEARCH); } -- -1.8.1 +1.8.1.2 diff --git a/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch b/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch index ef1f74f..3724482 100644 --- a/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch +++ b/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch @@ -1,7 +1,7 @@ From decb93370d447c368cf2255c6b2c7f4502844cc8 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Wed, 9 Jan 2013 14:48:49 -0200 -Subject: [PATCH 5/5] Fix a connection caused by a fix for BUG:302786 +Subject: [PATCH 05/30] Fix a connection caused by a fix for BUG:302786 --- ApperKCM/ApperKCM.cpp | 2 +- @@ -21,5 +21,5 @@ index a6677b0..b408fe9 100644 QMenu *findMenu = new QMenu(this); // find is just a generic name in case we don't have any search method -- -1.8.1 +1.8.1.2 diff --git a/0006-Fixes-package-installation-of-files-in-non-latin-pat.patch b/0006-Fixes-package-installation-of-files-in-non-latin-pat.patch new file mode 100644 index 0000000..c115a8c --- /dev/null +++ b/0006-Fixes-package-installation-of-files-in-non-latin-pat.patch @@ -0,0 +1,84 @@ +From 216a03a19a295cb9b2889651212f60d5bf1ebd6d Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 15:24:43 -0200 +Subject: [PATCH 06/30] Fixes package installation of files in non-latin paths + BUG:307258 + +--- + PkSession/FilesModel.cpp | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +diff --git a/PkSession/FilesModel.cpp b/PkSession/FilesModel.cpp +index e2e6e1a..cc1f37f 100644 +--- a/PkSession/FilesModel.cpp ++++ b/PkSession/FilesModel.cpp +@@ -74,31 +74,32 @@ bool FilesModel::insertFiles(const QList &urls) + { + bool ret = false; + foreach (const QUrl &url, urls) { +- if (files().contains(url.path())) { ++ QString path = QUrl::fromPercentEncoding(url.path().toUtf8()); ++ if (files().contains(path)) { + continue; + } + +- QFileInfo fileInfo(url.path()); ++ QFileInfo fileInfo(path); + QStandardItem *item = 0; + if (fileInfo.isFile()) { +- KMimeType::Ptr mime = KMimeType::findByFileContent(url.path()); ++ KMimeType::Ptr mime = KMimeType::findByFileContent(path); + kDebug() << url << mime->name(); + foreach (const QString &mimeType, m_mimes) { + if (mime->is(mimeType)) { + ret = true; + /* kDebug() << "Found Supported Mime" << mimeType << mime->iconName();*/ + item = new QStandardItem(fileInfo.fileName()); +- item->setData(url.path()); +- item->setToolTip(url.path()); ++ item->setData(path); ++ item->setToolTip(path); + item->setIcon(KIconLoader::global()->loadMimeTypeIcon(mime->iconName(), +- KIconLoader::Desktop)); ++ KIconLoader::Desktop)); + break; + } + } + + if (ret == false && m_mimes.isEmpty()) { + if (mime->name() == "application/x-desktop") { +- KService *service = new KService(url.path()); ++ KService *service = new KService(path); + item = new QStandardItem(service->name()); + item->setData(true, Qt::UserRole); + item->setIcon(KIconLoader::global()->loadMimeTypeIcon(service->icon(), +@@ -108,20 +109,20 @@ bool FilesModel::insertFiles(const QList &urls) + item->setIcon(KIconLoader::global()->loadMimeTypeIcon(mime->iconName(), + KIconLoader::Desktop)); + } +- item->setData(url.path()); +- item->setToolTip(url.path()); ++ item->setData(path); ++ item->setToolTip(path); + } else if (ret == false && !m_mimes.isEmpty()) { + item = new QStandardItem(fileInfo.fileName()); +- item->setData(url.path()); +- item->setToolTip(url.path()); ++ item->setData(path); ++ item->setToolTip(path); + item->setEnabled(false); + item->setIcon(KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Desktop)); + } + } else if (m_mimes.isEmpty()) { + // It's not a file but we don't have a mime so it's ok + item = new QStandardItem(fileInfo.fileName()); +- item->setData(url.path()); +- item->setToolTip(url.path()); ++ item->setData(path); ++ item->setToolTip(path); + item->setIcon(KIconLoader::global()->loadIcon("unknown", KIconLoader::Desktop)); + } + +-- +1.8.1.2 + diff --git a/0007-Make-hide-button-more-clear-BUG-263309.patch b/0007-Make-hide-button-more-clear-BUG-263309.patch new file mode 100644 index 0000000..4ea2415 --- /dev/null +++ b/0007-Make-hide-button-more-clear-BUG-263309.patch @@ -0,0 +1,68 @@ +From b58cf962419023a8e6237e58f3c92cfdd7d45bb7 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 16:07:09 -0200 +Subject: [PATCH 07/30] Make hide button more clear BUG:263309 + +--- + ApperKCM/PackageDetails.cpp | 1 + + ApperKCM/PackageDetails.ui | 3 --- + ApperKCM/Updater/UpdateDetails.cpp | 2 +- + ApperKCM/Updater/UpdateDetails.ui | 3 --- + 4 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/ApperKCM/PackageDetails.cpp b/ApperKCM/PackageDetails.cpp +index 4a8f3ef..30763f6 100644 +--- a/ApperKCM/PackageDetails.cpp ++++ b/ApperKCM/PackageDetails.cpp +@@ -76,6 +76,7 @@ PackageDetails::PackageDetails(QWidget *parent) + m_hasFileList(false) + { + ui->setupUi(this); ++ ui->hideTB->setIcon(KIcon("window-close")); + connect(ui->hideTB, SIGNAL(clicked()), this, SLOT(hide())); + } + +diff --git a/ApperKCM/PackageDetails.ui b/ApperKCM/PackageDetails.ui +index a598754..93c38a7 100644 +--- a/ApperKCM/PackageDetails.ui ++++ b/ApperKCM/PackageDetails.ui +@@ -364,9 +364,6 @@ + + true + +- +- Qt::DownArrow +- + + + +diff --git a/ApperKCM/Updater/UpdateDetails.cpp b/ApperKCM/Updater/UpdateDetails.cpp +index 9c1d515..368756e 100644 +--- a/ApperKCM/Updater/UpdateDetails.cpp ++++ b/ApperKCM/Updater/UpdateDetails.cpp +@@ -41,7 +41,7 @@ UpdateDetails::UpdateDetails(QWidget *parent) + m_transaction(0) + { + setupUi(this); +- ++ hideTB->setIcon(KIcon("window-close")); + connect(hideTB, SIGNAL(clicked()), this, SLOT(hide())); + + m_busySeq = new KPixmapSequenceOverlayPainter(this); +diff --git a/ApperKCM/Updater/UpdateDetails.ui b/ApperKCM/Updater/UpdateDetails.ui +index ce5436f..03efc48 100644 +--- a/ApperKCM/Updater/UpdateDetails.ui ++++ b/ApperKCM/Updater/UpdateDetails.ui +@@ -25,9 +25,6 @@ + + true + +- +- Qt::DownArrow +- + + + +-- +1.8.1.2 + diff --git a/0008-Fix-about-application-icon.patch b/0008-Fix-about-application-icon.patch new file mode 100644 index 0000000..3c9bac3 --- /dev/null +++ b/0008-Fix-about-application-icon.patch @@ -0,0 +1,29 @@ +From 535f013ba2a3307f46f2fe1def887c4501187dec Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 16:50:07 -0200 +Subject: [PATCH 08/30] Fix about application icon + +--- + Apper/main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Apper/main.cpp b/Apper/main.cpp +index 3662d0b..580e1c3 100644 +--- a/Apper/main.cpp ++++ b/Apper/main.cpp +@@ -55,10 +55,11 @@ int main(int argc, char **argv) + APP_VERSION, + ki18n("Apper is an Application to Get and Manage Software"), + KAboutData::License_GPL, +- ki18n("(C) 2008-2011 Daniel Nicoletti")); ++ ki18n("(C) 2008-2013 Daniel Nicoletti")); + + about.addAuthor(ki18n("Daniel Nicoletti"), KLocalizedString(), "dantti12@gmail.com", "http://dantti.wordpress.com"); + about.addCredit(ki18n("Adrien Bustany"), ki18n("libpackagekit-qt and other stuff"), "@"); ++ about.setProgramIconName("applications-other"); + + KCmdLineArgs::init(argc, argv, &about); + +-- +1.8.1.2 + diff --git a/0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch b/0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch new file mode 100644 index 0000000..ca72e7d --- /dev/null +++ b/0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch @@ -0,0 +1,33 @@ +From 371662677211d21f324d8803eab3e851764af3c4 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 18:47:18 -0200 +Subject: [PATCH 09/30] Fix About Application dialog in Apper BUG:293440 + +--- + ApperKCM/ApperKCM.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index b408fe9..43b3475 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -225,7 +226,7 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : + // Only show help menu if not on System Settings + if (!args.isEmpty()) { + // adds the help menu +- KHelpMenu *helpMenu = new KHelpMenu(this); ++ KHelpMenu *helpMenu = new KHelpMenu(this, KCmdLineArgs::aboutData()); + menu->addMenu(helpMenu->menu()); + } + +-- +1.8.1.2 + diff --git a/0010-Feature-show-application-status-in-window-title-BUG-.patch b/0010-Feature-show-application-status-in-window-title-BUG-.patch new file mode 100644 index 0000000..35952d9 --- /dev/null +++ b/0010-Feature-show-application-status-in-window-title-BUG-.patch @@ -0,0 +1,378 @@ +From 4a5dae7bb0ae57d93acc4afd57888bd7f6695555 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 9 Jan 2013 21:18:11 -0200 +Subject: [PATCH 10/30] Feature: show application status in window title + BUG:300750 + +--- + Apper/MainUi.cpp | 6 ++-- + Apper/main.cpp | 6 ---- + ApperKCM/ApperKCM.cpp | 46 +++++++++++++++++------------- + ApperKCM/ApperKCM.h | 1 + + libapper/PkTransactionWidget.cpp | 61 +++++++++++++++++++++++++++++++--------- + libapper/PkTransactionWidget.h | 1 + + 6 files changed, 79 insertions(+), 42 deletions(-) + +diff --git a/Apper/MainUi.cpp b/Apper/MainUi.cpp +index 31c2092..2a91dd4 100644 +--- a/Apper/MainUi.cpp ++++ b/Apper/MainUi.cpp +@@ -25,8 +25,8 @@ + #include + #include + +-MainUi::MainUi(QWidget *parent) +- : KCMultiDialog(parent), ++MainUi::MainUi(QWidget *parent) : ++ KCMultiDialog(parent), + m_apperModule(0) + { + setCaption(QString()); +@@ -45,6 +45,8 @@ MainUi::MainUi(QWidget *parent) + KCModuleProxy *proxy = static_cast(page->widget()); + if (proxy) { + m_apperModule = proxy->realModule(); ++ connect(m_apperModule, SIGNAL(caption(QString)), ++ this, SLOT(setCaption(QString))); + } + } else { + kWarning() << "Could not load kcm_apper.desktop!"; +diff --git a/Apper/main.cpp b/Apper/main.cpp +index 580e1c3..c971680 100644 +--- a/Apper/main.cpp ++++ b/Apper/main.cpp +@@ -125,12 +125,6 @@ int main(int argc, char **argv) + return invoke("RemovePackageByFiles", args->getOptionList("remove-package-by-file")); + } + +- if (!Apper::start()) +- { +- qDebug() << "Apper is already running!"; +- return 0; +- } +- + Apper app; + + return app.exec(); +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index 43b3475..339aee3 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -392,7 +392,7 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index) + } + + // cache the search +- m_searchRole = static_cast(index.data(CategoryModel::SearchRole).toUInt()); ++ m_searchRole = static_cast(index.data(CategoryModel::SearchRole).toUInt()); + kDebug() << m_searchRole << index.data(CategoryModel::CategoryRole).toString(); + if (m_searchRole == Transaction::RoleResolve) { + #ifdef HAVE_APPSTREAM +@@ -413,6 +413,7 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index) + } else { + m_searchGroupCategory.clear(); + m_searchGroup = index.data(CategoryModel::GroupRole).value(); ++ m_searchString = index.data().toString(); // Store the nice name to change the title + } + } else if (m_searchRole == Transaction::RoleGetUpdates) { + setPage("updates"); +@@ -503,6 +504,7 @@ void ApperKCM::setPage(const QString &page) + m_settingsPage->load(); + ui->titleL->clear(); + ui->backTB->setEnabled(true); ++ emit caption(i18n("Settings")); + } + } else if (page == QLatin1String("updates")) { + if (ui->stackedWidget->currentWidget() != m_updaterPage) { +@@ -529,6 +531,7 @@ void ApperKCM::setPage(const QString &page) + m_updaterPage->load(); + ui->stackedWidgetBar->setCurrentIndex(BAR_UPDATE); + ui->backTB->setEnabled(true); ++ emit caption(i18n("Updates")); + } + } else if (page == QLatin1String("home")) { + if (ui->stackedWidget->currentWidget() == m_updaterPage || +@@ -545,6 +548,7 @@ void ApperKCM::setPage(const QString &page) + ui->backTB->setEnabled(true); + ui->filtersTB->setEnabled(false); + ui->widget->setEnabled(false); ++ emit caption(i18n("History")); + } + } + +@@ -589,6 +593,7 @@ void ApperKCM::on_backTB_clicked() + ui->backTB->setEnabled(canGoBack); + // reset the search role + m_searchRole = Transaction::RoleUnknown; ++ emit caption(); + } + + void ApperKCM::on_changesPB_clicked() +@@ -597,6 +602,7 @@ void ApperKCM::on_changesPB_clicked() + m_changesModel->addSelectedPackagesFromModel(m_browseModel); + ui->stackedWidget->setCurrentWidget(ui->pageChanges); + ui->backTB->setEnabled(true); ++ emit caption(i18n("Pending Changes")); + } + + void ApperKCM::disconnectTransaction() +@@ -623,6 +629,9 @@ void ApperKCM::disconnectTransaction() + void ApperKCM::search() + { + ui->browseView->cleanUi(); ++ if (ui->stackedWidgetBar->currentIndex() != BAR_SEARCH) { ++ ui->stackedWidgetBar->setCurrentIndex(BAR_SEARCH); ++ } + + disconnectTransaction(); + +@@ -645,18 +654,24 @@ void ApperKCM::search() + switch (m_searchRole) { + case Transaction::RoleSearchName: + m_searchTransaction->searchNames(m_searchString, m_filtersMenu->filters()); ++ emit caption(m_searchString); + break; + case Transaction::RoleSearchDetails: + m_searchTransaction->searchDetails(m_searchString, m_filtersMenu->filters()); ++ emit caption(m_searchString); + break; + case Transaction::RoleSearchFile: + m_searchTransaction->searchFiles(m_searchString, m_filtersMenu->filters()); ++ emit caption(m_searchString); + break; + case Transaction::RoleSearchGroup: + if (m_searchGroupCategory.isEmpty()) { + m_searchTransaction->searchGroup(m_searchGroup, m_filtersMenu->filters()); ++ // m_searchString has the group nice name ++ emit caption(m_searchString); + } else { + ui->browseView->setParentCategory(m_searchParentCategory); ++ emit caption(m_searchParentCategory.data().toString()); + #ifndef HAVE_APPSTREAM + if (m_searchGroupCategory.startsWith('@') || + m_searchGroupCategory.startsWith(QLatin1String("repo:"))) { +@@ -672,6 +687,7 @@ void ApperKCM::search() + connect(m_searchTransaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), + ui->browseView, SLOT(enableExportInstalledPB())); + m_searchTransaction->getPackages(Transaction::FilterInstalled | m_filtersMenu->filters()); ++ emit caption(i18n("Installed Software")); + break; + case Transaction::RoleResolve: + #ifdef HAVE_APPSTREAM +@@ -680,9 +696,11 @@ void ApperKCM::search() + // WARNING the resolve might fail if the backend + // has a low limit MaximumItemsToResolve + m_searchTransaction->resolve(m_searchCategory, m_filtersMenu->filters()); ++ emit caption(m_searchParentCategory.data().toString()); + } else { + ui->browseView->setParentCategory(m_searchParentCategory); + KMessageBox::sorry(this, i18n("Could not find an application that matched this category")); ++ emit caption(); + disconnectTransaction(); + m_searchTransaction = 0; + return; +@@ -691,6 +709,7 @@ void ApperKCM::search() + #endif + default: + kWarning() << "Search type not defined yet"; ++ emit caption(); + disconnectTransaction(); + m_searchTransaction = 0; + return; +@@ -726,17 +745,16 @@ void ApperKCM::changed() + + void ApperKCM::refreshCache() + { +- QWidget *currentWidget = ui->stackedWidget->currentWidget(); + emit changed(false); + + PkTransactionWidget *transactionW = new PkTransactionWidget(this); ++ connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); + PkTransaction *transaction = new PkTransaction(transactionW); + QWeakPointer pointer = transaction; + transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); + + ui->stackedWidget->addWidget(transactionW); + ui->stackedWidget->setCurrentWidget(transactionW); +- int oldBar = ui->stackedWidgetBar->currentIndex(); + ui->stackedWidgetBar->setCurrentIndex(BAR_TITLE); + ui->backTB->setEnabled(false); + connect(transactionW, SIGNAL(titleChanged(QString)), +@@ -758,18 +776,9 @@ void ApperKCM::refreshCache() + m_forceRefreshCache = transaction->exitStatus() == PkTransaction::Failed; + } + +- // Finished setup old stuff +- ui->backTB->setEnabled(true); +- ui->stackedWidget->setCurrentWidget(currentWidget); +- ui->stackedWidgetBar->setCurrentIndex(oldBar); +- transactionW->deleteLater(); +- transaction->deleteLater(); +- if (currentWidget == m_updaterPage) { +- m_updaterPage->getUpdates(); +- } else { +- // install then remove packages +- search(); +- } ++ // Go back to the updates page ++ m_updaterPage->getUpdates(); ++ setPage("updates"); + QTimer::singleShot(0, this, SLOT(checkChanged())); + } + +@@ -780,12 +789,12 @@ void ApperKCM::save() + m_settingsPage->save(); + } else { + PkTransactionWidget *transactionW = new PkTransactionWidget(this); ++ connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); + PkTransaction *transaction = new PkTransaction(transactionW); + QWeakPointer pointer = transaction; + + ui->stackedWidget->addWidget(transactionW); + ui->stackedWidget->setCurrentWidget(transactionW); +- int oldBar = ui->stackedWidgetBar->currentIndex(); + ui->stackedWidgetBar->setCurrentIndex(BAR_TITLE); + ui->backTB->setEnabled(false); + connect(transactionW, SIGNAL(titleChanged(QString)), +@@ -847,13 +856,10 @@ void ApperKCM::save() + } + } + +- // Finished setup old stuff +- ui->backTB->setEnabled(true); +- ui->stackedWidget->setCurrentWidget(currentWidget); +- ui->stackedWidgetBar->setCurrentIndex(oldBar); + transaction->deleteLater(); + if (currentWidget == m_updaterPage) { + m_updaterPage->getUpdates(); ++ setPage("updates"); + } else { + // install then remove packages + search(); +diff --git a/ApperKCM/ApperKCM.h b/ApperKCM/ApperKCM.h +index 07660ec..dbe9da9 100644 +--- a/ApperKCM/ApperKCM.h ++++ b/ApperKCM/ApperKCM.h +@@ -57,6 +57,7 @@ public: + + signals: + void changed(bool state); ++ void caption(const QString &title = QString()); + + public slots: + void load(); +diff --git a/libapper/PkTransactionWidget.cpp b/libapper/PkTransactionWidget.cpp +index fb88d74..252699c 100644 +--- a/libapper/PkTransactionWidget.cpp ++++ b/libapper/PkTransactionWidget.cpp +@@ -175,23 +175,30 @@ void PkTransactionWidget::updateUi() + } + + uint percentage = transaction->percentage(); ++ QString percentageString; + if (percentage <= 100) { +- ui->progressBar->setMaximum(100); +- ui->progressBar->setValue(percentage); ++ if (ui->progressBar->value() != static_cast(percentage)) { ++ ui->progressBar->setMaximum(100); ++ ui->progressBar->setValue(percentage); ++ percentageString = QString::number(percentage); ++ } + } else if (ui->progressBar->maximum() != 0) { + ui->progressBar->setMaximum(0); + ui->progressBar->reset(); ++ percentageString = QLatin1String(""); + } + + ui->progressBar->setRemaining(transaction->remainingTime()); + + // Status & Speed + Transaction::Status status = transaction->status(); ++ uint speed = transaction->speed(); ++ qulonglong downloadSizeRemaining = transaction->downloadSizeRemaining(); + if (m_status != status) { + m_status = status; + ui->currentL->setText(PkStrings::status(status, +- transaction->speed(), +- transaction->downloadSizeRemaining())); ++ speed, ++ downloadSizeRemaining)); + + KPixmapSequence sequence = KPixmapSequence(PkIcons::statusAnimation(status), + KIconLoader::SizeLarge); +@@ -201,25 +208,51 @@ void PkTransactionWidget::updateUi() + } + } else if (status == Transaction::StatusDownload) { + ui->currentL->setText(PkStrings::status(status, +- transaction->speed(), +- transaction->downloadSizeRemaining())); ++ speed, ++ downloadSizeRemaining)); + } + ++ QString windowTitle; ++ QString windowTitleProgress; ++ KIcon windowIcon; + Transaction::Role role = transaction->role(); +- if (d->role != role) { +- QString windowTitle; +- KIcon windowIcon; +- if (role == Transaction::RoleUnknown) { +- windowTitle = PkStrings::status(Transaction::StatusSetup); +- windowIcon = PkIcons::statusIcon(Transaction::StatusSetup); ++ if (role == Transaction::RoleUnknown) { ++ windowTitle = PkStrings::status(Transaction::StatusSetup); ++ if (percentageString.isEmpty()) { ++ windowTitleProgress = PkStrings::status(status, ++ speed, ++ downloadSizeRemaining); ++ } else { ++ QString statusText = PkStrings::status(status, ++ speed, ++ downloadSizeRemaining); ++ windowTitleProgress = i18n("%1 (%2%)", statusText, percentageString); ++ } ++ windowIcon = PkIcons::statusIcon(Transaction::StatusSetup); ++ } else { ++ windowTitle = PkStrings::action(role); ++ if (percentageString.isEmpty()) { ++ windowTitleProgress = PkStrings::status(status, ++ speed, ++ downloadSizeRemaining); + } else { +- windowTitle = PkStrings::action(role); +- windowIcon = PkIcons::actionIcon(role); ++ QString statusText = PkStrings::status(status, ++ speed, ++ downloadSizeRemaining); ++ windowTitleProgress = i18n("%1 (%2%)", statusText, percentageString); + } ++ windowIcon = PkIcons::actionIcon(role); ++ } ++ ++ if (d->role != role) { + d->role = role; + setWindowIcon(PkIcons::actionIcon(role)); + setWindowTitle(windowTitle); ++ + emit titleChanged(windowTitle); ++ emit titleChangedProgress(windowTitleProgress); ++ } else if (!percentageString.isNull()) { ++ emit titleChangedProgress(windowTitleProgress); + } + + // check to see if we can cancel +diff --git a/libapper/PkTransactionWidget.h b/libapper/PkTransactionWidget.h +index 45d0a35..30ea044 100644 +--- a/libapper/PkTransactionWidget.h ++++ b/libapper/PkTransactionWidget.h +@@ -54,6 +54,7 @@ public: + signals: + void allowCancel(bool enable); + void titleChanged(const QString &title); ++ void titleChangedProgress(const QString &title); + void dialog(KDialog *widget); + void sorry(const QString &title, const QString &text, const QString &details); + void error(const QString &title, const QString &text, const QString &details); +-- +1.8.1.2 + diff --git a/0014-Fix-browsing-groups.patch b/0014-Fix-browsing-groups.patch new file mode 100644 index 0000000..9be467c --- /dev/null +++ b/0014-Fix-browsing-groups.patch @@ -0,0 +1,26 @@ +From a321e5c359d367bd7ffa0a11124afb91d945a238 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Thu, 17 Jan 2013 11:34:13 -0200 +Subject: [PATCH 14/30] Fix browsing groups + +--- + ApperKCM/ApperKCM.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index 339aee3..b18caec 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -412,7 +412,8 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index) + } + } else { + m_searchGroupCategory.clear(); +- m_searchGroup = index.data(CategoryModel::GroupRole).value(); ++ int groupRole = index.data(CategoryModel::GroupRole).toInt(); ++ m_searchGroup = static_cast(groupRole); + m_searchString = index.data().toString(); // Store the nice name to change the title + } + } else if (m_searchRole == Transaction::RoleGetUpdates) { +-- +1.8.1.2 + diff --git a/0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch b/0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch new file mode 100644 index 0000000..12dc597 --- /dev/null +++ b/0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch @@ -0,0 +1,303 @@ +From 856a72c2c4e9b30081093fbfc97eb3e40359bed5 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Thu, 17 Jan 2013 18:42:02 -0200 +Subject: [PATCH 15/30] Change the way we toggle repos so that we can report + that an error happened to the user + +--- + ApperKCM/Settings/OriginModel.cpp | 99 +++++++++++++++++---------------------- + ApperKCM/Settings/OriginModel.h | 19 ++++++-- + ApperKCM/Settings/Settings.cpp | 28 ++++------- + ApperKCM/Settings/Settings.h | 1 + + 4 files changed, 69 insertions(+), 78 deletions(-) + +diff --git a/ApperKCM/Settings/OriginModel.cpp b/ApperKCM/Settings/OriginModel.cpp +index 6cb4907..faae248 100644 +--- a/ApperKCM/Settings/OriginModel.cpp ++++ b/ApperKCM/Settings/OriginModel.cpp +@@ -22,16 +22,13 @@ + + #include + +-#include + #include + #include + +-#include ++#include + + using namespace PackageKit; + +-Q_DECLARE_METATYPE(Qt::CheckState) +- + OriginModel::OriginModel(QObject *parent) : + QStandardItemModel(parent), + m_finished(true) +@@ -44,6 +41,37 @@ OriginModel::~OriginModel() + { + } + ++bool OriginModel::setData(const QModelIndex &index, const QVariant &value, int role) ++{ ++ if (role == Qt::CheckStateRole && index.isValid()) { ++ Transaction *transaction = new Transaction(this); ++ connect(transaction, SIGNAL(errorCode(PackageKit::Transaction::Error,QString)), ++ SLOT(errorCode(PackageKit::Transaction::Error,QString))); ++ connect(transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), ++ SLOT(setRepoFinished(PackageKit::Transaction::Exit))); ++ ++ transaction->repoEnable(index.data(RepoId).toString(), ++ value.toBool()); ++ if (transaction->error()) { ++ KMessageBox::sorry(0, PkStrings::daemonError(transaction->error())); ++ } ++ } ++ return false; ++} ++ ++QVariantHash OriginModel::changes() const ++{ ++ QVariantHash ret; ++ for (int i = 0; i < rowCount(); ++i) { ++ QStandardItem *repo = item(i); ++ bool currentState = repo->checkState(); ++ if (currentState != repo->data(RepoInitialState).toBool()) { ++ ret[repo->data(RepoId).toString()] = currentState; ++ } ++ } ++ return ret; ++} ++ + void OriginModel::addOriginItem(const QString &repo_id, const QString &details, bool enabled) + { + if (m_finished) { +@@ -52,12 +80,11 @@ void OriginModel::addOriginItem(const QString &repo_id, const QString &details, + m_finished = false; + } + +- Qt::CheckState state = enabled ? Qt::Checked : Qt::Unchecked; + QStandardItem *item = new QStandardItem(details); + item->setCheckable(true); +- item->setCheckState(state); +- item->setData(repo_id, Qt::UserRole); +- item->setData(qVariantFromValue(state)); ++ item->setCheckState(enabled ? Qt::Checked : Qt::Unchecked); ++ item->setData(repo_id, RepoId); ++ item->setData(enabled, RepoInitialState); + appendRow(item); + } + +@@ -66,61 +93,19 @@ void OriginModel::finished() + m_finished = true; + } + +-void OriginModel::clearChanges() ++void OriginModel::errorCode(PackageKit::Transaction::Error error, const QString &details) + { +- for (int i = 0; i < rowCount(); ++i) { +- QStandardItem *repo = item(i); +- if (repo->checkState() != repo->data().value()) { +- repo->setCheckState(repo->data().value()); +- } ++ if (error != Transaction::ErrorTransactionCancelled) { ++ KMessageBox::detailedSorry(0, PkStrings::errorMessage(error), details, PkStrings::error(error), KMessageBox::Notify); + } + } + +-bool OriginModel::changed() const ++void OriginModel::setRepoFinished(Transaction::Exit exit) + { +- for (int i = 0; i < rowCount(); ++i) { +- QStandardItem *repo = item(i); +- if (repo->checkState() != repo->data().value()) { +- return true; +- } +- } +- return false; +-} +- +-bool OriginModel::save() +-{ +- bool changed = false; +- int rows = rowCount(); +- QEventLoop loop; +- for (int i = 0; i < rows; ++i) { +- QStandardItem *repo = item(i); +- if (repo->checkState() != repo->data().value()) { +- Transaction *transaction = new Transaction(this); +- QWeakPointer pointer = transaction; +- connect(transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), +- &loop, SLOT(quit())); +- transaction->repoEnable(repo->data(Qt::UserRole).toString(), +- static_cast(repo->checkState())); +- if (transaction->error()) { +- KMessageBox::sorry(0, PkStrings::daemonError(transaction->error())); +- return false; +- } +- loop.exec(); +- changed = true; +- +- if (pointer.isNull()) { +- // Avoid crashing when the application is quitting +- return false; +- } +- } +- } +- +- // refresh the user cache if he or she enables/disables any of it +- if (changed) { +- // TODO ask to refresh the cache +- // TODO emit refresh requested ++ if (exit == Transaction::ExitSuccess) { ++ emit refreshRepoList(); + } +- return true; ++ sender()->deleteLater(); + } + + #include "OriginModel.moc" +diff --git a/ApperKCM/Settings/OriginModel.h b/ApperKCM/Settings/OriginModel.h +index 294baf2..318017c 100644 +--- a/ApperKCM/Settings/OriginModel.h ++++ b/ApperKCM/Settings/OriginModel.h +@@ -23,21 +23,34 @@ + + #include + ++#include ++ + class OriginModel : public QStandardItemModel + { + Q_OBJECT + public: ++ enum { ++ RepoId = Qt::UserRole, ++ RepoInitialState ++ } RepoRole; + OriginModel(QObject *parent = 0); + ~OriginModel(); + +- bool changed() const; +- bool save(); +- void clearChanges(); ++ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); ++ ++ QVariantHash changes() const; ++ ++signals: ++ void refreshRepoList(); + + public slots: + void addOriginItem(const QString &repo_id, const QString &details, bool enabled); + void finished(); + ++private slots: ++ void errorCode(PackageKit::Transaction::Error error, const QString &details); ++ void setRepoFinished(PackageKit::Transaction::Exit exit); ++ + private: + bool m_finished; + }; +diff --git a/ApperKCM/Settings/Settings.cpp b/ApperKCM/Settings/Settings.cpp +index 7f54adb..d526494 100644 +--- a/ApperKCM/Settings/Settings.cpp ++++ b/ApperKCM/Settings/Settings.cpp +@@ -25,6 +25,7 @@ + #include "OriginModel.h" + + #include ++#include + + #include + #include +@@ -59,6 +60,8 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : + } + + m_originModel = new OriginModel(this); ++ connect(m_originModel, SIGNAL(refreshRepoList()), ++ SLOT(refreshRepoModel())); + QSortFilterProxyModel *proxy = new QSortFilterProxyModel(this); + proxy->setDynamicSortFilter(true); + proxy->setSourceModel(m_originModel); +@@ -67,11 +70,7 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : + // This is needed to keep the oring right + ui->originTV->header()->setSortIndicator(0, Qt::AscendingOrder); + proxy->sort(0); +- if (m_roles & Transaction::RoleGetRepoList) { +- // The data will be loaded when Load is called +- connect(m_originModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), +- this, SLOT(checkChanges())); +- } else { ++ if (!(m_roles & Transaction::RoleGetRepoList)) { + // Disables the group box + ui->originTV->setEnabled(false); + ui->showOriginsCB->setEnabled(false); +@@ -134,6 +133,11 @@ void Settings::on_editOriginsPB_clicked() + #endif //EDIT_ORIGNS_DESKTOP_NAME + } + ++void Settings::refreshRepoModel() ++{ ++ on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); ++} ++ + // TODO update the repo list connecting to repo changed signal + void Settings::on_showOriginsCB_stateChanged(int state) + { +@@ -189,8 +193,6 @@ bool Settings::hasChanges() const + || + ui->installUpdatesMobileCB->isChecked() != checkUpdateGroup.readEntry(CFG_INSTALL_UP_MOBILE, DEFAULT_INSTALL_UP_MOBILE) + || +- ((m_roles & Transaction::RoleGetRepoList) ? m_originModel->changed() : false) +- || + ui->autoConfirmCB->isChecked() != !requirementsDialog.readEntry("autoConfirm", false) + || + ui->appLauncherCB->isChecked() != transaction.readEntry("ShowApplicationLauncher", true)) { +@@ -264,7 +266,7 @@ void Settings::load() + KConfigGroup originsDialog(&config, "originsDialog"); + bool showDevel = originsDialog.readEntry("showDevel", false); + ui->showOriginsCB->setChecked(showDevel); +- on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); ++ refreshRepoModel(); + ui->originTV->setEnabled(true); + } else { + ui->originTV->setEnabled(false); +@@ -306,15 +308,6 @@ void Settings::save() + checkUpdateGroup.writeEntry("autoUpdate", ui->autoCB->itemData(ui->autoCB->currentIndex()).toUInt()); + checkUpdateGroup.writeEntry("installUpdatesOnBattery", ui->installUpdatesBatteryCB->isChecked()); + checkUpdateGroup.writeEntry("installUpdatesOnMobile", ui->installUpdatesMobileCB->isChecked()); +- // check to see if the backend support this +- if (m_roles & Transaction::RoleGetRepoList) { +- on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); +- if (!m_originModel->save()) { +- KMessageBox::sorry(this, +- i18n("You do not have the necessary privileges to perform this action."), +- i18n("Failed to set origin data")); +- } +- } + } + + void Settings::defaults() +@@ -324,7 +317,6 @@ void Settings::defaults() + ui->distroIntervalCB->setCurrentIndex(ui->distroIntervalCB->findData(Enum::DistroUpgradeDefault)); + ui->intervalCB->setCurrentIndex(ui->intervalCB->findData(Enum::TimeIntervalDefault)); + ui->autoCB->setCurrentIndex(ui->autoCB->findData(Enum::AutoUpdateDefault) ); +- m_originModel->clearChanges(); + checkChanges(); + } + +diff --git a/ApperKCM/Settings/Settings.h b/ApperKCM/Settings/Settings.h +index 2213f6e..f73d91d 100644 +--- a/ApperKCM/Settings/Settings.h ++++ b/ApperKCM/Settings/Settings.h +@@ -53,6 +53,7 @@ signals: + void changed(bool state); + + private slots: ++ void refreshRepoModel(); + void on_showOriginsCB_stateChanged(int state); + void on_editOriginsPB_clicked(); + void checkChanges(); +-- +1.8.1.2 + diff --git a/0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch b/0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch new file mode 100644 index 0000000..04c20e3 --- /dev/null +++ b/0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch @@ -0,0 +1,349 @@ +From 6cecc3dc052b60f0a2bdc4893d38b5d8a83dd464 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Fri, 18 Jan 2013 00:19:55 -0200 +Subject: [PATCH 16/30] Show how much download is left and use QPointers + instead of QWeakPointers for convenience + +--- + ApperKCM/ApperKCM.cpp | 14 +++++----- + libapper/PkTransaction.cpp | 65 +++++++++++++++++++++++++++------------------- + libapper/PkTransaction.h | 4 --- + libapper/Requirements.cpp | 22 +++++++++++++++- + libapper/Requirements.h | 1 + + 5 files changed, 66 insertions(+), 40 deletions(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index b18caec..6189149 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -750,8 +750,7 @@ void ApperKCM::refreshCache() + + PkTransactionWidget *transactionW = new PkTransactionWidget(this); + connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); +- PkTransaction *transaction = new PkTransaction(transactionW); +- QWeakPointer pointer = transaction; ++ QPointer transaction = new PkTransaction(transactionW); + transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); + + ui->stackedWidget->addWidget(transactionW); +@@ -768,7 +767,7 @@ void ApperKCM::refreshCache() + // wait for the end of transaction + if (!transaction->isFinished()) { + loop.exec(); +- if (pointer.isNull()) { ++ if (!transaction) { + // Avoid crashing + return; + } +@@ -791,8 +790,7 @@ void ApperKCM::save() + } else { + PkTransactionWidget *transactionW = new PkTransactionWidget(this); + connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); +- PkTransaction *transaction = new PkTransaction(transactionW); +- QWeakPointer pointer = transaction; ++ QPointer transaction = new PkTransaction(transactionW); + + ui->stackedWidget->addWidget(transactionW); + ui->stackedWidget->setCurrentWidget(transactionW); +@@ -811,7 +809,7 @@ void ApperKCM::save() + // wait for the end of transaction + if (!transaction->isFinished()) { + loop.exec(); +- if (pointer.isNull()) { ++ if (!transaction) { + // Avoid crashing + return; + } +@@ -826,7 +824,7 @@ void ApperKCM::save() + // wait for the end of transaction + if (!transaction->isFinished()) { + loop.exec(); +- if (pointer.isNull()) { ++ if (!transaction) { + // Avoid crashing + return; + } +@@ -845,7 +843,7 @@ void ApperKCM::save() + // wait for the end of transaction + if (!transaction->isFinished()) { + loop.exec(); +- if (pointer.isNull()) { ++ if (!transaction) { + // Avoid crashing + return; + } +diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp +index 9ab949b..1f6b4c0 100644 +--- a/libapper/PkTransaction.cpp ++++ b/libapper/PkTransaction.cpp +@@ -55,6 +55,11 @@ class PkTransactionPrivate + public: + bool allowDeps; + bool jobWatcher; ++ bool handlingActionRequired; ++ bool showingError; //This might replace the above ++ qulonglong downloadSizeRemaining; ++ PkTransaction::ExitStatus exitStatus; ++ Transaction::Status status; + Transaction::TransactionFlags flags; + Transaction::Role originalRole; + Transaction::Error error; +@@ -70,22 +75,25 @@ public: + + PkTransaction::PkTransaction(QObject *parent) : + Transaction(parent), +- m_handlingActionRequired(false), +- m_showingError(false), +- m_exitStatus(Success), +- m_status(Transaction::StatusUnknown), + d(new PkTransactionPrivate) + { + // for sanity we are finished till some transaction is set +- d->simulateModel = 0; +- d->launcher = 0; +- d->originalRole = Transaction::RoleUnknown; +- d->parentWindow = qobject_cast(parent); ++ d->allowDeps = false; + d->jobWatcher = false; +- ++ d->handlingActionRequired = false; ++ d->showingError = false; ++ d->downloadSizeRemaining = 0; ++ d->exitStatus = Success; ++ d->status = Transaction::StatusUnknown; + // for sanity we are trusted till an error is given and the user accepts + d->flags = Transaction::TransactionFlagOnlyTrusted; ++ d->originalRole = Transaction::RoleUnknown; ++ d->error = Transaction::ErrorUnknown; ++ d->launcher = 0; ++ d->simulateModel = 0; + d->progressModel = new PkTransactionProgressModel(this); ++ d->parentWindow = qobject_cast(parent); ++ + connect(this, SIGNAL(repoDetail(QString,QString,bool)), + d->progressModel, SLOT(currentRepo(QString,QString,bool))); + connect(this, SIGNAL(package(PackageKit::Transaction::Info,QString,QString)), +@@ -313,7 +321,7 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai + kDebug() << "errorCode: " << error << details; + d->error = error; + +- if (m_handlingActionRequired) { ++ if (d->handlingActionRequired) { + // We are already handling required actions + // like eulaRequired() and repoSignatureRequired() + return; +@@ -330,7 +338,7 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai + case Transaction::ErrorCannotInstallRepoUnsigned: + case Transaction::ErrorCannotUpdateRepoUnsigned: + { +- m_handlingActionRequired = true; ++ d->handlingActionRequired = true; + int ret = KMessageBox::warningYesNo(d->parentWindow, + i18n("You are about to install unsigned packages that can compromise your system, " + "as it is impossible to verify if the software came from a trusted " +@@ -343,11 +351,11 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai + } else { + setExitStatus(Cancelled); + } +- m_handlingActionRequired = false; ++ d->handlingActionRequired = false; + return; + } + default: +- m_showingError = true; ++ d->showingError = true; + showSorry(PkStrings::error(error), PkStrings::errorMessage(error), QString(details).replace('\n', "
")); + + // when we receive an error we are done +@@ -357,12 +365,12 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai + + void PkTransaction::slotEulaRequired(const QString &eulaID, const QString &packageID, const QString &vendor, const QString &licenseAgreement) + { +- if (m_handlingActionRequired) { ++ if (d->handlingActionRequired) { + // if its true means that we alread passed here +- m_handlingActionRequired = false; ++ d->handlingActionRequired = false; + return; + } else { +- m_handlingActionRequired = true; ++ d->handlingActionRequired = true; + } + + LicenseAgreement *eula = new LicenseAgreement(eulaID, packageID, vendor, licenseAgreement, d->parentWindow); +@@ -390,6 +398,8 @@ void PkTransaction::acceptEula() + + void PkTransaction::slotChanged() + { ++ d->downloadSizeRemaining = downloadSizeRemaining(); ++ + if (!d->jobWatcher) { + return; + } +@@ -416,13 +426,13 @@ void PkTransaction::slotMediaChangeRequired(Transaction::MediaType type, const Q + { + Q_UNUSED(id) + +- m_handlingActionRequired = true; ++ d->handlingActionRequired = true; + int ret = KMessageBox::questionYesNo(d->parentWindow, + PkStrings::mediaMessage(type, text), + i18n("A media change is required"), + KStandardGuiItem::cont(), + KStandardGuiItem::cancel()); +- m_handlingActionRequired = false; ++ d->handlingActionRequired = false; + + // if the user clicked continue we got yes + if (ret == KMessageBox::Yes) { +@@ -441,12 +451,12 @@ void PkTransaction::slotRepoSignature(const QString &packageID, + const QString &keyTimestamp, + Transaction::SigType type) + { +- if (m_handlingActionRequired) { ++ if (d->handlingActionRequired) { + // if its true means that we alread passed here +- m_handlingActionRequired = false; ++ d->handlingActionRequired = false; + return; + } else { +- m_handlingActionRequired = true; ++ d->handlingActionRequired = true; + } + + RepoSig *repoSig = new RepoSig(packageID, repoName, keyUrl, keyUserid, keyId, keyFingerprint, keyTimestamp, type, d->parentWindow); +@@ -508,6 +518,7 @@ void PkTransaction::slotFinished(Transaction::Exit status) + d->newPackages = d->simulateModel->packagesWithInfo(Transaction::InfoInstalling); + + requires = new Requirements(d->simulateModel, d->parentWindow); ++ requires->setDownloadSizeRemaining(d->downloadSizeRemaining); + connect(requires, SIGNAL(accepted()), this, SLOT(requeueTransaction())); + connect(requires, SIGNAL(rejected()), this, SLOT(reject())); + if (requires->shouldShow()) { +@@ -563,19 +574,19 @@ void PkTransaction::slotFinished(Transaction::Exit status) + case Transaction::ExitEulaRequired: + case Transaction::ExitMediaChangeRequired: + kDebug() << "finished KeyRequired or EulaRequired: " << status; +- if (!m_handlingActionRequired) { ++ if (!d->handlingActionRequired) { + kDebug() << "Not Handling Required Action"; + setExitStatus(Failed); + } + break; + case Transaction::ExitCancelled: + // Avoid crash in case we are showing an error +- if (!m_showingError) { ++ if (!d->showingError) { + setExitStatus(Cancelled); + } + break; + case Transaction::ExitFailed: +- if (!m_handlingActionRequired && !m_showingError) { ++ if (!d->handlingActionRequired && !d->showingError) { + kDebug() << "Yep, we failed."; + setExitStatus(Failed); + } +@@ -589,7 +600,7 @@ void PkTransaction::slotFinished(Transaction::Exit status) + + PkTransaction::ExitStatus PkTransaction::exitStatus() const + { +- return m_exitStatus; ++ return d->exitStatus; + } + + bool PkTransaction::isFinished() const +@@ -620,8 +631,8 @@ void PkTransaction::setExitStatus(PkTransaction::ExitStatus status) + d->launcher = 0; + } + +- m_exitStatus = status; +- if (!m_handlingActionRequired || !m_showingError) { ++ d->exitStatus = status; ++ if (!d->handlingActionRequired || !d->showingError) { + emit finished(status); + } + } +diff --git a/libapper/PkTransaction.h b/libapper/PkTransaction.h +index 52e2b5f..c330988 100644 +--- a/libapper/PkTransaction.h ++++ b/libapper/PkTransaction.h +@@ -107,10 +107,6 @@ private: + void showError(const QString &title, const QString &description, const QString &details = QString()); + void showSorry(const QString &title, const QString &description, const QString &details = QString()); + +- bool m_handlingActionRequired; +- bool m_showingError; //This might replace the above +- ExitStatus m_exitStatus; +- Transaction::Status m_status; + PkTransactionPrivate *d; + }; + +diff --git a/libapper/Requirements.cpp b/libapper/Requirements.cpp +index 0788b9f..7faf52c 100644 +--- a/libapper/Requirements.cpp ++++ b/libapper/Requirements.cpp +@@ -26,6 +26,7 @@ + #include "ApplicationSortFilterModel.h" + + #include ++#include + #include + + Requirements::Requirements(PackageModel *model, QWidget *parent) : +@@ -54,7 +55,7 @@ Requirements::Requirements(PackageModel *model, QWidget *parent) : + + setCaption(i18n("Additional changes")); + setWindowIcon(KIcon("dialog-warning")); +- setButtons(KDialog::Ok | KDialog::Cancel); ++ setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Help); + setButtonText(KDialog::Ok, i18n("Continue")); + // restore size + setMinimumSize(QSize(600,480)); +@@ -63,6 +64,10 @@ Requirements::Requirements(PackageModel *model, QWidget *parent) : + KConfigGroup requirementsDialog(&config, "requirementsDialog"); + restoreDialogSize(requirementsDialog); + ++ button(KDialog::Help)->setFlat(true); ++ button(KDialog::Help)->setEnabled(false); ++ button(KDialog::Help)->setIcon(KIcon("download")); ++ + m_buttonGroup = new QButtonGroup(this); + connect(m_buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(actionClicked(int))); + +@@ -187,6 +192,21 @@ void Requirements::setEmbedded(bool embedded) + ui->label->setVisible(!embedded); + } + ++void Requirements::setDownloadSizeRemaining(qulonglong size) ++{ ++ if (size) { ++ QString text; ++ text = i18nc("how many bytes are required for download", ++ "Need to get %1 of archives", ++ KGlobal::locale()->formatByteSize(size)); ++ button(KDialog::Help)->setText(text); ++ button(KDialog::Help)->setToolTip(text); ++ button(KDialog::Help)->show(); ++ } else { ++ button(KDialog::Help)->hide(); ++ } ++} ++ + bool Requirements::trusted() const + { + // There are untrusted packages if the button was created... +diff --git a/libapper/Requirements.h b/libapper/Requirements.h +index 938cf9c..1bd1e8b 100644 +--- a/libapper/Requirements.h ++++ b/libapper/Requirements.h +@@ -40,6 +40,7 @@ public: + + bool embedded() const; + void setEmbedded(bool embedded); ++ void setDownloadSizeRemaining(qulonglong size); + bool trusted() const; + + public slots: +-- +1.8.1.2 + diff --git a/0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch b/0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch new file mode 100644 index 0000000..159e6e6 --- /dev/null +++ b/0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch @@ -0,0 +1,66 @@ +From cd4e7fc408ebb65d9560d86b285fe8e0ebb5aa77 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Fri, 18 Jan 2013 00:56:06 -0200 +Subject: [PATCH 17/30] Fix bug that after a refresh cache made the package + progress bar of an install/remove/update too wide + +--- + libapper/TransactionDelegate.cpp | 12 ++++++------ + libapper/TransactionDelegate.h | 3 +++ + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/libapper/TransactionDelegate.cpp b/libapper/TransactionDelegate.cpp +index e6e77e5..f60f4f7 100644 +--- a/libapper/TransactionDelegate.cpp ++++ b/libapper/TransactionDelegate.cpp +@@ -30,7 +30,8 @@ + using namespace PackageKit; + + TransactionDelegate::TransactionDelegate(QObject *parent) : +- QStyledItemDelegate(parent) ++ QStyledItemDelegate(parent), ++ m_minWidth(0) + { + } + +@@ -63,8 +64,6 @@ void TransactionDelegate::paint(QPainter *painter, + } + } + +-static int minWidth = 0; +- + QSize TransactionDelegate::sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const + { +@@ -74,10 +73,11 @@ QSize TransactionDelegate::sizeHint(const QStyleOptionViewItem &option, + // The first column keeps resizing + // this avoids it being smaller + if (index.column() == 0) { +- if (size.width() < minWidth) { +- size.setWidth(minWidth); ++ if (size.width() < m_minWidth) { ++ size.setWidth(m_minWidth); + } else { +- minWidth = size.width(); ++ TransactionDelegate *delegate = const_cast(this); ++ delegate->m_minWidth = size.width(); + } + } + return size; +diff --git a/libapper/TransactionDelegate.h b/libapper/TransactionDelegate.h +index 4868461..747e211 100644 +--- a/libapper/TransactionDelegate.h ++++ b/libapper/TransactionDelegate.h +@@ -31,6 +31,9 @@ public: + + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; ++ ++private: ++ int m_minWidth; + }; + + #endif +-- +1.8.1.2 + diff --git a/0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch b/0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch new file mode 100644 index 0000000..7f3b1d4 --- /dev/null +++ b/0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch @@ -0,0 +1,158 @@ +From 7a633895144838dca5b9850308dffd030ff24946 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Fri, 18 Jan 2013 00:58:04 -0200 +Subject: [PATCH 18/30] Add a feature to tell the user to refresh his cache + after a repo change + +--- + ApperKCM/ApperKCM.cpp | 17 ++++++++++++++--- + ApperKCM/Settings/Settings.cpp | 9 +++++++++ + ApperKCM/Settings/Settings.h | 1 + + ApperKCM/Settings/Settings.ui | 19 +++++++++++++++++-- + 4 files changed, 41 insertions(+), 5 deletions(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index 6189149..74f7fd8 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -488,6 +488,8 @@ void ApperKCM::setPage(const QString &page) + m_settingsPage = new Settings(m_roles, this); + connect(m_settingsPage, SIGNAL(changed(bool)), + this, SLOT(checkChanged())); ++ connect(m_settingsPage, SIGNAL(refreshCache()), ++ SLOT(refreshCache())); + ui->stackedWidget->addWidget(m_settingsPage); + + connect(ui->generalSettingsPB, SIGNAL(toggled(bool)), +@@ -748,6 +750,8 @@ void ApperKCM::refreshCache() + { + emit changed(false); + ++ QWidget *currentWidget = ui->stackedWidget->currentWidget(); ++ + PkTransactionWidget *transactionW = new PkTransactionWidget(this); + connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); + QPointer transaction = new PkTransaction(transactionW); +@@ -776,9 +780,16 @@ void ApperKCM::refreshCache() + m_forceRefreshCache = transaction->exitStatus() == PkTransaction::Failed; + } + +- // Go back to the updates page +- m_updaterPage->getUpdates(); +- setPage("updates"); ++ if (m_updaterPage) { ++ m_updaterPage->getUpdates(); ++ } ++ ++ if (currentWidget == m_settingsPage) { ++ setPage("settings"); ++ } else { ++ setPage("updates"); ++ } ++ + QTimer::singleShot(0, this, SLOT(checkChanged())); + } + +diff --git a/ApperKCM/Settings/Settings.cpp b/ApperKCM/Settings/Settings.cpp +index d526494..7745611 100644 +--- a/ApperKCM/Settings/Settings.cpp ++++ b/ApperKCM/Settings/Settings.cpp +@@ -50,6 +50,13 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : + { + ui->setupUi(this); + ++ QAction *action = new QAction(i18n("Refresh Cache"), this); ++ connect(action, SIGNAL(triggered()), SIGNAL(refreshCache())); ++ connect(action, SIGNAL(triggered()), ui->messageWidget, SLOT(animatedHide())); ++ ui->messageWidget->addAction(action); ++ ui->messageWidget->setText(i18n("A repository was changed, it's highly recommended to refresh the cache")); ++ ui->messageWidget->hide(); ++ + if (!(m_roles & Transaction::RoleRefreshCache)) { + ui->intervalL->setEnabled(false); + ui->intervalCB->setEnabled(false); +@@ -62,6 +69,8 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : + m_originModel = new OriginModel(this); + connect(m_originModel, SIGNAL(refreshRepoList()), + SLOT(refreshRepoModel())); ++ connect(m_originModel, SIGNAL(refreshRepoList()), ++ ui->messageWidget, SLOT(animatedShow())); + QSortFilterProxyModel *proxy = new QSortFilterProxyModel(this); + proxy->setDynamicSortFilter(true); + proxy->setSourceModel(m_originModel); +diff --git a/ApperKCM/Settings/Settings.h b/ApperKCM/Settings/Settings.h +index f73d91d..29d48ae 100644 +--- a/ApperKCM/Settings/Settings.h ++++ b/ApperKCM/Settings/Settings.h +@@ -51,6 +51,7 @@ public slots: + + signals: + void changed(bool state); ++ void refreshCache(); + + private slots: + void refreshRepoModel(); +diff --git a/ApperKCM/Settings/Settings.ui b/ApperKCM/Settings/Settings.ui +index 9ba5837..b4bfd80 100644 +--- a/ApperKCM/Settings/Settings.ui ++++ b/ApperKCM/Settings/Settings.ui +@@ -15,18 +15,21 @@ + + + +- 1 ++ 0 + + + 0 + +- ++ + + + 0 + + + ++ ++ 0 ++ + + + +@@ -199,6 +202,9 @@ + + + ++ ++ 0 ++ + + + +@@ -252,6 +258,9 @@ + + + ++ ++ ++ + + + +@@ -260,6 +269,12 @@ + QComboBox +
kcombobox.h
+ ++ ++ KMessageWidget ++ QWidget ++
KMessageWidget
++ 1 ++ + + + +-- +1.8.1.2 + diff --git a/0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch b/0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch new file mode 100644 index 0000000..3a8b38f --- /dev/null +++ b/0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch @@ -0,0 +1,41 @@ +From b5c0a25134109cf258f6afd37696940cebe6338b Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Fri, 18 Jan 2013 01:37:52 -0200 +Subject: [PATCH 19/30] Connect to finished signal of ApplicationLaunch in + order to finish the transaction when the user presses ESC Show applications + installed for selected packages on an install + +--- + libapper/PkTransaction.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp +index 1f6b4c0..6370468 100644 +--- a/libapper/PkTransaction.cpp ++++ b/libapper/PkTransaction.cpp +@@ -515,7 +515,12 @@ void PkTransaction::slotFinished(Transaction::Exit status) + foreach (const QString &packageID, d->packages) { + d->simulateModel->removePackage(packageID); + } ++ + d->newPackages = d->simulateModel->packagesWithInfo(Transaction::InfoInstalling); ++ if (_role == Transaction::RoleInstallPackages) { ++ d->newPackages << d->packages; ++ d->newPackages.removeDuplicates(); ++ } + + requires = new Requirements(d->simulateModel, d->parentWindow); + requires->setDownloadSizeRemaining(d->downloadSizeRemaining); +@@ -562,8 +567,7 @@ void PkTransaction::slotFinished(Transaction::Exit status) + // if we have a launcher and the laucher has applications + // show them to the user + showDialog(d->launcher); +- connect(d->launcher, SIGNAL(accepted()), +- this, SLOT(setExitStatus())); ++ connect(d->launcher, SIGNAL(finished()), SLOT(setExitStatus())); + return; + } + setExitStatus(Success); +-- +1.8.1.2 + diff --git a/0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch b/0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch new file mode 100644 index 0000000..3d6ad31 --- /dev/null +++ b/0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch @@ -0,0 +1,167 @@ +From 784f6d1b31a95a995ebe6b18fb06549ebf627ac5 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Fri, 18 Jan 2013 01:39:49 -0200 +Subject: [PATCH 20/30] Allow PackageDetails to show screenshots from + software.openSUSE.org too + +--- + ApperKCM/PackageDetails.cpp | 44 ++++++++++++++++++++++---------------- + ApperKCM/PackageDetails.h | 2 ++ + ApperKCM/Updater/DistroUpgrade.cpp | 9 ++++---- + CMakeLists.txt | 9 +++++++- + config.h.cmake | 3 +++ + 5 files changed, 43 insertions(+), 24 deletions(-) + +diff --git a/ApperKCM/PackageDetails.cpp b/ApperKCM/PackageDetails.cpp +index 30763f6..8b06944 100644 +--- a/ApperKCM/PackageDetails.cpp ++++ b/ApperKCM/PackageDetails.cpp +@@ -269,11 +269,9 @@ void PackageDetails::setPackage(const QModelIndex &index) + m_currentIcon = PkIcons::getIcon(pkgIconPath, QString()).pixmap(64, 64); + m_appName = index.data(PackageModel::NameRole).toString(); + +-#ifdef HAVE_APPSTREAM +- m_currentScreenshot = AppStreamDb::instance()->thumbnail(Transaction::packageName(m_packageID)); ++ m_currentScreenshot = thumbnail(Transaction::packageName(m_packageID)); + kDebug() << "current screenshot" << m_currentScreenshot; +-#endif +- if (!m_currentScreenshot.isEmpty()) { ++ if (!m_currentScreenshot.isNull()) { + if (m_screenshotPath.contains(m_currentScreenshot)) { + display(); + } else { +@@ -297,21 +295,13 @@ void PackageDetails::setPackage(const QModelIndex &index) + + void PackageDetails::on_screenshotL_clicked() + { +- kDebug(); +-#ifndef HAVE_APPSTREAM +- return; +-#else +- QString screenshot; +- +- screenshot = AppStreamDb::instance()->screenshot(Transaction::packageName(m_packageID)); +- if (screenshot.isEmpty()) { +- return; ++ QString url; ++ url = screenshot(Transaction::packageName(m_packageID)); ++ if (!url.isNull()) { ++ ScreenShotViewer *view = new ScreenShotViewer(url); ++ view->setWindowTitle(m_appName); ++ view->show(); + } +- +- ScreenShotViewer *view = new ScreenShotViewer(screenshot); +- view->setWindowTitle(m_appName); +- view->show(); +-#endif + } + + void PackageDetails::hidePackageVersion(bool hide) +@@ -717,6 +707,24 @@ QVector > PackageDetails::locateApplication(const QStrin + return ret; + } + ++QString PackageDetails::thumbnail(const QString &pkgName) const ++{ ++ if (QLatin1String(SCREENSHOT_PROVIDER) == QLatin1String("openSUSE")) { ++ return QLatin1String("http://software.opensuse.org/package/thumbnail/") % pkgName % QLatin1String(".png");; ++ } else { ++ return QLatin1String("http://screenshots.debian.net/thumbnail/") % pkgName; ++ } ++} ++ ++QString PackageDetails::screenshot(const QString &pkgName) const ++{ ++ if (QLatin1String(SCREENSHOT_PROVIDER) == QLatin1String("openSUSE")) { ++ return QLatin1String("http://software.opensuse.org/package/screenshot/") % pkgName % QLatin1String(".png"); ++ } else { ++ return QLatin1String("http://screenshots.debian.net/screenshot/") % pkgName; ++ } ++} ++ + void PackageDetails::description(const QString &packageID, + const QString &license, + PackageKit::Transaction::Group group, +diff --git a/ApperKCM/PackageDetails.h b/ApperKCM/PackageDetails.h +index 087c954..c7555c8 100644 +--- a/ApperKCM/PackageDetails.h ++++ b/ApperKCM/PackageDetails.h +@@ -81,6 +81,8 @@ private: + void fadeOut(FadeWidgets widgets); + void setupDescription(); + QVector > locateApplication(const QString &_relPath, const QString &menuId) const; ++ QString thumbnail(const QString &pkgName) const; ++ QString screenshot(const QString &pkgName) const; + + Ui::PackageDetails *ui; + QActionGroup *m_actionGroup; +diff --git a/ApperKCM/Updater/DistroUpgrade.cpp b/ApperKCM/Updater/DistroUpgrade.cpp +index 183204e..4987c03 100644 +--- a/ApperKCM/Updater/DistroUpgrade.cpp ++++ b/ApperKCM/Updater/DistroUpgrade.cpp +@@ -42,6 +42,10 @@ DistroUpgrade::DistroUpgrade(QWidget *parent) : + addAction(action); + } + ++DistroUpgrade::~DistroUpgrade() ++{ ++} ++ + void DistroUpgrade::setName(const QString &name) + { + setText(i18n("Distribution upgrade available: %1", name)); +@@ -111,9 +115,4 @@ void DistroUpgrade::distroUpgradeError(QProcess::ProcessError error) + } + } + +-DistroUpgrade::~DistroUpgrade() +-{ +- kDebug() << "~DistroUpgrade()"; +-} +- + #include "DistroUpgrade.moc" +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5aca9ff..3215cea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,6 +33,13 @@ if (HAVE_APPSTREAM) + message(STATUS "AppStream categories path: " ${AS_CATEGORIES_PATH}) + endif (HAVE_APPSTREAM) + ++# command to edit the packages origins ++set(SCREENSHOT_PROVIDER "debian" CACHE STRING "Screen shots provider") ++if (SCREENSHOT_PROVIDER) ++ message(STATUS "Screen shots provider: " ${SCREENSHOT_PROVIDER}) ++ message(STATUS "Screen shots provider possibilities are: debian, openSUSE") ++endif (SCREENSHOT_PROVIDER) ++ + if (DEBCONF_SUPPORT) + # Tries to find the package, when it finds it HAVE_DEBCONFKDE is set in config.h + find_package(DebconfKDE REQUIRED) +@@ -41,7 +48,7 @@ if (DEBCONF_SUPPORT) + message(STATUS "Building with Debconf support") + endif (DEBCONF_SUPPORT) + +-set(APP_VERSION 0.8.0) ++set(APP_VERSION 0.8.1) + + # command to edit the packages origins + set(EDIT_ORIGNS_DESKTOP_NAME "" CACHE STRING "Edit origins desktop name") +diff --git a/config.h.cmake b/config.h.cmake +index 4e3caba..176a30b 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -10,6 +10,9 @@ + // Define if AppStream data is available. + #cmakedefine HAVE_APPSTREAM + ++// Define if screenshot provider ++#cmakedefine SCREENSHOT_PROVIDER "@SCREENSHOT_PROVIDER@" ++ + // Define the AppStream categories path. + #cmakedefine AS_CATEGORIES_PATH "@AS_CATEGORIES_PATH@" + +-- +1.8.1.2 + diff --git a/0021-Update-the-last-refresh-cache-time-from-the-update-c.patch b/0021-Update-the-last-refresh-cache-time-from-the-update-c.patch new file mode 100644 index 0000000..3642e9b --- /dev/null +++ b/0021-Update-the-last-refresh-cache-time-from-the-update-c.patch @@ -0,0 +1,83 @@ +From b0c2b6d99bb08298ab5e15ddc5c1faa1a040c946 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Mon, 21 Jan 2013 10:38:21 -0200 +Subject: [PATCH 21/30] Update the last refresh cache time from the update + changed signal as it is always emitted after a refresh cache + +--- + apperd/ApperdThread.cpp | 28 ++++++++-------------------- + apperd/ApperdThread.h | 1 - + 2 files changed, 8 insertions(+), 21 deletions(-) + +diff --git a/apperd/ApperdThread.cpp b/apperd/ApperdThread.cpp +index fd62bcf..fcbe2bf 100644 +--- a/apperd/ApperdThread.cpp ++++ b/apperd/ApperdThread.cpp +@@ -101,13 +101,8 @@ void ApperdThread::init() + QString locale(KGlobal::locale()->language() % QLatin1Char('.') % KGlobal::locale()->encoding()); + Daemon::global()->setHints(QLatin1String("locale=") % locale); + +- // Watch for TransactionListChanged so we start sentinel +- connect(Daemon::global(), SIGNAL(transactionListChanged(QStringList)), +- this, SLOT(transactionListChanged(QStringList))); +- +- // Watch for UpdatesChanged so we display new updates + connect(Daemon::global(), SIGNAL(updatesChanged()), +- this, SLOT(updatesChanged())); ++ SLOT(updatesChanged())); + + m_interface = new DBusInterface(this); + +@@ -128,8 +123,7 @@ void ApperdThread::init() + QDBusConnection::systemBus(), + QDBusServiceWatcher::WatchForRegistration, + this); +- connect(watcher, SIGNAL(serviceRegistered(QString)), +- this, SLOT(setProxy())); ++ connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(setProxy())); + + // if PackageKit is running check to see if there are running transactons already + bool packagekitIsRunning = nameHasOwner(QLatin1String("org.freedesktop.PackageKit"), +@@ -251,21 +245,15 @@ void ApperdThread::setProxy() + } + } + +-void ApperdThread::transactionListChanged(const QStringList &tids) ++void ApperdThread::updatesChanged() + { +- if (tids.isEmpty()) { +- // update the last time the cache was refreshed +- QDateTime lastCacheRefresh; +- lastCacheRefresh = getTimeSinceRefreshCache(); +- if (lastCacheRefresh != m_lastRefreshCache) { +- m_lastRefreshCache = lastCacheRefresh; +- } ++ // update the last time the cache was refreshed ++ QDateTime lastCacheRefresh; ++ lastCacheRefresh = getTimeSinceRefreshCache(); ++ if (lastCacheRefresh != m_lastRefreshCache) { ++ m_lastRefreshCache = lastCacheRefresh; + } +-} + +-// This is called when the list of updates changes +-void ApperdThread::updatesChanged() +-{ + bool ignoreBattery = m_configs[CFG_INSTALL_UP_BATTERY].value(); + bool ignoreMobile = m_configs[CFG_INSTALL_UP_MOBILE].value(); + +diff --git a/apperd/ApperdThread.h b/apperd/ApperdThread.h +index 384ba30..c911c98 100644 +--- a/apperd/ApperdThread.h ++++ b/apperd/ApperdThread.h +@@ -45,7 +45,6 @@ private slots: + void proxyChanged(); + void setProxy(); + +- void transactionListChanged(const QStringList &tids); + void updatesChanged(); + void appShouldConserveResourcesChanged(); + +-- +1.8.1.2 + diff --git a/0022-Add-some-margins-to-the-plasmoid.patch b/0022-Add-some-margins-to-the-plasmoid.patch new file mode 100644 index 0000000..775800c --- /dev/null +++ b/0022-Add-some-margins-to-the-plasmoid.patch @@ -0,0 +1,49 @@ +From 63362fc7aaeb54bae16b1aa0919fd77ea46a125b Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Tue, 22 Jan 2013 10:17:19 -0200 +Subject: [PATCH 22/30] Add some margins to the plasmoid + +--- + plasmoid/package/contents/ui/main.qml | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml +index 89bcef9..7c6159d 100644 +--- a/plasmoid/package/contents/ui/main.qml ++++ b/plasmoid/package/contents/ui/main.qml +@@ -127,6 +127,7 @@ FocusScope { + id: busyView + opacity: 0 + anchors.fill: parent ++ anchors.margins: 4 + state: "BUSY" + } + +@@ -138,7 +139,7 @@ FocusScope { + anchors.margins: 4 + StatusView { + id: statusView +- height: parent.height - refreshBT.height - parent.anchors.margins ++ height: parent.height - refreshBT.height - parent.anchors.margins - parent.spacing + width: parent.width + } + PlasmaComponents.Button { +@@ -154,6 +155,7 @@ FocusScope { + id: updatesView + opacity: 0 + anchors.fill: parent ++ anchors.margins: 4 + onUpdateClicked: installUpdates() + } + +@@ -161,6 +163,7 @@ FocusScope { + id: transactionView + opacity: 0 + anchors.fill: parent ++ anchors.margins: 4 + onFinished: { + if (success) { + if (root.state !== "BUSY") { +-- +1.8.1.2 + diff --git a/apper.spec b/apper.spec index 171d2b1..5525609 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -23,18 +23,36 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-apper-updater.js ## upstream patches +%define git_patches 1 +%if 0%{?git_patches} +BuildRequires: git-core +%endif Patch101: 0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch Patch102: 0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch Patch103: 0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch Patch104: 0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch Patch105: 0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch +Patch106: 0006-Fixes-package-installation-of-files-in-non-latin-pat.patch +Patch107: 0007-Make-hide-button-more-clear-BUG-263309.patch +Patch108: 0008-Fix-about-application-icon.patch +Patch109: 0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch +Patch110: 0010-Feature-show-application-status-in-window-title-BUG-.patch +Patch114: 0014-Fix-browsing-groups.patch +Patch115: 0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch +Patch116: 0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch +Patch117: 0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch +Patch118: 0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch +Patch119: 0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch +Patch120: 0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch +Patch121: 0021-Update-the-last-refresh-cache-time-from-the-update-c.patch +Patch122: 0022-Add-some-margins-to-the-plasmoid.patch + Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} # required because gnome-packagekit provides exactly the same interface Provides: PackageKit-session-service -BuildRequires: git-core BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext @@ -59,6 +77,7 @@ KDE interface for PackageKit. %prep %setup -q +%if 0%{?git_patches} git init if [ -z "$GIT_COMMITTER_NAME" ]; then git config user.email "kde@lists.fedoraproject.org" @@ -69,6 +88,7 @@ git commit -a -q -m "%{version} baseline." # Apply all the patches git am -p1 %{patches} < /dev/null +%endif %build @@ -146,6 +166,9 @@ fi %changelog +* Wed Feb 13 2013 Rex Dieter 0.8.0-3 +- a few more upstream fixes + * Wed Jan 09 2013 Rex Dieter 0.8.0-2 - pull in a few upstream fixes, including followup for kde#302786 From 8c9b68eb234771c43958793ecd94de99bb86b505 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 29 Apr 2013 08:46:17 -0500 Subject: [PATCH 034/111] Apper ignores "never check for updates" option (#948099) --- 0100-pk-cache-update-debugging.patch | 39 ++++++++++++++++++++++++++++ apper.spec | 7 ++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0100-pk-cache-update-debugging.patch diff --git a/0100-pk-cache-update-debugging.patch b/0100-pk-cache-update-debugging.patch new file mode 100644 index 0000000..30109d4 --- /dev/null +++ b/0100-pk-cache-update-debugging.patch @@ -0,0 +1,39 @@ +From 80ee30993a9b656b1fc23e9abec98f93deabf448 Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Mon, 29 Apr 2013 08:43:42 -0500 +Subject: [PATCH] cache update debuging + +--- + apperd/ApperdThread.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/apperd/ApperdThread.cpp b/apperd/ApperdThread.cpp +index cce7d2d..cd49de8 100644 +--- a/apperd/ApperdThread.cpp ++++ b/apperd/ApperdThread.cpp +@@ -163,6 +163,9 @@ void ApperdThread::poll() + m_lastRefreshCache = getTimeSinceRefreshCache(); + } + ++ qDebug() << "CHECKING FOR UPDATES (poll)"; ++ qDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); ++ + // If check for updates is active + if (m_configs[CFG_INTERVAL].value() != Enum::Never) { + // Find out how many seconds passed since last refresh cache +@@ -254,6 +257,12 @@ void ApperdThread::setProxy() + + void ApperdThread::updatesChanged() + { ++ qDebug() << "UPDATES CHANGED"; ++ qDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); ++ ++ if (m_configs[CFG_INTERVAL].value() == Enum::Never) ++ return; ++ + // update the last time the cache was refreshed + QDateTime lastCacheRefresh; + lastCacheRefresh = getTimeSinceRefreshCache(); +-- +1.8.1.4 + diff --git a/apper.spec b/apper.spec index 5525609..226c030 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -46,6 +46,8 @@ Patch119: 0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch Patch120: 0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch Patch121: 0021-Update-the-last-refresh-cache-time-from-the-update-c.patch Patch122: 0022-Add-some-margins-to-the-plasmoid.patch +# hack around https://bugzilla.redhat.com/948099 +Patch200: 0100-pk-cache-update-debugging.patch Obsoletes: kpackagekit < 0.7.0 @@ -166,6 +168,9 @@ fi %changelog +* Mon Apr 29 2013 Rex Dieter 0.8.0-4 +- Apper ignores "never check for updates" option (#948099) + * Wed Feb 13 2013 Rex Dieter 0.8.0-3 - a few more upstream fixes From b026b73b67faf2505500819e9435b1191906baea Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 29 Apr 2013 09:37:21 -0500 Subject: [PATCH 035/111] respin previous patch to use kDebug instead --- 0100-pk-cache-update-debugging.patch | 8 ++++---- apper.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/0100-pk-cache-update-debugging.patch b/0100-pk-cache-update-debugging.patch index 30109d4..1743090 100644 --- a/0100-pk-cache-update-debugging.patch +++ b/0100-pk-cache-update-debugging.patch @@ -15,8 +15,8 @@ index cce7d2d..cd49de8 100644 m_lastRefreshCache = getTimeSinceRefreshCache(); } -+ qDebug() << "CHECKING FOR UPDATES (poll)"; -+ qDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); ++ kDebug() << "CHECKING FOR UPDATES (poll)"; ++ kDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); + // If check for updates is active if (m_configs[CFG_INTERVAL].value() != Enum::Never) { @@ -25,8 +25,8 @@ index cce7d2d..cd49de8 100644 void ApperdThread::updatesChanged() { -+ qDebug() << "UPDATES CHANGED"; -+ qDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); ++ kDebug() << "UPDATES CHANGED"; ++ kDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); + + if (m_configs[CFG_INTERVAL].value() == Enum::Never) + return; diff --git a/apper.spec b/apper.spec index 226c030..02d26ff 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -168,6 +168,9 @@ fi %changelog +* Mon Apr 29 2013 Rex Dieter 0.8.0-5 +- respin previous patch to use kDebug instead + * Mon Apr 29 2013 Rex Dieter 0.8.0-4 - Apper ignores "never check for updates" option (#948099) From e85a8c73bd6660e90cd2e365f02fab204655548a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 11 May 2013 16:44:19 -0500 Subject: [PATCH 036/111] 0.8.1 201305011 snapshot --- .gitignore | 1 + ...sing-double-click-on-the-desktop-BUG.patch | 40 -- ...d-to-watch-a-transaction-when-it-s-j.patch | 26 -- ...sage-by-not-setting-an-initial-state.patch | 26 -- ...Adds-a-Help-menu-to-Apper-BUG-293440.patch | 53 --- ...ction-caused-by-a-fix-for-BUG-302786.patch | 25 -- ...stallation-of-files-in-non-latin-pat.patch | 84 ---- ...ke-hide-button-more-clear-BUG-263309.patch | 68 ---- 0008-Fix-about-application-icon.patch | 29 -- ...plication-dialog-in-Apper-BUG-293440.patch | 33 -- ...lication-status-in-window-title-BUG-.patch | 378 ------------------ 0014-Fix-browsing-groups.patch | 26 -- ...e-toggle-repos-so-that-we-can-report.patch | 303 -------------- ...wnload-is-left-and-use-QPointers-ins.patch | 349 ---------------- ...er-a-refresh-cache-made-the-package-.patch | 66 --- ...-tell-the-user-to-refresh-his-cache-.patch | 158 -------- ...hed-signal-of-ApplicationLaunch-in-o.patch | 41 -- ...ails-to-show-screenshots-from-softwa.patch | 167 -------- ...refresh-cache-time-from-the-update-c.patch | 83 ---- 0022-Add-some-margins-to-the-plasmoid.patch | 49 --- apper.spec | 36 +- sources | 2 +- 22 files changed, 13 insertions(+), 2030 deletions(-) delete mode 100644 0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch delete mode 100644 0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch delete mode 100644 0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch delete mode 100644 0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch delete mode 100644 0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch delete mode 100644 0006-Fixes-package-installation-of-files-in-non-latin-pat.patch delete mode 100644 0007-Make-hide-button-more-clear-BUG-263309.patch delete mode 100644 0008-Fix-about-application-icon.patch delete mode 100644 0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch delete mode 100644 0010-Feature-show-application-status-in-window-title-BUG-.patch delete mode 100644 0014-Fix-browsing-groups.patch delete mode 100644 0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch delete mode 100644 0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch delete mode 100644 0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch delete mode 100644 0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch delete mode 100644 0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch delete mode 100644 0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch delete mode 100644 0021-Update-the-last-refresh-cache-time-from-the-update-c.patch delete mode 100644 0022-Add-some-margins-to-the-plasmoid.patch diff --git a/.gitignore b/.gitignore index d6b00ef..252d665 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.7.2.tar.bz2 /apper-0.8.0.tar.bz2 +/apper-0.8.1-20130511.tar.bz2 diff --git a/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch b/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch deleted file mode 100644 index d81eede..0000000 --- a/0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 808ed3e2cc55415fcff70686afdacf1a8190db72 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Tue, 8 Jan 2013 20:03:31 -0200 -Subject: [PATCH 01/30] Fixed bug when using double click on the desktop, - BUG:302786 - ---- - ApperKCM/ApperKCM.cpp | 2 +- - ApperKCM/ApperKCM.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index 2a83f69..14a5cd6 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -370,7 +370,7 @@ void ApperKCM::on_actionFindFile_triggered() - } - } - --void ApperKCM::on_homeView_clicked(const QModelIndex &index) -+void ApperKCM::on_homeView_activated(const QModelIndex &index) - { - if (index.isValid()) { - const QSortFilterProxyModel *proxy; -diff --git a/ApperKCM/ApperKCM.h b/ApperKCM/ApperKCM.h -index 3989f13..07660ec 100644 ---- a/ApperKCM/ApperKCM.h -+++ b/ApperKCM/ApperKCM.h -@@ -76,7 +76,7 @@ private slots: - void on_actionFindDescription_triggered(); - void on_actionFindFile_triggered(); - -- void on_homeView_clicked(const QModelIndex &index); -+ void on_homeView_activated(const QModelIndex &index); - - void finished(); - void errorCode(PackageKit::Transaction::Error error, const QString &detail); --- -1.8.1.2 - diff --git a/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch b/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch deleted file mode 100644 index 37e5c5a..0000000 --- a/0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7fb3d6dff1705e9a49953e775cadcf22c5bd2699 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 12:49:29 -0200 -Subject: [PATCH 02/30] Don't tell apperd to watch a transaction when it's just - simulating - ---- - libapper/PkTransaction.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp -index c81f8bf..9ab949b 100644 ---- a/libapper/PkTransaction.cpp -+++ b/libapper/PkTransaction.cpp -@@ -395,7 +395,7 @@ void PkTransaction::slotChanged() - } - - QDBusObjectPath _tid = tid(); -- if (d->tid != _tid) { -+ if (d->tid != _tid && !(d->flags & Transaction::TransactionFlagSimulate)) { - // if the transaction changed and - // the user wants the watcher send the tid - QDBusMessage message; --- -1.8.1.2 - diff --git a/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch b/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch deleted file mode 100644 index f881213..0000000 --- a/0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2990121024410801e9767871297f369512cf0c72 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 13:02:59 -0200 -Subject: [PATCH 03/30] Reduce the CPU usage by not setting an initial state - when starting (makes BusyCurso not run which eats CPU) - ---- - plasmoid/package/contents/ui/main.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml -index 222ce97..89bcef9 100644 ---- a/plasmoid/package/contents/ui/main.qml -+++ b/plasmoid/package/contents/ui/main.qml -@@ -23,7 +23,7 @@ import org.packagekit 0.1 as PackageKit - FocusScope { - id: root - -- state: "BUSY" -+ state: "" - - property int minimumHeight: 320 - property int minimumWidth: 370 --- -1.8.1.2 - diff --git a/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch b/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch deleted file mode 100644 index 3039145..0000000 --- a/0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a7d3614e0cc9bb4dcd0720281f8760578a93465c Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 13:50:59 -0200 -Subject: [PATCH 04/30] Adds a Help menu to Apper BUG 293440 - ---- - Apper/MainUi.cpp | 3 ++- - ApperKCM/ApperKCM.cpp | 8 ++++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Apper/MainUi.cpp b/Apper/MainUi.cpp -index 587d75a..31c2092 100644 ---- a/Apper/MainUi.cpp -+++ b/Apper/MainUi.cpp -@@ -39,7 +39,8 @@ MainUi::MainUi(QWidget *parent) - // Set Apply and Cancel buttons - setButtons(KDialog::Apply /*| KDialog::Help*/ | KDialog::Default | KDialog::Reset); - -- KPageWidgetItem *page = addModule("kcm_apper.desktop"); -+ KPageWidgetItem *page = addModule(QLatin1String("kcm_apper.desktop"), -+ QStringList() << QLatin1String("apper")); - if (page) { - KCModuleProxy *proxy = static_cast(page->widget()); - if (proxy) { -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index 14a5cd6..a6677b0 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -221,6 +222,13 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : - connect(signalMapper, SIGNAL(mapped(QString)), - this, SLOT(setPage(QString))); - -+ // Only show help menu if not on System Settings -+ if (!args.isEmpty()) { -+ // adds the help menu -+ KHelpMenu *helpMenu = new KHelpMenu(this); -+ menu->addMenu(helpMenu->menu()); -+ } -+ - // Make sure the search bar is visible - ui->stackedWidgetBar->setCurrentIndex(BAR_SEARCH); - } --- -1.8.1.2 - diff --git a/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch b/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch deleted file mode 100644 index 3724482..0000000 --- a/0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch +++ /dev/null @@ -1,25 +0,0 @@ -From decb93370d447c368cf2255c6b2c7f4502844cc8 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 14:48:49 -0200 -Subject: [PATCH 05/30] Fix a connection caused by a fix for BUG:302786 - ---- - ApperKCM/ApperKCM.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index a6677b0..b408fe9 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -110,7 +110,7 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : - toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - - connect(ui->browseView, SIGNAL(categoryActivated(QModelIndex)), -- this, SLOT(on_homeView_clicked(QModelIndex))); -+ this, SLOT(on_homeView_activated(QModelIndex))); - - QMenu *findMenu = new QMenu(this); - // find is just a generic name in case we don't have any search method --- -1.8.1.2 - diff --git a/0006-Fixes-package-installation-of-files-in-non-latin-pat.patch b/0006-Fixes-package-installation-of-files-in-non-latin-pat.patch deleted file mode 100644 index c115a8c..0000000 --- a/0006-Fixes-package-installation-of-files-in-non-latin-pat.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 216a03a19a295cb9b2889651212f60d5bf1ebd6d Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 15:24:43 -0200 -Subject: [PATCH 06/30] Fixes package installation of files in non-latin paths - BUG:307258 - ---- - PkSession/FilesModel.cpp | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/PkSession/FilesModel.cpp b/PkSession/FilesModel.cpp -index e2e6e1a..cc1f37f 100644 ---- a/PkSession/FilesModel.cpp -+++ b/PkSession/FilesModel.cpp -@@ -74,31 +74,32 @@ bool FilesModel::insertFiles(const QList &urls) - { - bool ret = false; - foreach (const QUrl &url, urls) { -- if (files().contains(url.path())) { -+ QString path = QUrl::fromPercentEncoding(url.path().toUtf8()); -+ if (files().contains(path)) { - continue; - } - -- QFileInfo fileInfo(url.path()); -+ QFileInfo fileInfo(path); - QStandardItem *item = 0; - if (fileInfo.isFile()) { -- KMimeType::Ptr mime = KMimeType::findByFileContent(url.path()); -+ KMimeType::Ptr mime = KMimeType::findByFileContent(path); - kDebug() << url << mime->name(); - foreach (const QString &mimeType, m_mimes) { - if (mime->is(mimeType)) { - ret = true; - /* kDebug() << "Found Supported Mime" << mimeType << mime->iconName();*/ - item = new QStandardItem(fileInfo.fileName()); -- item->setData(url.path()); -- item->setToolTip(url.path()); -+ item->setData(path); -+ item->setToolTip(path); - item->setIcon(KIconLoader::global()->loadMimeTypeIcon(mime->iconName(), -- KIconLoader::Desktop)); -+ KIconLoader::Desktop)); - break; - } - } - - if (ret == false && m_mimes.isEmpty()) { - if (mime->name() == "application/x-desktop") { -- KService *service = new KService(url.path()); -+ KService *service = new KService(path); - item = new QStandardItem(service->name()); - item->setData(true, Qt::UserRole); - item->setIcon(KIconLoader::global()->loadMimeTypeIcon(service->icon(), -@@ -108,20 +109,20 @@ bool FilesModel::insertFiles(const QList &urls) - item->setIcon(KIconLoader::global()->loadMimeTypeIcon(mime->iconName(), - KIconLoader::Desktop)); - } -- item->setData(url.path()); -- item->setToolTip(url.path()); -+ item->setData(path); -+ item->setToolTip(path); - } else if (ret == false && !m_mimes.isEmpty()) { - item = new QStandardItem(fileInfo.fileName()); -- item->setData(url.path()); -- item->setToolTip(url.path()); -+ item->setData(path); -+ item->setToolTip(path); - item->setEnabled(false); - item->setIcon(KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Desktop)); - } - } else if (m_mimes.isEmpty()) { - // It's not a file but we don't have a mime so it's ok - item = new QStandardItem(fileInfo.fileName()); -- item->setData(url.path()); -- item->setToolTip(url.path()); -+ item->setData(path); -+ item->setToolTip(path); - item->setIcon(KIconLoader::global()->loadIcon("unknown", KIconLoader::Desktop)); - } - --- -1.8.1.2 - diff --git a/0007-Make-hide-button-more-clear-BUG-263309.patch b/0007-Make-hide-button-more-clear-BUG-263309.patch deleted file mode 100644 index 4ea2415..0000000 --- a/0007-Make-hide-button-more-clear-BUG-263309.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b58cf962419023a8e6237e58f3c92cfdd7d45bb7 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 16:07:09 -0200 -Subject: [PATCH 07/30] Make hide button more clear BUG:263309 - ---- - ApperKCM/PackageDetails.cpp | 1 + - ApperKCM/PackageDetails.ui | 3 --- - ApperKCM/Updater/UpdateDetails.cpp | 2 +- - ApperKCM/Updater/UpdateDetails.ui | 3 --- - 4 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/ApperKCM/PackageDetails.cpp b/ApperKCM/PackageDetails.cpp -index 4a8f3ef..30763f6 100644 ---- a/ApperKCM/PackageDetails.cpp -+++ b/ApperKCM/PackageDetails.cpp -@@ -76,6 +76,7 @@ PackageDetails::PackageDetails(QWidget *parent) - m_hasFileList(false) - { - ui->setupUi(this); -+ ui->hideTB->setIcon(KIcon("window-close")); - connect(ui->hideTB, SIGNAL(clicked()), this, SLOT(hide())); - } - -diff --git a/ApperKCM/PackageDetails.ui b/ApperKCM/PackageDetails.ui -index a598754..93c38a7 100644 ---- a/ApperKCM/PackageDetails.ui -+++ b/ApperKCM/PackageDetails.ui -@@ -364,9 +364,6 @@ - - true - -- -- Qt::DownArrow -- - - - -diff --git a/ApperKCM/Updater/UpdateDetails.cpp b/ApperKCM/Updater/UpdateDetails.cpp -index 9c1d515..368756e 100644 ---- a/ApperKCM/Updater/UpdateDetails.cpp -+++ b/ApperKCM/Updater/UpdateDetails.cpp -@@ -41,7 +41,7 @@ UpdateDetails::UpdateDetails(QWidget *parent) - m_transaction(0) - { - setupUi(this); -- -+ hideTB->setIcon(KIcon("window-close")); - connect(hideTB, SIGNAL(clicked()), this, SLOT(hide())); - - m_busySeq = new KPixmapSequenceOverlayPainter(this); -diff --git a/ApperKCM/Updater/UpdateDetails.ui b/ApperKCM/Updater/UpdateDetails.ui -index ce5436f..03efc48 100644 ---- a/ApperKCM/Updater/UpdateDetails.ui -+++ b/ApperKCM/Updater/UpdateDetails.ui -@@ -25,9 +25,6 @@ - - true - -- -- Qt::DownArrow -- - - - --- -1.8.1.2 - diff --git a/0008-Fix-about-application-icon.patch b/0008-Fix-about-application-icon.patch deleted file mode 100644 index 3c9bac3..0000000 --- a/0008-Fix-about-application-icon.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 535f013ba2a3307f46f2fe1def887c4501187dec Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 16:50:07 -0200 -Subject: [PATCH 08/30] Fix about application icon - ---- - Apper/main.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Apper/main.cpp b/Apper/main.cpp -index 3662d0b..580e1c3 100644 ---- a/Apper/main.cpp -+++ b/Apper/main.cpp -@@ -55,10 +55,11 @@ int main(int argc, char **argv) - APP_VERSION, - ki18n("Apper is an Application to Get and Manage Software"), - KAboutData::License_GPL, -- ki18n("(C) 2008-2011 Daniel Nicoletti")); -+ ki18n("(C) 2008-2013 Daniel Nicoletti")); - - about.addAuthor(ki18n("Daniel Nicoletti"), KLocalizedString(), "dantti12@gmail.com", "http://dantti.wordpress.com"); - about.addCredit(ki18n("Adrien Bustany"), ki18n("libpackagekit-qt and other stuff"), "@"); -+ about.setProgramIconName("applications-other"); - - KCmdLineArgs::init(argc, argv, &about); - --- -1.8.1.2 - diff --git a/0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch b/0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch deleted file mode 100644 index ca72e7d..0000000 --- a/0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 371662677211d21f324d8803eab3e851764af3c4 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 18:47:18 -0200 -Subject: [PATCH 09/30] Fix About Application dialog in Apper BUG:293440 - ---- - ApperKCM/ApperKCM.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index b408fe9..43b3475 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -225,7 +226,7 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : - // Only show help menu if not on System Settings - if (!args.isEmpty()) { - // adds the help menu -- KHelpMenu *helpMenu = new KHelpMenu(this); -+ KHelpMenu *helpMenu = new KHelpMenu(this, KCmdLineArgs::aboutData()); - menu->addMenu(helpMenu->menu()); - } - --- -1.8.1.2 - diff --git a/0010-Feature-show-application-status-in-window-title-BUG-.patch b/0010-Feature-show-application-status-in-window-title-BUG-.patch deleted file mode 100644 index 35952d9..0000000 --- a/0010-Feature-show-application-status-in-window-title-BUG-.patch +++ /dev/null @@ -1,378 +0,0 @@ -From 4a5dae7bb0ae57d93acc4afd57888bd7f6695555 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 9 Jan 2013 21:18:11 -0200 -Subject: [PATCH 10/30] Feature: show application status in window title - BUG:300750 - ---- - Apper/MainUi.cpp | 6 ++-- - Apper/main.cpp | 6 ---- - ApperKCM/ApperKCM.cpp | 46 +++++++++++++++++------------- - ApperKCM/ApperKCM.h | 1 + - libapper/PkTransactionWidget.cpp | 61 +++++++++++++++++++++++++++++++--------- - libapper/PkTransactionWidget.h | 1 + - 6 files changed, 79 insertions(+), 42 deletions(-) - -diff --git a/Apper/MainUi.cpp b/Apper/MainUi.cpp -index 31c2092..2a91dd4 100644 ---- a/Apper/MainUi.cpp -+++ b/Apper/MainUi.cpp -@@ -25,8 +25,8 @@ - #include - #include - --MainUi::MainUi(QWidget *parent) -- : KCMultiDialog(parent), -+MainUi::MainUi(QWidget *parent) : -+ KCMultiDialog(parent), - m_apperModule(0) - { - setCaption(QString()); -@@ -45,6 +45,8 @@ MainUi::MainUi(QWidget *parent) - KCModuleProxy *proxy = static_cast(page->widget()); - if (proxy) { - m_apperModule = proxy->realModule(); -+ connect(m_apperModule, SIGNAL(caption(QString)), -+ this, SLOT(setCaption(QString))); - } - } else { - kWarning() << "Could not load kcm_apper.desktop!"; -diff --git a/Apper/main.cpp b/Apper/main.cpp -index 580e1c3..c971680 100644 ---- a/Apper/main.cpp -+++ b/Apper/main.cpp -@@ -125,12 +125,6 @@ int main(int argc, char **argv) - return invoke("RemovePackageByFiles", args->getOptionList("remove-package-by-file")); - } - -- if (!Apper::start()) -- { -- qDebug() << "Apper is already running!"; -- return 0; -- } -- - Apper app; - - return app.exec(); -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index 43b3475..339aee3 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -392,7 +392,7 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index) - } - - // cache the search -- m_searchRole = static_cast(index.data(CategoryModel::SearchRole).toUInt()); -+ m_searchRole = static_cast(index.data(CategoryModel::SearchRole).toUInt()); - kDebug() << m_searchRole << index.data(CategoryModel::CategoryRole).toString(); - if (m_searchRole == Transaction::RoleResolve) { - #ifdef HAVE_APPSTREAM -@@ -413,6 +413,7 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index) - } else { - m_searchGroupCategory.clear(); - m_searchGroup = index.data(CategoryModel::GroupRole).value(); -+ m_searchString = index.data().toString(); // Store the nice name to change the title - } - } else if (m_searchRole == Transaction::RoleGetUpdates) { - setPage("updates"); -@@ -503,6 +504,7 @@ void ApperKCM::setPage(const QString &page) - m_settingsPage->load(); - ui->titleL->clear(); - ui->backTB->setEnabled(true); -+ emit caption(i18n("Settings")); - } - } else if (page == QLatin1String("updates")) { - if (ui->stackedWidget->currentWidget() != m_updaterPage) { -@@ -529,6 +531,7 @@ void ApperKCM::setPage(const QString &page) - m_updaterPage->load(); - ui->stackedWidgetBar->setCurrentIndex(BAR_UPDATE); - ui->backTB->setEnabled(true); -+ emit caption(i18n("Updates")); - } - } else if (page == QLatin1String("home")) { - if (ui->stackedWidget->currentWidget() == m_updaterPage || -@@ -545,6 +548,7 @@ void ApperKCM::setPage(const QString &page) - ui->backTB->setEnabled(true); - ui->filtersTB->setEnabled(false); - ui->widget->setEnabled(false); -+ emit caption(i18n("History")); - } - } - -@@ -589,6 +593,7 @@ void ApperKCM::on_backTB_clicked() - ui->backTB->setEnabled(canGoBack); - // reset the search role - m_searchRole = Transaction::RoleUnknown; -+ emit caption(); - } - - void ApperKCM::on_changesPB_clicked() -@@ -597,6 +602,7 @@ void ApperKCM::on_changesPB_clicked() - m_changesModel->addSelectedPackagesFromModel(m_browseModel); - ui->stackedWidget->setCurrentWidget(ui->pageChanges); - ui->backTB->setEnabled(true); -+ emit caption(i18n("Pending Changes")); - } - - void ApperKCM::disconnectTransaction() -@@ -623,6 +629,9 @@ void ApperKCM::disconnectTransaction() - void ApperKCM::search() - { - ui->browseView->cleanUi(); -+ if (ui->stackedWidgetBar->currentIndex() != BAR_SEARCH) { -+ ui->stackedWidgetBar->setCurrentIndex(BAR_SEARCH); -+ } - - disconnectTransaction(); - -@@ -645,18 +654,24 @@ void ApperKCM::search() - switch (m_searchRole) { - case Transaction::RoleSearchName: - m_searchTransaction->searchNames(m_searchString, m_filtersMenu->filters()); -+ emit caption(m_searchString); - break; - case Transaction::RoleSearchDetails: - m_searchTransaction->searchDetails(m_searchString, m_filtersMenu->filters()); -+ emit caption(m_searchString); - break; - case Transaction::RoleSearchFile: - m_searchTransaction->searchFiles(m_searchString, m_filtersMenu->filters()); -+ emit caption(m_searchString); - break; - case Transaction::RoleSearchGroup: - if (m_searchGroupCategory.isEmpty()) { - m_searchTransaction->searchGroup(m_searchGroup, m_filtersMenu->filters()); -+ // m_searchString has the group nice name -+ emit caption(m_searchString); - } else { - ui->browseView->setParentCategory(m_searchParentCategory); -+ emit caption(m_searchParentCategory.data().toString()); - #ifndef HAVE_APPSTREAM - if (m_searchGroupCategory.startsWith('@') || - m_searchGroupCategory.startsWith(QLatin1String("repo:"))) { -@@ -672,6 +687,7 @@ void ApperKCM::search() - connect(m_searchTransaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), - ui->browseView, SLOT(enableExportInstalledPB())); - m_searchTransaction->getPackages(Transaction::FilterInstalled | m_filtersMenu->filters()); -+ emit caption(i18n("Installed Software")); - break; - case Transaction::RoleResolve: - #ifdef HAVE_APPSTREAM -@@ -680,9 +696,11 @@ void ApperKCM::search() - // WARNING the resolve might fail if the backend - // has a low limit MaximumItemsToResolve - m_searchTransaction->resolve(m_searchCategory, m_filtersMenu->filters()); -+ emit caption(m_searchParentCategory.data().toString()); - } else { - ui->browseView->setParentCategory(m_searchParentCategory); - KMessageBox::sorry(this, i18n("Could not find an application that matched this category")); -+ emit caption(); - disconnectTransaction(); - m_searchTransaction = 0; - return; -@@ -691,6 +709,7 @@ void ApperKCM::search() - #endif - default: - kWarning() << "Search type not defined yet"; -+ emit caption(); - disconnectTransaction(); - m_searchTransaction = 0; - return; -@@ -726,17 +745,16 @@ void ApperKCM::changed() - - void ApperKCM::refreshCache() - { -- QWidget *currentWidget = ui->stackedWidget->currentWidget(); - emit changed(false); - - PkTransactionWidget *transactionW = new PkTransactionWidget(this); -+ connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); - PkTransaction *transaction = new PkTransaction(transactionW); - QWeakPointer pointer = transaction; - transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); - - ui->stackedWidget->addWidget(transactionW); - ui->stackedWidget->setCurrentWidget(transactionW); -- int oldBar = ui->stackedWidgetBar->currentIndex(); - ui->stackedWidgetBar->setCurrentIndex(BAR_TITLE); - ui->backTB->setEnabled(false); - connect(transactionW, SIGNAL(titleChanged(QString)), -@@ -758,18 +776,9 @@ void ApperKCM::refreshCache() - m_forceRefreshCache = transaction->exitStatus() == PkTransaction::Failed; - } - -- // Finished setup old stuff -- ui->backTB->setEnabled(true); -- ui->stackedWidget->setCurrentWidget(currentWidget); -- ui->stackedWidgetBar->setCurrentIndex(oldBar); -- transactionW->deleteLater(); -- transaction->deleteLater(); -- if (currentWidget == m_updaterPage) { -- m_updaterPage->getUpdates(); -- } else { -- // install then remove packages -- search(); -- } -+ // Go back to the updates page -+ m_updaterPage->getUpdates(); -+ setPage("updates"); - QTimer::singleShot(0, this, SLOT(checkChanged())); - } - -@@ -780,12 +789,12 @@ void ApperKCM::save() - m_settingsPage->save(); - } else { - PkTransactionWidget *transactionW = new PkTransactionWidget(this); -+ connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); - PkTransaction *transaction = new PkTransaction(transactionW); - QWeakPointer pointer = transaction; - - ui->stackedWidget->addWidget(transactionW); - ui->stackedWidget->setCurrentWidget(transactionW); -- int oldBar = ui->stackedWidgetBar->currentIndex(); - ui->stackedWidgetBar->setCurrentIndex(BAR_TITLE); - ui->backTB->setEnabled(false); - connect(transactionW, SIGNAL(titleChanged(QString)), -@@ -847,13 +856,10 @@ void ApperKCM::save() - } - } - -- // Finished setup old stuff -- ui->backTB->setEnabled(true); -- ui->stackedWidget->setCurrentWidget(currentWidget); -- ui->stackedWidgetBar->setCurrentIndex(oldBar); - transaction->deleteLater(); - if (currentWidget == m_updaterPage) { - m_updaterPage->getUpdates(); -+ setPage("updates"); - } else { - // install then remove packages - search(); -diff --git a/ApperKCM/ApperKCM.h b/ApperKCM/ApperKCM.h -index 07660ec..dbe9da9 100644 ---- a/ApperKCM/ApperKCM.h -+++ b/ApperKCM/ApperKCM.h -@@ -57,6 +57,7 @@ public: - - signals: - void changed(bool state); -+ void caption(const QString &title = QString()); - - public slots: - void load(); -diff --git a/libapper/PkTransactionWidget.cpp b/libapper/PkTransactionWidget.cpp -index fb88d74..252699c 100644 ---- a/libapper/PkTransactionWidget.cpp -+++ b/libapper/PkTransactionWidget.cpp -@@ -175,23 +175,30 @@ void PkTransactionWidget::updateUi() - } - - uint percentage = transaction->percentage(); -+ QString percentageString; - if (percentage <= 100) { -- ui->progressBar->setMaximum(100); -- ui->progressBar->setValue(percentage); -+ if (ui->progressBar->value() != static_cast(percentage)) { -+ ui->progressBar->setMaximum(100); -+ ui->progressBar->setValue(percentage); -+ percentageString = QString::number(percentage); -+ } - } else if (ui->progressBar->maximum() != 0) { - ui->progressBar->setMaximum(0); - ui->progressBar->reset(); -+ percentageString = QLatin1String(""); - } - - ui->progressBar->setRemaining(transaction->remainingTime()); - - // Status & Speed - Transaction::Status status = transaction->status(); -+ uint speed = transaction->speed(); -+ qulonglong downloadSizeRemaining = transaction->downloadSizeRemaining(); - if (m_status != status) { - m_status = status; - ui->currentL->setText(PkStrings::status(status, -- transaction->speed(), -- transaction->downloadSizeRemaining())); -+ speed, -+ downloadSizeRemaining)); - - KPixmapSequence sequence = KPixmapSequence(PkIcons::statusAnimation(status), - KIconLoader::SizeLarge); -@@ -201,25 +208,51 @@ void PkTransactionWidget::updateUi() - } - } else if (status == Transaction::StatusDownload) { - ui->currentL->setText(PkStrings::status(status, -- transaction->speed(), -- transaction->downloadSizeRemaining())); -+ speed, -+ downloadSizeRemaining)); - } - -+ QString windowTitle; -+ QString windowTitleProgress; -+ KIcon windowIcon; - Transaction::Role role = transaction->role(); -- if (d->role != role) { -- QString windowTitle; -- KIcon windowIcon; -- if (role == Transaction::RoleUnknown) { -- windowTitle = PkStrings::status(Transaction::StatusSetup); -- windowIcon = PkIcons::statusIcon(Transaction::StatusSetup); -+ if (role == Transaction::RoleUnknown) { -+ windowTitle = PkStrings::status(Transaction::StatusSetup); -+ if (percentageString.isEmpty()) { -+ windowTitleProgress = PkStrings::status(status, -+ speed, -+ downloadSizeRemaining); -+ } else { -+ QString statusText = PkStrings::status(status, -+ speed, -+ downloadSizeRemaining); -+ windowTitleProgress = i18n("%1 (%2%)", statusText, percentageString); -+ } -+ windowIcon = PkIcons::statusIcon(Transaction::StatusSetup); -+ } else { -+ windowTitle = PkStrings::action(role); -+ if (percentageString.isEmpty()) { -+ windowTitleProgress = PkStrings::status(status, -+ speed, -+ downloadSizeRemaining); - } else { -- windowTitle = PkStrings::action(role); -- windowIcon = PkIcons::actionIcon(role); -+ QString statusText = PkStrings::status(status, -+ speed, -+ downloadSizeRemaining); -+ windowTitleProgress = i18n("%1 (%2%)", statusText, percentageString); - } -+ windowIcon = PkIcons::actionIcon(role); -+ } -+ -+ if (d->role != role) { - d->role = role; - setWindowIcon(PkIcons::actionIcon(role)); - setWindowTitle(windowTitle); -+ - emit titleChanged(windowTitle); -+ emit titleChangedProgress(windowTitleProgress); -+ } else if (!percentageString.isNull()) { -+ emit titleChangedProgress(windowTitleProgress); - } - - // check to see if we can cancel -diff --git a/libapper/PkTransactionWidget.h b/libapper/PkTransactionWidget.h -index 45d0a35..30ea044 100644 ---- a/libapper/PkTransactionWidget.h -+++ b/libapper/PkTransactionWidget.h -@@ -54,6 +54,7 @@ public: - signals: - void allowCancel(bool enable); - void titleChanged(const QString &title); -+ void titleChangedProgress(const QString &title); - void dialog(KDialog *widget); - void sorry(const QString &title, const QString &text, const QString &details); - void error(const QString &title, const QString &text, const QString &details); --- -1.8.1.2 - diff --git a/0014-Fix-browsing-groups.patch b/0014-Fix-browsing-groups.patch deleted file mode 100644 index 9be467c..0000000 --- a/0014-Fix-browsing-groups.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a321e5c359d367bd7ffa0a11124afb91d945a238 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Thu, 17 Jan 2013 11:34:13 -0200 -Subject: [PATCH 14/30] Fix browsing groups - ---- - ApperKCM/ApperKCM.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index 339aee3..b18caec 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -412,7 +412,8 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index) - } - } else { - m_searchGroupCategory.clear(); -- m_searchGroup = index.data(CategoryModel::GroupRole).value(); -+ int groupRole = index.data(CategoryModel::GroupRole).toInt(); -+ m_searchGroup = static_cast(groupRole); - m_searchString = index.data().toString(); // Store the nice name to change the title - } - } else if (m_searchRole == Transaction::RoleGetUpdates) { --- -1.8.1.2 - diff --git a/0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch b/0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch deleted file mode 100644 index 12dc597..0000000 --- a/0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch +++ /dev/null @@ -1,303 +0,0 @@ -From 856a72c2c4e9b30081093fbfc97eb3e40359bed5 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Thu, 17 Jan 2013 18:42:02 -0200 -Subject: [PATCH 15/30] Change the way we toggle repos so that we can report - that an error happened to the user - ---- - ApperKCM/Settings/OriginModel.cpp | 99 +++++++++++++++++---------------------- - ApperKCM/Settings/OriginModel.h | 19 ++++++-- - ApperKCM/Settings/Settings.cpp | 28 ++++------- - ApperKCM/Settings/Settings.h | 1 + - 4 files changed, 69 insertions(+), 78 deletions(-) - -diff --git a/ApperKCM/Settings/OriginModel.cpp b/ApperKCM/Settings/OriginModel.cpp -index 6cb4907..faae248 100644 ---- a/ApperKCM/Settings/OriginModel.cpp -+++ b/ApperKCM/Settings/OriginModel.cpp -@@ -22,16 +22,13 @@ - - #include - --#include - #include - #include - --#include -+#include - - using namespace PackageKit; - --Q_DECLARE_METATYPE(Qt::CheckState) -- - OriginModel::OriginModel(QObject *parent) : - QStandardItemModel(parent), - m_finished(true) -@@ -44,6 +41,37 @@ OriginModel::~OriginModel() - { - } - -+bool OriginModel::setData(const QModelIndex &index, const QVariant &value, int role) -+{ -+ if (role == Qt::CheckStateRole && index.isValid()) { -+ Transaction *transaction = new Transaction(this); -+ connect(transaction, SIGNAL(errorCode(PackageKit::Transaction::Error,QString)), -+ SLOT(errorCode(PackageKit::Transaction::Error,QString))); -+ connect(transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), -+ SLOT(setRepoFinished(PackageKit::Transaction::Exit))); -+ -+ transaction->repoEnable(index.data(RepoId).toString(), -+ value.toBool()); -+ if (transaction->error()) { -+ KMessageBox::sorry(0, PkStrings::daemonError(transaction->error())); -+ } -+ } -+ return false; -+} -+ -+QVariantHash OriginModel::changes() const -+{ -+ QVariantHash ret; -+ for (int i = 0; i < rowCount(); ++i) { -+ QStandardItem *repo = item(i); -+ bool currentState = repo->checkState(); -+ if (currentState != repo->data(RepoInitialState).toBool()) { -+ ret[repo->data(RepoId).toString()] = currentState; -+ } -+ } -+ return ret; -+} -+ - void OriginModel::addOriginItem(const QString &repo_id, const QString &details, bool enabled) - { - if (m_finished) { -@@ -52,12 +80,11 @@ void OriginModel::addOriginItem(const QString &repo_id, const QString &details, - m_finished = false; - } - -- Qt::CheckState state = enabled ? Qt::Checked : Qt::Unchecked; - QStandardItem *item = new QStandardItem(details); - item->setCheckable(true); -- item->setCheckState(state); -- item->setData(repo_id, Qt::UserRole); -- item->setData(qVariantFromValue(state)); -+ item->setCheckState(enabled ? Qt::Checked : Qt::Unchecked); -+ item->setData(repo_id, RepoId); -+ item->setData(enabled, RepoInitialState); - appendRow(item); - } - -@@ -66,61 +93,19 @@ void OriginModel::finished() - m_finished = true; - } - --void OriginModel::clearChanges() -+void OriginModel::errorCode(PackageKit::Transaction::Error error, const QString &details) - { -- for (int i = 0; i < rowCount(); ++i) { -- QStandardItem *repo = item(i); -- if (repo->checkState() != repo->data().value()) { -- repo->setCheckState(repo->data().value()); -- } -+ if (error != Transaction::ErrorTransactionCancelled) { -+ KMessageBox::detailedSorry(0, PkStrings::errorMessage(error), details, PkStrings::error(error), KMessageBox::Notify); - } - } - --bool OriginModel::changed() const -+void OriginModel::setRepoFinished(Transaction::Exit exit) - { -- for (int i = 0; i < rowCount(); ++i) { -- QStandardItem *repo = item(i); -- if (repo->checkState() != repo->data().value()) { -- return true; -- } -- } -- return false; --} -- --bool OriginModel::save() --{ -- bool changed = false; -- int rows = rowCount(); -- QEventLoop loop; -- for (int i = 0; i < rows; ++i) { -- QStandardItem *repo = item(i); -- if (repo->checkState() != repo->data().value()) { -- Transaction *transaction = new Transaction(this); -- QWeakPointer pointer = transaction; -- connect(transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), -- &loop, SLOT(quit())); -- transaction->repoEnable(repo->data(Qt::UserRole).toString(), -- static_cast(repo->checkState())); -- if (transaction->error()) { -- KMessageBox::sorry(0, PkStrings::daemonError(transaction->error())); -- return false; -- } -- loop.exec(); -- changed = true; -- -- if (pointer.isNull()) { -- // Avoid crashing when the application is quitting -- return false; -- } -- } -- } -- -- // refresh the user cache if he or she enables/disables any of it -- if (changed) { -- // TODO ask to refresh the cache -- // TODO emit refresh requested -+ if (exit == Transaction::ExitSuccess) { -+ emit refreshRepoList(); - } -- return true; -+ sender()->deleteLater(); - } - - #include "OriginModel.moc" -diff --git a/ApperKCM/Settings/OriginModel.h b/ApperKCM/Settings/OriginModel.h -index 294baf2..318017c 100644 ---- a/ApperKCM/Settings/OriginModel.h -+++ b/ApperKCM/Settings/OriginModel.h -@@ -23,21 +23,34 @@ - - #include - -+#include -+ - class OriginModel : public QStandardItemModel - { - Q_OBJECT - public: -+ enum { -+ RepoId = Qt::UserRole, -+ RepoInitialState -+ } RepoRole; - OriginModel(QObject *parent = 0); - ~OriginModel(); - -- bool changed() const; -- bool save(); -- void clearChanges(); -+ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); -+ -+ QVariantHash changes() const; -+ -+signals: -+ void refreshRepoList(); - - public slots: - void addOriginItem(const QString &repo_id, const QString &details, bool enabled); - void finished(); - -+private slots: -+ void errorCode(PackageKit::Transaction::Error error, const QString &details); -+ void setRepoFinished(PackageKit::Transaction::Exit exit); -+ - private: - bool m_finished; - }; -diff --git a/ApperKCM/Settings/Settings.cpp b/ApperKCM/Settings/Settings.cpp -index 7f54adb..d526494 100644 ---- a/ApperKCM/Settings/Settings.cpp -+++ b/ApperKCM/Settings/Settings.cpp -@@ -25,6 +25,7 @@ - #include "OriginModel.h" - - #include -+#include - - #include - #include -@@ -59,6 +60,8 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : - } - - m_originModel = new OriginModel(this); -+ connect(m_originModel, SIGNAL(refreshRepoList()), -+ SLOT(refreshRepoModel())); - QSortFilterProxyModel *proxy = new QSortFilterProxyModel(this); - proxy->setDynamicSortFilter(true); - proxy->setSourceModel(m_originModel); -@@ -67,11 +70,7 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : - // This is needed to keep the oring right - ui->originTV->header()->setSortIndicator(0, Qt::AscendingOrder); - proxy->sort(0); -- if (m_roles & Transaction::RoleGetRepoList) { -- // The data will be loaded when Load is called -- connect(m_originModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), -- this, SLOT(checkChanges())); -- } else { -+ if (!(m_roles & Transaction::RoleGetRepoList)) { - // Disables the group box - ui->originTV->setEnabled(false); - ui->showOriginsCB->setEnabled(false); -@@ -134,6 +133,11 @@ void Settings::on_editOriginsPB_clicked() - #endif //EDIT_ORIGNS_DESKTOP_NAME - } - -+void Settings::refreshRepoModel() -+{ -+ on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); -+} -+ - // TODO update the repo list connecting to repo changed signal - void Settings::on_showOriginsCB_stateChanged(int state) - { -@@ -189,8 +193,6 @@ bool Settings::hasChanges() const - || - ui->installUpdatesMobileCB->isChecked() != checkUpdateGroup.readEntry(CFG_INSTALL_UP_MOBILE, DEFAULT_INSTALL_UP_MOBILE) - || -- ((m_roles & Transaction::RoleGetRepoList) ? m_originModel->changed() : false) -- || - ui->autoConfirmCB->isChecked() != !requirementsDialog.readEntry("autoConfirm", false) - || - ui->appLauncherCB->isChecked() != transaction.readEntry("ShowApplicationLauncher", true)) { -@@ -264,7 +266,7 @@ void Settings::load() - KConfigGroup originsDialog(&config, "originsDialog"); - bool showDevel = originsDialog.readEntry("showDevel", false); - ui->showOriginsCB->setChecked(showDevel); -- on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); -+ refreshRepoModel(); - ui->originTV->setEnabled(true); - } else { - ui->originTV->setEnabled(false); -@@ -306,15 +308,6 @@ void Settings::save() - checkUpdateGroup.writeEntry("autoUpdate", ui->autoCB->itemData(ui->autoCB->currentIndex()).toUInt()); - checkUpdateGroup.writeEntry("installUpdatesOnBattery", ui->installUpdatesBatteryCB->isChecked()); - checkUpdateGroup.writeEntry("installUpdatesOnMobile", ui->installUpdatesMobileCB->isChecked()); -- // check to see if the backend support this -- if (m_roles & Transaction::RoleGetRepoList) { -- on_showOriginsCB_stateChanged(ui->showOriginsCB->checkState()); -- if (!m_originModel->save()) { -- KMessageBox::sorry(this, -- i18n("You do not have the necessary privileges to perform this action."), -- i18n("Failed to set origin data")); -- } -- } - } - - void Settings::defaults() -@@ -324,7 +317,6 @@ void Settings::defaults() - ui->distroIntervalCB->setCurrentIndex(ui->distroIntervalCB->findData(Enum::DistroUpgradeDefault)); - ui->intervalCB->setCurrentIndex(ui->intervalCB->findData(Enum::TimeIntervalDefault)); - ui->autoCB->setCurrentIndex(ui->autoCB->findData(Enum::AutoUpdateDefault) ); -- m_originModel->clearChanges(); - checkChanges(); - } - -diff --git a/ApperKCM/Settings/Settings.h b/ApperKCM/Settings/Settings.h -index 2213f6e..f73d91d 100644 ---- a/ApperKCM/Settings/Settings.h -+++ b/ApperKCM/Settings/Settings.h -@@ -53,6 +53,7 @@ signals: - void changed(bool state); - - private slots: -+ void refreshRepoModel(); - void on_showOriginsCB_stateChanged(int state); - void on_editOriginsPB_clicked(); - void checkChanges(); --- -1.8.1.2 - diff --git a/0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch b/0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch deleted file mode 100644 index 04c20e3..0000000 --- a/0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch +++ /dev/null @@ -1,349 +0,0 @@ -From 6cecc3dc052b60f0a2bdc4893d38b5d8a83dd464 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Fri, 18 Jan 2013 00:19:55 -0200 -Subject: [PATCH 16/30] Show how much download is left and use QPointers - instead of QWeakPointers for convenience - ---- - ApperKCM/ApperKCM.cpp | 14 +++++----- - libapper/PkTransaction.cpp | 65 +++++++++++++++++++++++++++------------------- - libapper/PkTransaction.h | 4 --- - libapper/Requirements.cpp | 22 +++++++++++++++- - libapper/Requirements.h | 1 + - 5 files changed, 66 insertions(+), 40 deletions(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index b18caec..6189149 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -750,8 +750,7 @@ void ApperKCM::refreshCache() - - PkTransactionWidget *transactionW = new PkTransactionWidget(this); - connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); -- PkTransaction *transaction = new PkTransaction(transactionW); -- QWeakPointer pointer = transaction; -+ QPointer transaction = new PkTransaction(transactionW); - transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); - - ui->stackedWidget->addWidget(transactionW); -@@ -768,7 +767,7 @@ void ApperKCM::refreshCache() - // wait for the end of transaction - if (!transaction->isFinished()) { - loop.exec(); -- if (pointer.isNull()) { -+ if (!transaction) { - // Avoid crashing - return; - } -@@ -791,8 +790,7 @@ void ApperKCM::save() - } else { - PkTransactionWidget *transactionW = new PkTransactionWidget(this); - connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); -- PkTransaction *transaction = new PkTransaction(transactionW); -- QWeakPointer pointer = transaction; -+ QPointer transaction = new PkTransaction(transactionW); - - ui->stackedWidget->addWidget(transactionW); - ui->stackedWidget->setCurrentWidget(transactionW); -@@ -811,7 +809,7 @@ void ApperKCM::save() - // wait for the end of transaction - if (!transaction->isFinished()) { - loop.exec(); -- if (pointer.isNull()) { -+ if (!transaction) { - // Avoid crashing - return; - } -@@ -826,7 +824,7 @@ void ApperKCM::save() - // wait for the end of transaction - if (!transaction->isFinished()) { - loop.exec(); -- if (pointer.isNull()) { -+ if (!transaction) { - // Avoid crashing - return; - } -@@ -845,7 +843,7 @@ void ApperKCM::save() - // wait for the end of transaction - if (!transaction->isFinished()) { - loop.exec(); -- if (pointer.isNull()) { -+ if (!transaction) { - // Avoid crashing - return; - } -diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp -index 9ab949b..1f6b4c0 100644 ---- a/libapper/PkTransaction.cpp -+++ b/libapper/PkTransaction.cpp -@@ -55,6 +55,11 @@ class PkTransactionPrivate - public: - bool allowDeps; - bool jobWatcher; -+ bool handlingActionRequired; -+ bool showingError; //This might replace the above -+ qulonglong downloadSizeRemaining; -+ PkTransaction::ExitStatus exitStatus; -+ Transaction::Status status; - Transaction::TransactionFlags flags; - Transaction::Role originalRole; - Transaction::Error error; -@@ -70,22 +75,25 @@ public: - - PkTransaction::PkTransaction(QObject *parent) : - Transaction(parent), -- m_handlingActionRequired(false), -- m_showingError(false), -- m_exitStatus(Success), -- m_status(Transaction::StatusUnknown), - d(new PkTransactionPrivate) - { - // for sanity we are finished till some transaction is set -- d->simulateModel = 0; -- d->launcher = 0; -- d->originalRole = Transaction::RoleUnknown; -- d->parentWindow = qobject_cast(parent); -+ d->allowDeps = false; - d->jobWatcher = false; -- -+ d->handlingActionRequired = false; -+ d->showingError = false; -+ d->downloadSizeRemaining = 0; -+ d->exitStatus = Success; -+ d->status = Transaction::StatusUnknown; - // for sanity we are trusted till an error is given and the user accepts - d->flags = Transaction::TransactionFlagOnlyTrusted; -+ d->originalRole = Transaction::RoleUnknown; -+ d->error = Transaction::ErrorUnknown; -+ d->launcher = 0; -+ d->simulateModel = 0; - d->progressModel = new PkTransactionProgressModel(this); -+ d->parentWindow = qobject_cast(parent); -+ - connect(this, SIGNAL(repoDetail(QString,QString,bool)), - d->progressModel, SLOT(currentRepo(QString,QString,bool))); - connect(this, SIGNAL(package(PackageKit::Transaction::Info,QString,QString)), -@@ -313,7 +321,7 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai - kDebug() << "errorCode: " << error << details; - d->error = error; - -- if (m_handlingActionRequired) { -+ if (d->handlingActionRequired) { - // We are already handling required actions - // like eulaRequired() and repoSignatureRequired() - return; -@@ -330,7 +338,7 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai - case Transaction::ErrorCannotInstallRepoUnsigned: - case Transaction::ErrorCannotUpdateRepoUnsigned: - { -- m_handlingActionRequired = true; -+ d->handlingActionRequired = true; - int ret = KMessageBox::warningYesNo(d->parentWindow, - i18n("You are about to install unsigned packages that can compromise your system, " - "as it is impossible to verify if the software came from a trusted " -@@ -343,11 +351,11 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai - } else { - setExitStatus(Cancelled); - } -- m_handlingActionRequired = false; -+ d->handlingActionRequired = false; - return; - } - default: -- m_showingError = true; -+ d->showingError = true; - showSorry(PkStrings::error(error), PkStrings::errorMessage(error), QString(details).replace('\n', "
")); - - // when we receive an error we are done -@@ -357,12 +365,12 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const QString &detai - - void PkTransaction::slotEulaRequired(const QString &eulaID, const QString &packageID, const QString &vendor, const QString &licenseAgreement) - { -- if (m_handlingActionRequired) { -+ if (d->handlingActionRequired) { - // if its true means that we alread passed here -- m_handlingActionRequired = false; -+ d->handlingActionRequired = false; - return; - } else { -- m_handlingActionRequired = true; -+ d->handlingActionRequired = true; - } - - LicenseAgreement *eula = new LicenseAgreement(eulaID, packageID, vendor, licenseAgreement, d->parentWindow); -@@ -390,6 +398,8 @@ void PkTransaction::acceptEula() - - void PkTransaction::slotChanged() - { -+ d->downloadSizeRemaining = downloadSizeRemaining(); -+ - if (!d->jobWatcher) { - return; - } -@@ -416,13 +426,13 @@ void PkTransaction::slotMediaChangeRequired(Transaction::MediaType type, const Q - { - Q_UNUSED(id) - -- m_handlingActionRequired = true; -+ d->handlingActionRequired = true; - int ret = KMessageBox::questionYesNo(d->parentWindow, - PkStrings::mediaMessage(type, text), - i18n("A media change is required"), - KStandardGuiItem::cont(), - KStandardGuiItem::cancel()); -- m_handlingActionRequired = false; -+ d->handlingActionRequired = false; - - // if the user clicked continue we got yes - if (ret == KMessageBox::Yes) { -@@ -441,12 +451,12 @@ void PkTransaction::slotRepoSignature(const QString &packageID, - const QString &keyTimestamp, - Transaction::SigType type) - { -- if (m_handlingActionRequired) { -+ if (d->handlingActionRequired) { - // if its true means that we alread passed here -- m_handlingActionRequired = false; -+ d->handlingActionRequired = false; - return; - } else { -- m_handlingActionRequired = true; -+ d->handlingActionRequired = true; - } - - RepoSig *repoSig = new RepoSig(packageID, repoName, keyUrl, keyUserid, keyId, keyFingerprint, keyTimestamp, type, d->parentWindow); -@@ -508,6 +518,7 @@ void PkTransaction::slotFinished(Transaction::Exit status) - d->newPackages = d->simulateModel->packagesWithInfo(Transaction::InfoInstalling); - - requires = new Requirements(d->simulateModel, d->parentWindow); -+ requires->setDownloadSizeRemaining(d->downloadSizeRemaining); - connect(requires, SIGNAL(accepted()), this, SLOT(requeueTransaction())); - connect(requires, SIGNAL(rejected()), this, SLOT(reject())); - if (requires->shouldShow()) { -@@ -563,19 +574,19 @@ void PkTransaction::slotFinished(Transaction::Exit status) - case Transaction::ExitEulaRequired: - case Transaction::ExitMediaChangeRequired: - kDebug() << "finished KeyRequired or EulaRequired: " << status; -- if (!m_handlingActionRequired) { -+ if (!d->handlingActionRequired) { - kDebug() << "Not Handling Required Action"; - setExitStatus(Failed); - } - break; - case Transaction::ExitCancelled: - // Avoid crash in case we are showing an error -- if (!m_showingError) { -+ if (!d->showingError) { - setExitStatus(Cancelled); - } - break; - case Transaction::ExitFailed: -- if (!m_handlingActionRequired && !m_showingError) { -+ if (!d->handlingActionRequired && !d->showingError) { - kDebug() << "Yep, we failed."; - setExitStatus(Failed); - } -@@ -589,7 +600,7 @@ void PkTransaction::slotFinished(Transaction::Exit status) - - PkTransaction::ExitStatus PkTransaction::exitStatus() const - { -- return m_exitStatus; -+ return d->exitStatus; - } - - bool PkTransaction::isFinished() const -@@ -620,8 +631,8 @@ void PkTransaction::setExitStatus(PkTransaction::ExitStatus status) - d->launcher = 0; - } - -- m_exitStatus = status; -- if (!m_handlingActionRequired || !m_showingError) { -+ d->exitStatus = status; -+ if (!d->handlingActionRequired || !d->showingError) { - emit finished(status); - } - } -diff --git a/libapper/PkTransaction.h b/libapper/PkTransaction.h -index 52e2b5f..c330988 100644 ---- a/libapper/PkTransaction.h -+++ b/libapper/PkTransaction.h -@@ -107,10 +107,6 @@ private: - void showError(const QString &title, const QString &description, const QString &details = QString()); - void showSorry(const QString &title, const QString &description, const QString &details = QString()); - -- bool m_handlingActionRequired; -- bool m_showingError; //This might replace the above -- ExitStatus m_exitStatus; -- Transaction::Status m_status; - PkTransactionPrivate *d; - }; - -diff --git a/libapper/Requirements.cpp b/libapper/Requirements.cpp -index 0788b9f..7faf52c 100644 ---- a/libapper/Requirements.cpp -+++ b/libapper/Requirements.cpp -@@ -26,6 +26,7 @@ - #include "ApplicationSortFilterModel.h" - - #include -+#include - #include - - Requirements::Requirements(PackageModel *model, QWidget *parent) : -@@ -54,7 +55,7 @@ Requirements::Requirements(PackageModel *model, QWidget *parent) : - - setCaption(i18n("Additional changes")); - setWindowIcon(KIcon("dialog-warning")); -- setButtons(KDialog::Ok | KDialog::Cancel); -+ setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Help); - setButtonText(KDialog::Ok, i18n("Continue")); - // restore size - setMinimumSize(QSize(600,480)); -@@ -63,6 +64,10 @@ Requirements::Requirements(PackageModel *model, QWidget *parent) : - KConfigGroup requirementsDialog(&config, "requirementsDialog"); - restoreDialogSize(requirementsDialog); - -+ button(KDialog::Help)->setFlat(true); -+ button(KDialog::Help)->setEnabled(false); -+ button(KDialog::Help)->setIcon(KIcon("download")); -+ - m_buttonGroup = new QButtonGroup(this); - connect(m_buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(actionClicked(int))); - -@@ -187,6 +192,21 @@ void Requirements::setEmbedded(bool embedded) - ui->label->setVisible(!embedded); - } - -+void Requirements::setDownloadSizeRemaining(qulonglong size) -+{ -+ if (size) { -+ QString text; -+ text = i18nc("how many bytes are required for download", -+ "Need to get %1 of archives", -+ KGlobal::locale()->formatByteSize(size)); -+ button(KDialog::Help)->setText(text); -+ button(KDialog::Help)->setToolTip(text); -+ button(KDialog::Help)->show(); -+ } else { -+ button(KDialog::Help)->hide(); -+ } -+} -+ - bool Requirements::trusted() const - { - // There are untrusted packages if the button was created... -diff --git a/libapper/Requirements.h b/libapper/Requirements.h -index 938cf9c..1bd1e8b 100644 ---- a/libapper/Requirements.h -+++ b/libapper/Requirements.h -@@ -40,6 +40,7 @@ public: - - bool embedded() const; - void setEmbedded(bool embedded); -+ void setDownloadSizeRemaining(qulonglong size); - bool trusted() const; - - public slots: --- -1.8.1.2 - diff --git a/0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch b/0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch deleted file mode 100644 index 159e6e6..0000000 --- a/0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From cd4e7fc408ebb65d9560d86b285fe8e0ebb5aa77 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Fri, 18 Jan 2013 00:56:06 -0200 -Subject: [PATCH 17/30] Fix bug that after a refresh cache made the package - progress bar of an install/remove/update too wide - ---- - libapper/TransactionDelegate.cpp | 12 ++++++------ - libapper/TransactionDelegate.h | 3 +++ - 2 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/libapper/TransactionDelegate.cpp b/libapper/TransactionDelegate.cpp -index e6e77e5..f60f4f7 100644 ---- a/libapper/TransactionDelegate.cpp -+++ b/libapper/TransactionDelegate.cpp -@@ -30,7 +30,8 @@ - using namespace PackageKit; - - TransactionDelegate::TransactionDelegate(QObject *parent) : -- QStyledItemDelegate(parent) -+ QStyledItemDelegate(parent), -+ m_minWidth(0) - { - } - -@@ -63,8 +64,6 @@ void TransactionDelegate::paint(QPainter *painter, - } - } - --static int minWidth = 0; -- - QSize TransactionDelegate::sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const - { -@@ -74,10 +73,11 @@ QSize TransactionDelegate::sizeHint(const QStyleOptionViewItem &option, - // The first column keeps resizing - // this avoids it being smaller - if (index.column() == 0) { -- if (size.width() < minWidth) { -- size.setWidth(minWidth); -+ if (size.width() < m_minWidth) { -+ size.setWidth(m_minWidth); - } else { -- minWidth = size.width(); -+ TransactionDelegate *delegate = const_cast(this); -+ delegate->m_minWidth = size.width(); - } - } - return size; -diff --git a/libapper/TransactionDelegate.h b/libapper/TransactionDelegate.h -index 4868461..747e211 100644 ---- a/libapper/TransactionDelegate.h -+++ b/libapper/TransactionDelegate.h -@@ -31,6 +31,9 @@ public: - - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; -+ -+private: -+ int m_minWidth; - }; - - #endif --- -1.8.1.2 - diff --git a/0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch b/0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch deleted file mode 100644 index 7f3b1d4..0000000 --- a/0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 7a633895144838dca5b9850308dffd030ff24946 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Fri, 18 Jan 2013 00:58:04 -0200 -Subject: [PATCH 18/30] Add a feature to tell the user to refresh his cache - after a repo change - ---- - ApperKCM/ApperKCM.cpp | 17 ++++++++++++++--- - ApperKCM/Settings/Settings.cpp | 9 +++++++++ - ApperKCM/Settings/Settings.h | 1 + - ApperKCM/Settings/Settings.ui | 19 +++++++++++++++++-- - 4 files changed, 41 insertions(+), 5 deletions(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index 6189149..74f7fd8 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -488,6 +488,8 @@ void ApperKCM::setPage(const QString &page) - m_settingsPage = new Settings(m_roles, this); - connect(m_settingsPage, SIGNAL(changed(bool)), - this, SLOT(checkChanged())); -+ connect(m_settingsPage, SIGNAL(refreshCache()), -+ SLOT(refreshCache())); - ui->stackedWidget->addWidget(m_settingsPage); - - connect(ui->generalSettingsPB, SIGNAL(toggled(bool)), -@@ -748,6 +750,8 @@ void ApperKCM::refreshCache() - { - emit changed(false); - -+ QWidget *currentWidget = ui->stackedWidget->currentWidget(); -+ - PkTransactionWidget *transactionW = new PkTransactionWidget(this); - connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); - QPointer transaction = new PkTransaction(transactionW); -@@ -776,9 +780,16 @@ void ApperKCM::refreshCache() - m_forceRefreshCache = transaction->exitStatus() == PkTransaction::Failed; - } - -- // Go back to the updates page -- m_updaterPage->getUpdates(); -- setPage("updates"); -+ if (m_updaterPage) { -+ m_updaterPage->getUpdates(); -+ } -+ -+ if (currentWidget == m_settingsPage) { -+ setPage("settings"); -+ } else { -+ setPage("updates"); -+ } -+ - QTimer::singleShot(0, this, SLOT(checkChanged())); - } - -diff --git a/ApperKCM/Settings/Settings.cpp b/ApperKCM/Settings/Settings.cpp -index d526494..7745611 100644 ---- a/ApperKCM/Settings/Settings.cpp -+++ b/ApperKCM/Settings/Settings.cpp -@@ -50,6 +50,13 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : - { - ui->setupUi(this); - -+ QAction *action = new QAction(i18n("Refresh Cache"), this); -+ connect(action, SIGNAL(triggered()), SIGNAL(refreshCache())); -+ connect(action, SIGNAL(triggered()), ui->messageWidget, SLOT(animatedHide())); -+ ui->messageWidget->addAction(action); -+ ui->messageWidget->setText(i18n("A repository was changed, it's highly recommended to refresh the cache")); -+ ui->messageWidget->hide(); -+ - if (!(m_roles & Transaction::RoleRefreshCache)) { - ui->intervalL->setEnabled(false); - ui->intervalCB->setEnabled(false); -@@ -62,6 +69,8 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) : - m_originModel = new OriginModel(this); - connect(m_originModel, SIGNAL(refreshRepoList()), - SLOT(refreshRepoModel())); -+ connect(m_originModel, SIGNAL(refreshRepoList()), -+ ui->messageWidget, SLOT(animatedShow())); - QSortFilterProxyModel *proxy = new QSortFilterProxyModel(this); - proxy->setDynamicSortFilter(true); - proxy->setSourceModel(m_originModel); -diff --git a/ApperKCM/Settings/Settings.h b/ApperKCM/Settings/Settings.h -index f73d91d..29d48ae 100644 ---- a/ApperKCM/Settings/Settings.h -+++ b/ApperKCM/Settings/Settings.h -@@ -51,6 +51,7 @@ public slots: - - signals: - void changed(bool state); -+ void refreshCache(); - - private slots: - void refreshRepoModel(); -diff --git a/ApperKCM/Settings/Settings.ui b/ApperKCM/Settings/Settings.ui -index 9ba5837..b4bfd80 100644 ---- a/ApperKCM/Settings/Settings.ui -+++ b/ApperKCM/Settings/Settings.ui -@@ -15,18 +15,21 @@ - - - -- 1 -+ 0 - - - 0 - -- -+ - - - 0 - - - -+ -+ 0 -+ - - - -@@ -199,6 +202,9 @@ - - - -+ -+ 0 -+ - - - -@@ -252,6 +258,9 @@ - - - -+ -+ -+ - - - -@@ -260,6 +269,12 @@ - QComboBox -
kcombobox.h
- -+ -+ KMessageWidget -+ QWidget -+
KMessageWidget
-+ 1 -+ - - - --- -1.8.1.2 - diff --git a/0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch b/0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch deleted file mode 100644 index 3a8b38f..0000000 --- a/0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b5c0a25134109cf258f6afd37696940cebe6338b Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Fri, 18 Jan 2013 01:37:52 -0200 -Subject: [PATCH 19/30] Connect to finished signal of ApplicationLaunch in - order to finish the transaction when the user presses ESC Show applications - installed for selected packages on an install - ---- - libapper/PkTransaction.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp -index 1f6b4c0..6370468 100644 ---- a/libapper/PkTransaction.cpp -+++ b/libapper/PkTransaction.cpp -@@ -515,7 +515,12 @@ void PkTransaction::slotFinished(Transaction::Exit status) - foreach (const QString &packageID, d->packages) { - d->simulateModel->removePackage(packageID); - } -+ - d->newPackages = d->simulateModel->packagesWithInfo(Transaction::InfoInstalling); -+ if (_role == Transaction::RoleInstallPackages) { -+ d->newPackages << d->packages; -+ d->newPackages.removeDuplicates(); -+ } - - requires = new Requirements(d->simulateModel, d->parentWindow); - requires->setDownloadSizeRemaining(d->downloadSizeRemaining); -@@ -562,8 +567,7 @@ void PkTransaction::slotFinished(Transaction::Exit status) - // if we have a launcher and the laucher has applications - // show them to the user - showDialog(d->launcher); -- connect(d->launcher, SIGNAL(accepted()), -- this, SLOT(setExitStatus())); -+ connect(d->launcher, SIGNAL(finished()), SLOT(setExitStatus())); - return; - } - setExitStatus(Success); --- -1.8.1.2 - diff --git a/0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch b/0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch deleted file mode 100644 index 3d6ad31..0000000 --- a/0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 784f6d1b31a95a995ebe6b18fb06549ebf627ac5 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Fri, 18 Jan 2013 01:39:49 -0200 -Subject: [PATCH 20/30] Allow PackageDetails to show screenshots from - software.openSUSE.org too - ---- - ApperKCM/PackageDetails.cpp | 44 ++++++++++++++++++++++---------------- - ApperKCM/PackageDetails.h | 2 ++ - ApperKCM/Updater/DistroUpgrade.cpp | 9 ++++---- - CMakeLists.txt | 9 +++++++- - config.h.cmake | 3 +++ - 5 files changed, 43 insertions(+), 24 deletions(-) - -diff --git a/ApperKCM/PackageDetails.cpp b/ApperKCM/PackageDetails.cpp -index 30763f6..8b06944 100644 ---- a/ApperKCM/PackageDetails.cpp -+++ b/ApperKCM/PackageDetails.cpp -@@ -269,11 +269,9 @@ void PackageDetails::setPackage(const QModelIndex &index) - m_currentIcon = PkIcons::getIcon(pkgIconPath, QString()).pixmap(64, 64); - m_appName = index.data(PackageModel::NameRole).toString(); - --#ifdef HAVE_APPSTREAM -- m_currentScreenshot = AppStreamDb::instance()->thumbnail(Transaction::packageName(m_packageID)); -+ m_currentScreenshot = thumbnail(Transaction::packageName(m_packageID)); - kDebug() << "current screenshot" << m_currentScreenshot; --#endif -- if (!m_currentScreenshot.isEmpty()) { -+ if (!m_currentScreenshot.isNull()) { - if (m_screenshotPath.contains(m_currentScreenshot)) { - display(); - } else { -@@ -297,21 +295,13 @@ void PackageDetails::setPackage(const QModelIndex &index) - - void PackageDetails::on_screenshotL_clicked() - { -- kDebug(); --#ifndef HAVE_APPSTREAM -- return; --#else -- QString screenshot; -- -- screenshot = AppStreamDb::instance()->screenshot(Transaction::packageName(m_packageID)); -- if (screenshot.isEmpty()) { -- return; -+ QString url; -+ url = screenshot(Transaction::packageName(m_packageID)); -+ if (!url.isNull()) { -+ ScreenShotViewer *view = new ScreenShotViewer(url); -+ view->setWindowTitle(m_appName); -+ view->show(); - } -- -- ScreenShotViewer *view = new ScreenShotViewer(screenshot); -- view->setWindowTitle(m_appName); -- view->show(); --#endif - } - - void PackageDetails::hidePackageVersion(bool hide) -@@ -717,6 +707,24 @@ QVector > PackageDetails::locateApplication(const QStrin - return ret; - } - -+QString PackageDetails::thumbnail(const QString &pkgName) const -+{ -+ if (QLatin1String(SCREENSHOT_PROVIDER) == QLatin1String("openSUSE")) { -+ return QLatin1String("http://software.opensuse.org/package/thumbnail/") % pkgName % QLatin1String(".png");; -+ } else { -+ return QLatin1String("http://screenshots.debian.net/thumbnail/") % pkgName; -+ } -+} -+ -+QString PackageDetails::screenshot(const QString &pkgName) const -+{ -+ if (QLatin1String(SCREENSHOT_PROVIDER) == QLatin1String("openSUSE")) { -+ return QLatin1String("http://software.opensuse.org/package/screenshot/") % pkgName % QLatin1String(".png"); -+ } else { -+ return QLatin1String("http://screenshots.debian.net/screenshot/") % pkgName; -+ } -+} -+ - void PackageDetails::description(const QString &packageID, - const QString &license, - PackageKit::Transaction::Group group, -diff --git a/ApperKCM/PackageDetails.h b/ApperKCM/PackageDetails.h -index 087c954..c7555c8 100644 ---- a/ApperKCM/PackageDetails.h -+++ b/ApperKCM/PackageDetails.h -@@ -81,6 +81,8 @@ private: - void fadeOut(FadeWidgets widgets); - void setupDescription(); - QVector > locateApplication(const QString &_relPath, const QString &menuId) const; -+ QString thumbnail(const QString &pkgName) const; -+ QString screenshot(const QString &pkgName) const; - - Ui::PackageDetails *ui; - QActionGroup *m_actionGroup; -diff --git a/ApperKCM/Updater/DistroUpgrade.cpp b/ApperKCM/Updater/DistroUpgrade.cpp -index 183204e..4987c03 100644 ---- a/ApperKCM/Updater/DistroUpgrade.cpp -+++ b/ApperKCM/Updater/DistroUpgrade.cpp -@@ -42,6 +42,10 @@ DistroUpgrade::DistroUpgrade(QWidget *parent) : - addAction(action); - } - -+DistroUpgrade::~DistroUpgrade() -+{ -+} -+ - void DistroUpgrade::setName(const QString &name) - { - setText(i18n("Distribution upgrade available: %1", name)); -@@ -111,9 +115,4 @@ void DistroUpgrade::distroUpgradeError(QProcess::ProcessError error) - } - } - --DistroUpgrade::~DistroUpgrade() --{ -- kDebug() << "~DistroUpgrade()"; --} -- - #include "DistroUpgrade.moc" -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5aca9ff..3215cea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,6 +33,13 @@ if (HAVE_APPSTREAM) - message(STATUS "AppStream categories path: " ${AS_CATEGORIES_PATH}) - endif (HAVE_APPSTREAM) - -+# command to edit the packages origins -+set(SCREENSHOT_PROVIDER "debian" CACHE STRING "Screen shots provider") -+if (SCREENSHOT_PROVIDER) -+ message(STATUS "Screen shots provider: " ${SCREENSHOT_PROVIDER}) -+ message(STATUS "Screen shots provider possibilities are: debian, openSUSE") -+endif (SCREENSHOT_PROVIDER) -+ - if (DEBCONF_SUPPORT) - # Tries to find the package, when it finds it HAVE_DEBCONFKDE is set in config.h - find_package(DebconfKDE REQUIRED) -@@ -41,7 +48,7 @@ if (DEBCONF_SUPPORT) - message(STATUS "Building with Debconf support") - endif (DEBCONF_SUPPORT) - --set(APP_VERSION 0.8.0) -+set(APP_VERSION 0.8.1) - - # command to edit the packages origins - set(EDIT_ORIGNS_DESKTOP_NAME "" CACHE STRING "Edit origins desktop name") -diff --git a/config.h.cmake b/config.h.cmake -index 4e3caba..176a30b 100644 ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -10,6 +10,9 @@ - // Define if AppStream data is available. - #cmakedefine HAVE_APPSTREAM - -+// Define if screenshot provider -+#cmakedefine SCREENSHOT_PROVIDER "@SCREENSHOT_PROVIDER@" -+ - // Define the AppStream categories path. - #cmakedefine AS_CATEGORIES_PATH "@AS_CATEGORIES_PATH@" - --- -1.8.1.2 - diff --git a/0021-Update-the-last-refresh-cache-time-from-the-update-c.patch b/0021-Update-the-last-refresh-cache-time-from-the-update-c.patch deleted file mode 100644 index 3642e9b..0000000 --- a/0021-Update-the-last-refresh-cache-time-from-the-update-c.patch +++ /dev/null @@ -1,83 +0,0 @@ -From b0c2b6d99bb08298ab5e15ddc5c1faa1a040c946 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Mon, 21 Jan 2013 10:38:21 -0200 -Subject: [PATCH 21/30] Update the last refresh cache time from the update - changed signal as it is always emitted after a refresh cache - ---- - apperd/ApperdThread.cpp | 28 ++++++++-------------------- - apperd/ApperdThread.h | 1 - - 2 files changed, 8 insertions(+), 21 deletions(-) - -diff --git a/apperd/ApperdThread.cpp b/apperd/ApperdThread.cpp -index fd62bcf..fcbe2bf 100644 ---- a/apperd/ApperdThread.cpp -+++ b/apperd/ApperdThread.cpp -@@ -101,13 +101,8 @@ void ApperdThread::init() - QString locale(KGlobal::locale()->language() % QLatin1Char('.') % KGlobal::locale()->encoding()); - Daemon::global()->setHints(QLatin1String("locale=") % locale); - -- // Watch for TransactionListChanged so we start sentinel -- connect(Daemon::global(), SIGNAL(transactionListChanged(QStringList)), -- this, SLOT(transactionListChanged(QStringList))); -- -- // Watch for UpdatesChanged so we display new updates - connect(Daemon::global(), SIGNAL(updatesChanged()), -- this, SLOT(updatesChanged())); -+ SLOT(updatesChanged())); - - m_interface = new DBusInterface(this); - -@@ -128,8 +123,7 @@ void ApperdThread::init() - QDBusConnection::systemBus(), - QDBusServiceWatcher::WatchForRegistration, - this); -- connect(watcher, SIGNAL(serviceRegistered(QString)), -- this, SLOT(setProxy())); -+ connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(setProxy())); - - // if PackageKit is running check to see if there are running transactons already - bool packagekitIsRunning = nameHasOwner(QLatin1String("org.freedesktop.PackageKit"), -@@ -251,21 +245,15 @@ void ApperdThread::setProxy() - } - } - --void ApperdThread::transactionListChanged(const QStringList &tids) -+void ApperdThread::updatesChanged() - { -- if (tids.isEmpty()) { -- // update the last time the cache was refreshed -- QDateTime lastCacheRefresh; -- lastCacheRefresh = getTimeSinceRefreshCache(); -- if (lastCacheRefresh != m_lastRefreshCache) { -- m_lastRefreshCache = lastCacheRefresh; -- } -+ // update the last time the cache was refreshed -+ QDateTime lastCacheRefresh; -+ lastCacheRefresh = getTimeSinceRefreshCache(); -+ if (lastCacheRefresh != m_lastRefreshCache) { -+ m_lastRefreshCache = lastCacheRefresh; - } --} - --// This is called when the list of updates changes --void ApperdThread::updatesChanged() --{ - bool ignoreBattery = m_configs[CFG_INSTALL_UP_BATTERY].value(); - bool ignoreMobile = m_configs[CFG_INSTALL_UP_MOBILE].value(); - -diff --git a/apperd/ApperdThread.h b/apperd/ApperdThread.h -index 384ba30..c911c98 100644 ---- a/apperd/ApperdThread.h -+++ b/apperd/ApperdThread.h -@@ -45,7 +45,6 @@ private slots: - void proxyChanged(); - void setProxy(); - -- void transactionListChanged(const QStringList &tids); - void updatesChanged(); - void appShouldConserveResourcesChanged(); - --- -1.8.1.2 - diff --git a/0022-Add-some-margins-to-the-plasmoid.patch b/0022-Add-some-margins-to-the-plasmoid.patch deleted file mode 100644 index 775800c..0000000 --- a/0022-Add-some-margins-to-the-plasmoid.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 63362fc7aaeb54bae16b1aa0919fd77ea46a125b Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Tue, 22 Jan 2013 10:17:19 -0200 -Subject: [PATCH 22/30] Add some margins to the plasmoid - ---- - plasmoid/package/contents/ui/main.qml | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml -index 89bcef9..7c6159d 100644 ---- a/plasmoid/package/contents/ui/main.qml -+++ b/plasmoid/package/contents/ui/main.qml -@@ -127,6 +127,7 @@ FocusScope { - id: busyView - opacity: 0 - anchors.fill: parent -+ anchors.margins: 4 - state: "BUSY" - } - -@@ -138,7 +139,7 @@ FocusScope { - anchors.margins: 4 - StatusView { - id: statusView -- height: parent.height - refreshBT.height - parent.anchors.margins -+ height: parent.height - refreshBT.height - parent.anchors.margins - parent.spacing - width: parent.width - } - PlasmaComponents.Button { -@@ -154,6 +155,7 @@ FocusScope { - id: updatesView - opacity: 0 - anchors.fill: parent -+ anchors.margins: 4 - onUpdateClicked: installUpdates() - } - -@@ -161,6 +163,7 @@ FocusScope { - id: transactionView - opacity: 0 - anchors.fill: parent -+ anchors.margins: 4 - onFinished: { - if (success) { - if (root.state !== "BUSY") { --- -1.8.1.2 - diff --git a/apper.spec b/apper.spec index 02d26ff..847f816 100644 --- a/apper.spec +++ b/apper.spec @@ -1,18 +1,18 @@ -%define pk_min_version 0.8.6 +%define pk_min_version 0.8.8 ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -#define snap 20121231 +%define snap 20130511 Name: apper -Version: 0.8.0 -Release: 5%{?dist} +Version: 0.8.1 +Release: 0.1.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rc --version 0.8.0 +# use releaseme/apper.rc --version 0.8.1 Source0: apper-%{version}-%{snap}.tar.bz2 %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 @@ -23,29 +23,10 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-apper-updater.js ## upstream patches -%define git_patches 1 +#define git_patches 1 %if 0%{?git_patches} BuildRequires: git-core %endif -Patch101: 0001-Fixed-bug-when-using-double-click-on-the-desktop-BUG.patch -Patch102: 0002-Don-t-tell-apperd-to-watch-a-transaction-when-it-s-j.patch -Patch103: 0003-Reduce-the-CPU-usage-by-not-setting-an-initial-state.patch -Patch104: 0004-Adds-a-Help-menu-to-Apper-BUG-293440.patch -Patch105: 0005-Fix-a-connection-caused-by-a-fix-for-BUG-302786.patch -Patch106: 0006-Fixes-package-installation-of-files-in-non-latin-pat.patch -Patch107: 0007-Make-hide-button-more-clear-BUG-263309.patch -Patch108: 0008-Fix-about-application-icon.patch -Patch109: 0009-Fix-About-Application-dialog-in-Apper-BUG-293440.patch -Patch110: 0010-Feature-show-application-status-in-window-title-BUG-.patch -Patch114: 0014-Fix-browsing-groups.patch -Patch115: 0015-Change-the-way-we-toggle-repos-so-that-we-can-report.patch -Patch116: 0016-Show-how-much-download-is-left-and-use-QPointers-ins.patch -Patch117: 0017-Fix-bug-that-after-a-refresh-cache-made-the-package-.patch -Patch118: 0018-Add-a-feature-to-tell-the-user-to-refresh-his-cache-.patch -Patch119: 0019-Connect-to-finished-signal-of-ApplicationLaunch-in-o.patch -Patch120: 0020-Allow-PackageDetails-to-show-screenshots-from-softwa.patch -Patch121: 0021-Update-the-last-refresh-cache-time-from-the-update-c.patch -Patch122: 0022-Add-some-margins-to-the-plasmoid.patch # hack around https://bugzilla.redhat.com/948099 Patch200: 0100-pk-cache-update-debugging.patch @@ -90,6 +71,8 @@ git commit -a -q -m "%{version} baseline." # Apply all the patches git am -p1 %{patches} < /dev/null +%else +%patch200 -p1 -b .pk_cache_update %endif @@ -168,6 +151,9 @@ fi %changelog +* Sat May 11 2013 Rex Dieter 0.8.1-0.1.20130511 +- 0.8.1 201305011 snapshot + * Mon Apr 29 2013 Rex Dieter 0.8.0-5 - respin previous patch to use kDebug instead diff --git a/sources b/sources index 3f05623..a4244f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5838b449268e27d688a8c9bc2a8b31fc apper-0.8.0.tar.bz2 +639f91aac4e008089da17e54bf826cfb apper-0.8.1-20130511.tar.bz2 From 9adca5b79d3761d69d54476abdfebd414f706049 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 13 May 2013 11:53:39 -0500 Subject: [PATCH 037/111] don't run apper applet on live image (#948099) --- 01-fedora-apper-updater.js | 4 ++++ apper.spec | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/01-fedora-apper-updater.js b/01-fedora-apper-updater.js index c9afb36..d12916e 100644 --- a/01-fedora-apper-updater.js +++ b/01-fedora-apper-updater.js @@ -21,6 +21,8 @@ Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later */ +if (userDataPath() != "/home/liveuser") { + systrayFound = false; pids = panelIds; for (i = 0; i < pids.length; ++i) { @@ -45,3 +47,5 @@ for (i = 0; i < pids.length; ++i) { } if (!systrayFound) print("No systray found"); + +} diff --git a/apper.spec b/apper.spec index 847f816..1c2f9a8 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.1 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -151,6 +151,9 @@ fi %changelog +* Mon May 13 2013 Rex Dieter 0.8.1-0.2.20130511 +- don't run apper applet on live image (#948099) + * Sat May 11 2013 Rex Dieter 0.8.1-0.1.20130511 - 0.8.1 201305011 snapshot From 8642df35b4ed4d2256e83aa5f60c19f7b5e0e16f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 13 May 2013 11:58:01 -0500 Subject: [PATCH 038/111] fix changelog --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 1c2f9a8..d02b260 100644 --- a/apper.spec +++ b/apper.spec @@ -311,7 +311,7 @@ fi * Tue Sep 21 2010 Lukas Tinkl - 0.6.1-2 - fix wrong i18n() usage in a patch resulting in broken translations -* Wed Sep 07 2010 Steven M. Parrish - 0.6.1-1 +* Tue Sep 07 2010 Steven M. Parrish - 0.6.1-1 - New upstream release * Fri Mar 26 2010 Kevin Kofler - 0.6.0-2 From 8f7f6b3ce663fc7ac1187e58cab36953c2433edc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 13 May 2013 12:03:58 -0500 Subject: [PATCH 039/111] don't run apper applet on live image (#948099) --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 02d26ff..9003203 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -168,6 +168,9 @@ fi %changelog +* Mon May 13 2013 Rex Dieter 0.8.0-6 +- don't run apper applet on live image (#948099) + * Mon Apr 29 2013 Rex Dieter 0.8.0-5 - respin previous patch to use kDebug instead From 92e256d146521c624059a1da43fccb2539f6e960 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 20 May 2013 12:12:49 -0500 Subject: [PATCH 040/111] test kded crasher fix (kde#319967) --- apper-0.8.1-kdebug319967.patch | 23 +++++++++++++++++++++++ apper.spec | 8 +++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 apper-0.8.1-kdebug319967.patch diff --git a/apper-0.8.1-kdebug319967.patch b/apper-0.8.1-kdebug319967.patch new file mode 100644 index 0000000..b99f3ad --- /dev/null +++ b/apper-0.8.1-kdebug319967.patch @@ -0,0 +1,23 @@ +diff -up apper-0.8.1/apperd/TransactionWatcher.cpp.kded_crash apper-0.8.1/apperd/TransactionWatcher.cpp +--- apper-0.8.1/apperd/TransactionWatcher.cpp.kded_crash 2013-05-11 10:33:29.000000000 -0500 ++++ apper-0.8.1/apperd/TransactionWatcher.cpp 2013-05-20 11:43:23.333536241 -0500 +@@ -76,19 +76,6 @@ void TransactionWatcher::transactionList + watchTransaction(QDBusObjectPath(tid), false); + } + } else { +- // There is no current transaction, delete the jobs +- foreach (TransactionJob *job, m_transactionJob) { +- job->transactionDestroyed(); +- job->deleteLater(); +- } +- +- // Avoid leaks delete the jobs +- foreach (Transaction *transaction, m_transactions) { +- transaction->deleteLater(); +- } +- m_transactions.clear(); +- m_transactionJob.clear(); +- + // release any cookie that we might have + suppressSleep(false, m_inhibitCookie); + } diff --git a/apper.spec b/apper.spec index d02b260..44ab782 100644 --- a/apper.spec +++ b/apper.spec @@ -7,7 +7,7 @@ Name: apper Version: 0.8.1 -Release: 0.2.%{snap}%{?dist} +Release: 0.3.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -23,6 +23,8 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-apper-updater.js ## upstream patches +# testing fix for http://bugs.kde.org/319967 +Patch100: apper-0.8.1-kdebug319967.patch #define git_patches 1 %if 0%{?git_patches} BuildRequires: git-core @@ -72,6 +74,7 @@ git commit -a -q -m "%{version} baseline." # Apply all the patches git am -p1 %{patches} < /dev/null %else +%patch100 -p1 -b .kde3199367 %patch200 -p1 -b .pk_cache_update %endif @@ -151,6 +154,9 @@ fi %changelog +* Mon May 20 2013 Rex Dieter 0.8.1-0.3.20130511 +- test kded crasher fix (kde#319967) + * Mon May 13 2013 Rex Dieter 0.8.1-0.2.20130511 - don't run apper applet on live image (#948099) From 3a23a5710133028198bdf9ffb20ad883132304c7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Jun 2013 12:59:41 -0500 Subject: [PATCH 041/111] 0.8.1 20130624 snapshot --- .gitignore | 2 +- ....js => 01-fedora-org.packagekit.updater.js | 2 +- apper-0.8.1-kdebug319967.patch | 23 -------------- apper.spec | 30 +++++++++---------- sources | 2 +- 5 files changed, 18 insertions(+), 41 deletions(-) rename 01-fedora-apper-updater.js => 01-fedora-org.packagekit.updater.js (96%) delete mode 100644 apper-0.8.1-kdebug319967.patch diff --git a/.gitignore b/.gitignore index 252d665..678b4e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /apper-0.7.2.tar.bz2 -/apper-0.8.0.tar.bz2 /apper-0.8.1-20130511.tar.bz2 +/apper-0.8.1-20130624.tar.bz2 diff --git a/01-fedora-apper-updater.js b/01-fedora-org.packagekit.updater.js similarity index 96% rename from 01-fedora-apper-updater.js rename to 01-fedora-org.packagekit.updater.js index d12916e..8f201aa 100644 --- a/01-fedora-apper-updater.js +++ b/01-fedora-org.packagekit.updater.js @@ -39,7 +39,7 @@ for (i = 0; i < pids.length; ++i) { if (parseInt(w.configGroups[k]) > max) max = parseInt(w.configGroups[k]); w.currentConfigGroup = new Array("Applets", max + 1); - w.writeConfig("plugin", "updater"); + w.writeConfig("plugin", "org.packagekit.updater"); print("Apper updater plasmoid added to the systray"); break; } diff --git a/apper-0.8.1-kdebug319967.patch b/apper-0.8.1-kdebug319967.patch deleted file mode 100644 index b99f3ad..0000000 --- a/apper-0.8.1-kdebug319967.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up apper-0.8.1/apperd/TransactionWatcher.cpp.kded_crash apper-0.8.1/apperd/TransactionWatcher.cpp ---- apper-0.8.1/apperd/TransactionWatcher.cpp.kded_crash 2013-05-11 10:33:29.000000000 -0500 -+++ apper-0.8.1/apperd/TransactionWatcher.cpp 2013-05-20 11:43:23.333536241 -0500 -@@ -76,19 +76,6 @@ void TransactionWatcher::transactionList - watchTransaction(QDBusObjectPath(tid), false); - } - } else { -- // There is no current transaction, delete the jobs -- foreach (TransactionJob *job, m_transactionJob) { -- job->transactionDestroyed(); -- job->deleteLater(); -- } -- -- // Avoid leaks delete the jobs -- foreach (Transaction *transaction, m_transactions) { -- transaction->deleteLater(); -- } -- m_transactions.clear(); -- m_transactionJob.clear(); -- - // release any cookie that we might have - suppressSleep(false, m_inhibitCookie); - } diff --git a/apper.spec b/apper.spec index 44ab782..d2fcd97 100644 --- a/apper.spec +++ b/apper.spec @@ -3,11 +3,11 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20130511 +%define snap 20130624 Name: apper Version: 0.8.1 -Release: 0.3.%{snap}%{?dist} +Release: 0.4.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -19,12 +19,10 @@ Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.ta %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 -# plasma js to enable apper updater -Source10: 01-fedora-apper-updater.js +# plasma js to enable apper plasma applet +Source10: 01-fedora-org.packagekit.updater.js ## upstream patches -# testing fix for http://bugs.kde.org/319967 -Patch100: apper-0.8.1-kdebug319967.patch #define git_patches 1 %if 0%{?git_patches} BuildRequires: git-core @@ -74,7 +72,6 @@ git commit -a -q -m "%{version} baseline." # Apply all the patches git am -p1 %{patches} < /dev/null %else -%patch100 -p1 -b .kde3199367 %patch200 -p1 -b .pk_cache_update %endif @@ -106,10 +103,10 @@ chrpath --list %{buildroot}%{_kde4_bindir}/apper chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper # show apper updater systray applet by default -install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-apper-updater.js +install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js mkdir -p %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/ -ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-apper-updater.js\ - %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-apper-updater.js +ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js \ + %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js %check @@ -146,14 +143,17 @@ fi %endif %{_mandir}/man1/apper.1* # plasma-applet-updater -%{_kde4_libdir}/kde4/plasma_applet_updater.so -%{_kde4_appsdir}/plasma/packages/org.packagekit.updater/ -%{_kde4_datadir}/kde4/services/plasma-applet-updater.desktop -%{_kde4_appsdir}/plasma-desktop/init/01-fedora-apper-updater.js -%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-apper-updater.js +%{_kde4_appsdir}/plasma/plasmoids/org.packagekit.updater/ +%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js +%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js +%{_kde4_datadir}/kde4/services/plasma-applet-org.packagekit.updater.desktop +%{_kde4_libdir}/kde4/imports/org/kde/apper/ %changelog +* Mon Jun 24 2013 Rex Dieter 0.8.1-0.4.20130624 +- 0.8.1 20130624 snapshot + * Mon May 20 2013 Rex Dieter 0.8.1-0.3.20130511 - test kded crasher fix (kde#319967) diff --git a/sources b/sources index a4244f8..c97f4c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -639f91aac4e008089da17e54bf826cfb apper-0.8.1-20130511.tar.bz2 +7b5d75c61913a513b119ce2c8ddd7d50 apper-0.8.1-20130624.tar.bz2 From 2d5ce8b2b03ff061c78c52530ef08a831fbf6839 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 30 Jul 2013 07:59:07 -0500 Subject: [PATCH 042/111] 0.8.1 (final) --- .gitignore | 2 +- apper.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 678b4e5..899e305 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /apper-0.7.2.tar.bz2 -/apper-0.8.1-20130511.tar.bz2 /apper-0.8.1-20130624.tar.bz2 +/apper-0.8.1.tar.bz2 diff --git a/apper.spec b/apper.spec index d2fcd97..40b6a47 100644 --- a/apper.spec +++ b/apper.spec @@ -3,11 +3,9 @@ ## include app-install support and/or for testing/customizing categories.xml #define app_install 1 -%define snap 20130624 - Name: apper Version: 0.8.1 -Release: 0.4.%{snap}%{?dist} +Release: 1%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -15,7 +13,7 @@ License: GPLv2+ # use releaseme/apper.rc --version 0.8.1 Source0: apper-%{version}-%{snap}.tar.bz2 %else -Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.bz2 %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 @@ -151,6 +149,9 @@ fi %changelog +* Tue Jul 30 2013 Rex Dieter 0.8.1-1 +- 0.8.1 (final) + * Mon Jun 24 2013 Rex Dieter 0.8.1-0.4.20130624 - 0.8.1 20130624 snapshot diff --git a/sources b/sources index c97f4c4..07db0ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b5d75c61913a513b119ce2c8ddd7d50 apper-0.8.1-20130624.tar.bz2 +53dc89d5a2e95c3382c3f223a2ac8b17 apper-0.8.1.tar.bz2 From 645648e8c68a4cd903ed03bddc78be91a8b13eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Mon, 26 Aug 2013 16:07:09 +0200 Subject: [PATCH 043/111] fix translations in the updater applet --- apper-updater-l10n.patch | 21 +++++++++++++++++++++ apper.spec | 9 +++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 apper-updater-l10n.patch diff --git a/apper-updater-l10n.patch b/apper-updater-l10n.patch new file mode 100644 index 0000000..3eb96b4 --- /dev/null +++ b/apper-updater-l10n.patch @@ -0,0 +1,21 @@ +commit 5abe135b5907ab10ed52be0046a3de0d52d98f22 +Author: Lukáš Tinkl +Date: Fri Aug 23 19:35:56 2013 +0200 + + load the main apper catalog for the applet + + for a 3rd time, make this thing show up translated... + +diff --git a/declarative-plugins/qmlplugins.cpp b/declarative-plugins/qmlplugins.cpp +index 9deb29f..b39b3d2 100644 +--- a/declarative-plugins/qmlplugins.cpp ++++ b/declarative-plugins/qmlplugins.cpp +@@ -35,6 +35,8 @@ + #include + #include + ++static const KCatalogLoader loader(QLatin1String("apper")); ++ + void QmlPlugins::registerTypes(const char* uri) + { + Q_ASSERT(uri == QLatin1String("org.kde.apper")); diff --git a/apper.spec b/apper.spec index 40b6a47..5156688 100644 --- a/apper.spec +++ b/apper.spec @@ -5,7 +5,7 @@ Name: apper Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -27,6 +27,8 @@ BuildRequires: git-core %endif # hack around https://bugzilla.redhat.com/948099 Patch200: 0100-pk-cache-update-debugging.patch +# fix translations in the updater applet +Patch201: apper-updater-l10n.patch Obsoletes: kpackagekit < 0.7.0 @@ -72,7 +74,7 @@ git am -p1 %{patches} < /dev/null %else %patch200 -p1 -b .pk_cache_update %endif - +%patch201 -p1 -b .applet-l10n %build mkdir -p %{_target_platform} @@ -149,6 +151,9 @@ fi %changelog +* Mon Aug 26 2013 Lukáš Tinkl 0.8.1-2 +- fix translations in the updater applet + * Tue Jul 30 2013 Rex Dieter 0.8.1-1 - 0.8.1 (final) From 8a57215b462f20aace328ba1f5d430cf514d6f68 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 3 Nov 2013 19:01:28 -0600 Subject: [PATCH 044/111] 0.8.1-3 - pull in some upstream fixes - get ready to enable appstream support (#1026118) --- ...db-loading-into-exra-function-and-ad.patch | 102 ++++++++++++++++++ ...he-main-apper-catalog-for-the-applet.patch | 17 +-- ...ccepting-multiple-license-agreements.patch | 36 +++++++ apper.spec | 30 ++++-- 4 files changed, 173 insertions(+), 12 deletions(-) create mode 100644 0001-appstream-Split-db-loading-into-exra-function-and-ad.patch rename apper-updater-l10n.patch => 0004-load-the-main-apper-catalog-for-the-applet.patch (53%) create mode 100644 0006-Fix-accepting-multiple-license-agreements.patch diff --git a/0001-appstream-Split-db-loading-into-exra-function-and-ad.patch b/0001-appstream-Split-db-loading-into-exra-function-and-ad.patch new file mode 100644 index 0000000..fdd086c --- /dev/null +++ b/0001-appstream-Split-db-loading-into-exra-function-and-ad.patch @@ -0,0 +1,102 @@ +From 77dbdd1285624dc76636124b22140897dcd34914 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Tue, 30 Jul 2013 01:25:08 +0200 +Subject: [PATCH 1/6] appstream: Split db loading into exra function and add + additional return check + +--- + libapper/AppStream.cpp | 40 ++++++++++++++++++++++++++-------------- + libapper/AppStream.h | 1 + + 2 files changed, 27 insertions(+), 14 deletions(-) + +diff --git a/libapper/AppStream.cpp b/libapper/AppStream.cpp +index 9786ccf..23a810f 100644 +--- a/libapper/AppStream.cpp ++++ b/libapper/AppStream.cpp +@@ -37,8 +37,10 @@ AppStream* AppStream::m_instance = 0; + + AppStream* AppStream::instance() + { +- if(!m_instance) ++ if(!m_instance) { + m_instance = new AppStream(qApp); ++ m_instance->open(); ++ } + + return m_instance; + } +@@ -47,21 +49,36 @@ AppStream::AppStream(QObject *parent) + : QObject(parent) + { + #ifdef HAVE_APPSTREAM +- bool ret; +- + // create new AppStream database and screenshot service + m_asDB = appstream_database_new(); + m_asScreenshots = appstream_screenshot_service_new(); ++#endif //HAVE_APPSTREAM ++} ++ ++AppStream::~AppStream() ++{ ++#ifdef HAVE_APPSTREAM ++ g_object_unref(m_asDB); ++ g_object_unref(m_asScreenshots); ++#endif ++} + +- ret = appstream_database_open(m_asDB); ++bool AppStream::open() ++{ ++#ifdef HAVE_APPSTREAM ++ bool ret = appstream_database_open(m_asDB); + if (!ret) { + qWarning("Unable to open AppStream Xapian database!"); +- return; ++ return false; + } + + // cache application data (we might use the db directly, later (making use of AppstreamSearchQuery)) +- GPtrArray *appArray = NULL; ++ GPtrArray *appArray; + appArray = appstream_database_get_all_applications(m_asDB); ++ if (appArray == NULL) { ++ qWarning("AppStream application array way NULL! (This should never happen)"); ++ return false; ++ } + + for (uint i = 0; i < appArray->len; i++) { + AppstreamAppInfo *appInfo; +@@ -98,14 +115,9 @@ AppStream::AppStream(QObject *parent) + } + g_ptr_array_unref(appArray); + +-#endif //HAVE_APPSTREAM +-} +- +-AppStream::~AppStream() +-{ +-#ifdef HAVE_APPSTREAM +- g_object_unref(m_asDB); +- g_object_unref(m_asScreenshots); ++ return true; ++#else ++ return false; + #endif + } + +diff --git a/libapper/AppStream.h b/libapper/AppStream.h +index c288543..a3e139c 100644 +--- a/libapper/AppStream.h ++++ b/libapper/AppStream.h +@@ -46,6 +46,7 @@ class KDE_EXPORT AppStream : public QObject { + }; + static AppStream* instance(); + virtual ~AppStream(); ++ bool open(); + + QList applications(const QString &pkgName) const; + QString genericIcon(const QString &pkgName) const; +-- +1.8.4.2 + diff --git a/apper-updater-l10n.patch b/0004-load-the-main-apper-catalog-for-the-applet.patch similarity index 53% rename from apper-updater-l10n.patch rename to 0004-load-the-main-apper-catalog-for-the-applet.patch index 3eb96b4..b132934 100644 --- a/apper-updater-l10n.patch +++ b/0004-load-the-main-apper-catalog-for-the-applet.patch @@ -1,10 +1,12 @@ -commit 5abe135b5907ab10ed52be0046a3de0d52d98f22 -Author: Lukáš Tinkl -Date: Fri Aug 23 19:35:56 2013 +0200 +From 5abe135b5907ab10ed52be0046a3de0d52d98f22 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= +Date: Fri, 23 Aug 2013 19:35:56 +0200 +Subject: [PATCH 4/6] load the main apper catalog for the applet - load the main apper catalog for the applet - - for a 3rd time, make this thing show up translated... +for a 3rd time, make this thing show up translated... +--- + declarative-plugins/qmlplugins.cpp | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/declarative-plugins/qmlplugins.cpp b/declarative-plugins/qmlplugins.cpp index 9deb29f..b39b3d2 100644 @@ -19,3 +21,6 @@ index 9deb29f..b39b3d2 100644 void QmlPlugins::registerTypes(const char* uri) { Q_ASSERT(uri == QLatin1String("org.kde.apper")); +-- +1.8.4.2 + diff --git a/0006-Fix-accepting-multiple-license-agreements.patch b/0006-Fix-accepting-multiple-license-agreements.patch new file mode 100644 index 0000000..187ce5d --- /dev/null +++ b/0006-Fix-accepting-multiple-license-agreements.patch @@ -0,0 +1,36 @@ +From 91084eef8b999d04ef5b8cd6b140e2c4d8b942dd Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Sun, 27 Oct 2013 15:56:17 +0100 +Subject: [PATCH 6/6] Fix accepting multiple license agreements + +This patch fixes the handling of more than one license agreement by +setting d->handlingActionRequired = false in requeueTransaction(). + +Before, this was still true when entering slotEulaRequired() for the +second license. That one was not shown therefore, but Apper aborted +instead. + +BUG: 326619 +--- + libapper/PkTransaction.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp +index 436f35d..ef8826d 100644 +--- a/libapper/PkTransaction.cpp ++++ b/libapper/PkTransaction.cpp +@@ -305,6 +305,11 @@ void PkTransaction::requeueTransaction() + d->simulateModel = 0; + } + ++ // We are not handling any required action yet for the requeued transaction. ++ // Without this a second license agreement f.e. does not get shown, ++ // see http://bugs.kde.org/show_bug.cgi?id=326619 ++ d->handlingActionRequired = false; ++ + switch (d->originalRole) { + case Transaction::RoleRemovePackages: + removePackages(); +-- +1.8.4.2 + diff --git a/apper.spec b/apper.spec index 5156688..6496472 100644 --- a/apper.spec +++ b/apper.spec @@ -1,11 +1,14 @@ %define pk_min_version 0.8.8 ## include app-install support and/or for testing/customizing categories.xml -#define app_install 1 +#define appinstall 1 +#if 0%{?fedora} > 19 +#define appstream 1 +#endif Name: apper Version: 0.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -25,10 +28,12 @@ Source10: 01-fedora-org.packagekit.updater.js %if 0%{?git_patches} BuildRequires: git-core %endif +Patch0001: 0001-appstream-Split-db-loading-into-exra-function-and-ad.patch +Patch0004: 0004-load-the-main-apper-catalog-for-the-applet.patch +Patch0006: 0006-Fix-accepting-multiple-license-agreements.patch + # hack around https://bugzilla.redhat.com/948099 Patch200: 0100-pk-cache-update-debugging.patch -# fix translations in the updater applet -Patch201: apper-updater-l10n.patch Obsoletes: kpackagekit < 0.7.0 @@ -41,6 +46,11 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs4-devel BuildRequires: kde-workspace-devel +%if 0%{?appstream:1} +BuildRequires: pkgconfig(appstream) +## http://bugzilla.redhat.com/1026117 +#Requires: appstream-data +%endif BuildRequires: pkgconfig(dbus-1) %if 0%{?pk_version:1} BuildRequires: PackageKit-Qt-devel >= %{pk_version} @@ -72,15 +82,19 @@ git commit -a -q -m "%{version} baseline." # Apply all the patches git am -p1 %{patches} < /dev/null %else +%patch0001 -p1 -b .0001 +%patch0004 -p1 -b .0004 +%patch0006 -p1 -b .0006 %patch200 -p1 -b .pk_cache_update %endif -%patch201 -p1 -b .applet-l10n + %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ - %{?app_install:-DAPPINSTALL:BOOL=ON} \ + %{?appinstall:-DAPPINSTALL:BOOL=ON} \ + %{?appstream:-DAPPSTREAM:BOOL=ON} \ -DAUTOREMOVE:BOOL=OFF \ .. popd @@ -151,6 +165,10 @@ fi %changelog +* Sun Nov 03 2013 Rex Dieter - 0.8.1-3 +- pull in some upstream fixes +- get ready to enable appstream support (#1026118) + * Mon Aug 26 2013 Lukáš Tinkl 0.8.1-2 - fix translations in the updater applet From 923499489e251b8d7dc04e0a3940b422d3d89c11 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Nov 2013 12:52:05 -0600 Subject: [PATCH 045/111] enable appstream support (#1026118) --- apper.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apper.spec b/apper.spec index 6496472..b6644e8 100644 --- a/apper.spec +++ b/apper.spec @@ -2,13 +2,13 @@ ## include app-install support and/or for testing/customizing categories.xml #define appinstall 1 -#if 0%{?fedora} > 19 -#define appstream 1 -#endif +%if 0%{?fedora} > 19 +%define appstream 1 +%endif Name: apper Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -165,6 +165,9 @@ fi %changelog +* Fri Nov 08 2013 Rex Dieter 0.8.1-4 +- enable appstream support (#1026118) + * Sun Nov 03 2013 Rex Dieter - 0.8.1-3 - pull in some upstream fixes - get ready to enable appstream support (#1026118) From 92d66dcd13832b816bb2411ad9ade0d39c4b7795 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 19 Apr 2014 13:10:50 -0500 Subject: [PATCH 046/111] rebuild (PackageKit-Qt) --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index b6644e8..9d84427 100644 --- a/apper.spec +++ b/apper.spec @@ -8,7 +8,7 @@ Name: apper Version: 0.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -165,6 +165,9 @@ fi %changelog +* Sat Apr 19 2014 Rex Dieter 0.8.1-5 +- rebuild (PackageKit-Qt) + * Fri Nov 08 2013 Rex Dieter 0.8.1-4 - enable appstream support (#1026118) From 17ab60775e8357e20f6f13e266b8e0b92c1a597a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 22 Apr 2014 16:57:03 -0500 Subject: [PATCH 047/111] 0.8.3 20140422 snapshot compatible with PK-0.9 (#1089630) --- .gitignore | 5 +- ...db-loading-into-exra-function-and-ad.patch | 102 ------------------ ...he-main-apper-catalog-for-the-applet.patch | 26 ----- ...ccepting-multiple-license-agreements.patch | 36 ------- 0100-pk-cache-update-debugging.patch | 39 ------- apper.spec | 35 +++--- sources | 2 +- 7 files changed, 18 insertions(+), 227 deletions(-) delete mode 100644 0001-appstream-Split-db-loading-into-exra-function-and-ad.patch delete mode 100644 0004-load-the-main-apper-catalog-for-the-applet.patch delete mode 100644 0006-Fix-accepting-multiple-license-agreements.patch delete mode 100644 0100-pk-cache-update-debugging.patch diff --git a/.gitignore b/.gitignore index 899e305..03c504a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/apper-0.7.2.tar.bz2 -/apper-0.8.1-20130624.tar.bz2 -/apper-0.8.1.tar.bz2 +/apper-0.8.2.tar.bz2 +/apper-0.8.3-20140422.tar.xz diff --git a/0001-appstream-Split-db-loading-into-exra-function-and-ad.patch b/0001-appstream-Split-db-loading-into-exra-function-and-ad.patch deleted file mode 100644 index fdd086c..0000000 --- a/0001-appstream-Split-db-loading-into-exra-function-and-ad.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 77dbdd1285624dc76636124b22140897dcd34914 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Tue, 30 Jul 2013 01:25:08 +0200 -Subject: [PATCH 1/6] appstream: Split db loading into exra function and add - additional return check - ---- - libapper/AppStream.cpp | 40 ++++++++++++++++++++++++++-------------- - libapper/AppStream.h | 1 + - 2 files changed, 27 insertions(+), 14 deletions(-) - -diff --git a/libapper/AppStream.cpp b/libapper/AppStream.cpp -index 9786ccf..23a810f 100644 ---- a/libapper/AppStream.cpp -+++ b/libapper/AppStream.cpp -@@ -37,8 +37,10 @@ AppStream* AppStream::m_instance = 0; - - AppStream* AppStream::instance() - { -- if(!m_instance) -+ if(!m_instance) { - m_instance = new AppStream(qApp); -+ m_instance->open(); -+ } - - return m_instance; - } -@@ -47,21 +49,36 @@ AppStream::AppStream(QObject *parent) - : QObject(parent) - { - #ifdef HAVE_APPSTREAM -- bool ret; -- - // create new AppStream database and screenshot service - m_asDB = appstream_database_new(); - m_asScreenshots = appstream_screenshot_service_new(); -+#endif //HAVE_APPSTREAM -+} -+ -+AppStream::~AppStream() -+{ -+#ifdef HAVE_APPSTREAM -+ g_object_unref(m_asDB); -+ g_object_unref(m_asScreenshots); -+#endif -+} - -- ret = appstream_database_open(m_asDB); -+bool AppStream::open() -+{ -+#ifdef HAVE_APPSTREAM -+ bool ret = appstream_database_open(m_asDB); - if (!ret) { - qWarning("Unable to open AppStream Xapian database!"); -- return; -+ return false; - } - - // cache application data (we might use the db directly, later (making use of AppstreamSearchQuery)) -- GPtrArray *appArray = NULL; -+ GPtrArray *appArray; - appArray = appstream_database_get_all_applications(m_asDB); -+ if (appArray == NULL) { -+ qWarning("AppStream application array way NULL! (This should never happen)"); -+ return false; -+ } - - for (uint i = 0; i < appArray->len; i++) { - AppstreamAppInfo *appInfo; -@@ -98,14 +115,9 @@ AppStream::AppStream(QObject *parent) - } - g_ptr_array_unref(appArray); - --#endif //HAVE_APPSTREAM --} -- --AppStream::~AppStream() --{ --#ifdef HAVE_APPSTREAM -- g_object_unref(m_asDB); -- g_object_unref(m_asScreenshots); -+ return true; -+#else -+ return false; - #endif - } - -diff --git a/libapper/AppStream.h b/libapper/AppStream.h -index c288543..a3e139c 100644 ---- a/libapper/AppStream.h -+++ b/libapper/AppStream.h -@@ -46,6 +46,7 @@ class KDE_EXPORT AppStream : public QObject { - }; - static AppStream* instance(); - virtual ~AppStream(); -+ bool open(); - - QList applications(const QString &pkgName) const; - QString genericIcon(const QString &pkgName) const; --- -1.8.4.2 - diff --git a/0004-load-the-main-apper-catalog-for-the-applet.patch b/0004-load-the-main-apper-catalog-for-the-applet.patch deleted file mode 100644 index b132934..0000000 --- a/0004-load-the-main-apper-catalog-for-the-applet.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5abe135b5907ab10ed52be0046a3de0d52d98f22 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= -Date: Fri, 23 Aug 2013 19:35:56 +0200 -Subject: [PATCH 4/6] load the main apper catalog for the applet - -for a 3rd time, make this thing show up translated... ---- - declarative-plugins/qmlplugins.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/declarative-plugins/qmlplugins.cpp b/declarative-plugins/qmlplugins.cpp -index 9deb29f..b39b3d2 100644 ---- a/declarative-plugins/qmlplugins.cpp -+++ b/declarative-plugins/qmlplugins.cpp -@@ -35,6 +35,8 @@ - #include - #include - -+static const KCatalogLoader loader(QLatin1String("apper")); -+ - void QmlPlugins::registerTypes(const char* uri) - { - Q_ASSERT(uri == QLatin1String("org.kde.apper")); --- -1.8.4.2 - diff --git a/0006-Fix-accepting-multiple-license-agreements.patch b/0006-Fix-accepting-multiple-license-agreements.patch deleted file mode 100644 index 187ce5d..0000000 --- a/0006-Fix-accepting-multiple-license-agreements.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 91084eef8b999d04ef5b8cd6b140e2c4d8b942dd Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Sun, 27 Oct 2013 15:56:17 +0100 -Subject: [PATCH 6/6] Fix accepting multiple license agreements - -This patch fixes the handling of more than one license agreement by -setting d->handlingActionRequired = false in requeueTransaction(). - -Before, this was still true when entering slotEulaRequired() for the -second license. That one was not shown therefore, but Apper aborted -instead. - -BUG: 326619 ---- - libapper/PkTransaction.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp -index 436f35d..ef8826d 100644 ---- a/libapper/PkTransaction.cpp -+++ b/libapper/PkTransaction.cpp -@@ -305,6 +305,11 @@ void PkTransaction::requeueTransaction() - d->simulateModel = 0; - } - -+ // We are not handling any required action yet for the requeued transaction. -+ // Without this a second license agreement f.e. does not get shown, -+ // see http://bugs.kde.org/show_bug.cgi?id=326619 -+ d->handlingActionRequired = false; -+ - switch (d->originalRole) { - case Transaction::RoleRemovePackages: - removePackages(); --- -1.8.4.2 - diff --git a/0100-pk-cache-update-debugging.patch b/0100-pk-cache-update-debugging.patch deleted file mode 100644 index 1743090..0000000 --- a/0100-pk-cache-update-debugging.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 80ee30993a9b656b1fc23e9abec98f93deabf448 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 29 Apr 2013 08:43:42 -0500 -Subject: [PATCH] cache update debuging - ---- - apperd/ApperdThread.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/apperd/ApperdThread.cpp b/apperd/ApperdThread.cpp -index cce7d2d..cd49de8 100644 ---- a/apperd/ApperdThread.cpp -+++ b/apperd/ApperdThread.cpp -@@ -163,6 +163,9 @@ void ApperdThread::poll() - m_lastRefreshCache = getTimeSinceRefreshCache(); - } - -+ kDebug() << "CHECKING FOR UPDATES (poll)"; -+ kDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); -+ - // If check for updates is active - if (m_configs[CFG_INTERVAL].value() != Enum::Never) { - // Find out how many seconds passed since last refresh cache -@@ -254,6 +257,12 @@ void ApperdThread::setProxy() - - void ApperdThread::updatesChanged() - { -+ kDebug() << "UPDATES CHANGED"; -+ kDebug() << "interval:" << m_configs[CFG_INTERVAL].value(); -+ -+ if (m_configs[CFG_INTERVAL].value() == Enum::Never) -+ return; -+ - // update the last time the cache was refreshed - QDateTime lastCacheRefresh; - lastCacheRefresh = getTimeSinceRefreshCache(); --- -1.8.1.4 - diff --git a/apper.spec b/apper.spec index 9d84427..cdfca7e 100644 --- a/apper.spec +++ b/apper.spec @@ -1,4 +1,4 @@ -%define pk_min_version 0.8.8 +%define pk_min_version 0.9 ## include app-install support and/or for testing/customizing categories.xml #define appinstall 1 @@ -6,17 +6,19 @@ %define appstream 1 %endif +%define snap 20140422 + Name: apper -Version: 0.8.1 -Release: 5%{?dist} +Version: 0.8.3 +Release: 0.1.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rc --version 0.8.1 -Source0: apper-%{version}-%{snap}.tar.bz2 +# use releaseme/apper.rc --version 0.8.3 +Source0: apper-%{version}-%{snap}.tar.xz %else -Source0: http://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.xz %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 @@ -28,13 +30,6 @@ Source10: 01-fedora-org.packagekit.updater.js %if 0%{?git_patches} BuildRequires: git-core %endif -Patch0001: 0001-appstream-Split-db-loading-into-exra-function-and-ad.patch -Patch0004: 0004-load-the-main-apper-catalog-for-the-applet.patch -Patch0006: 0006-Fix-accepting-multiple-license-agreements.patch - -# hack around https://bugzilla.redhat.com/948099 -Patch200: 0100-pk-cache-update-debugging.patch - Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -55,8 +50,8 @@ BuildRequires: pkgconfig(dbus-1) %if 0%{?pk_version:1} BuildRequires: PackageKit-Qt-devel >= %{pk_version} %else -BuildRequires: pkgconfig(packagekit-qt2) >= %{pk_min_version} -%global pk_version %(pkg-config --modversion packagekit-qt2 2> /dev/null || echo %{pk_min_version}) +BuildRequires: pkgconfig(packagekitqt4) >= %{pk_min_version} +%global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo %{pk_min_version}) %endif %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} @@ -81,11 +76,6 @@ git commit -a -q -m "%{version} baseline." # Apply all the patches git am -p1 %{patches} < /dev/null -%else -%patch0001 -p1 -b .0001 -%patch0004 -p1 -b .0004 -%patch0006 -p1 -b .0006 -%patch200 -p1 -b .pk_cache_update %endif @@ -162,9 +152,14 @@ fi %{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js %{_kde4_datadir}/kde4/services/plasma-applet-org.packagekit.updater.desktop %{_kde4_libdir}/kde4/imports/org/kde/apper/ +# appdata +%{_datadir}/appdata/apper.appdata.xml %changelog +* Tue Apr 22 2014 Rex Dieter 0.8.3-0.1.20140422 +- 0.8.3 20140422 snapshot compatible with PK-0.9 (#1089630) + * Sat Apr 19 2014 Rex Dieter 0.8.1-5 - rebuild (PackageKit-Qt) diff --git a/sources b/sources index 07db0ea..a442ac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53dc89d5a2e95c3382c3f223a2ac8b17 apper-0.8.1.tar.bz2 +e40b595ac36400c97c1cae4ee7ffb270 apper-0.8.3-20140422.tar.xz From 87921fa321164c4d95ea4ac1c98f79e49c4252b6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 22 Apr 2014 18:47:38 -0500 Subject: [PATCH 048/111] disable appstream support FTBFS --- apper.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apper.spec b/apper.spec index cdfca7e..bf5e7f2 100644 --- a/apper.spec +++ b/apper.spec @@ -2,9 +2,8 @@ ## include app-install support and/or for testing/customizing categories.xml #define appinstall 1 -%if 0%{?fedora} > 19 -%define appstream 1 -%endif +## appstream support is busted :( -- rex +#define appstream 1 %define snap 20140422 From d4c60e794ed27b0fd0c5a0c6159253486a4bf7f1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 26 Apr 2014 16:26:13 -0500 Subject: [PATCH 049/111] 0.8.3 20140426 snapshot, fixed appstream support, sans translations (kde svn down) --- .gitignore | 1 + apper.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 03c504a..7f7355d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.8.2.tar.bz2 /apper-0.8.3-20140422.tar.xz +/apper-0.8.3-20140426.tar.xz diff --git a/apper.spec b/apper.spec index bf5e7f2..e7dc59c 100644 --- a/apper.spec +++ b/apper.spec @@ -2,14 +2,13 @@ ## include app-install support and/or for testing/customizing categories.xml #define appinstall 1 -## appstream support is busted :( -- rex -#define appstream 1 +%define appstream 1 -%define snap 20140422 +%define snap 20140426 Name: apper Version: 0.8.3 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -156,6 +155,9 @@ fi %changelog +* Sat Apr 26 2014 Rex Dieter 0.8.3-0.2.20140426 +- 0.8.3 20140426 snapshot, fixed appstream support, sans translations (kde svn down) + * Tue Apr 22 2014 Rex Dieter 0.8.3-0.1.20140422 - 0.8.3 20140422 snapshot compatible with PK-0.9 (#1089630) diff --git a/sources b/sources index a442ac0..52f529b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e40b595ac36400c97c1cae4ee7ffb270 apper-0.8.3-20140422.tar.xz +af1aac97982dab2003d7181a143922dd apper-0.8.3-20140426.tar.xz From 75a8213b24ce76cfe8974932522e593a01c3be1e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 26 Apr 2014 18:11:55 -0500 Subject: [PATCH 050/111] respin with translations --- apper.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apper.spec b/apper.spec index e7dc59c..9702b76 100644 --- a/apper.spec +++ b/apper.spec @@ -8,7 +8,7 @@ Name: apper Version: 0.8.3 -Release: 0.2.%{snap}%{?dist} +Release: 0.3.%{snap}%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -155,6 +155,9 @@ fi %changelog +* Sat Apr 26 2014 Rex Dieter 0.8.3-0.3.20140426 +- respin with translations + * Sat Apr 26 2014 Rex Dieter 0.8.3-0.2.20140426 - 0.8.3 20140426 snapshot, fixed appstream support, sans translations (kde svn down) diff --git a/sources b/sources index 52f529b..df8b417 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af1aac97982dab2003d7181a143922dd apper-0.8.3-20140426.tar.xz +69bfebd661d0e88fc1be5899cbf7329b apper-0.8.3-20140426.tar.xz From a80417c94b404db863125f9e4224ec1831af6fd6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 5 May 2014 14:24:04 -0500 Subject: [PATCH 051/111] apper-0.9.0 --- .gitignore | 1 + apper.spec | 32 ++++++++------------------------ sources | 2 +- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 7f7355d..b52b63b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /apper-0.8.2.tar.bz2 /apper-0.8.3-20140422.tar.xz /apper-0.8.3-20140426.tar.xz +/apper-0.9.0.tar.xz diff --git a/apper.spec b/apper.spec index 9702b76..420044c 100644 --- a/apper.spec +++ b/apper.spec @@ -1,22 +1,20 @@ -%define pk_min_version 0.9 +%define pk_min_version 0.9.2 ## include app-install support and/or for testing/customizing categories.xml #define appinstall 1 %define appstream 1 -%define snap 20140426 - Name: apper -Version: 0.8.3 -Release: 0.3.%{snap}%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rc --version 0.8.3 +# use releaseme/apper.rc Source0: apper-%{version}-%{snap}.tar.xz %else -Source0: http://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.xz +Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.xz %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 @@ -24,10 +22,6 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-org.packagekit.updater.js ## upstream patches -#define git_patches 1 -%if 0%{?git_patches} -BuildRequires: git-core -%endif Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -63,19 +57,6 @@ KDE interface for PackageKit. %prep %setup -q -%if 0%{?git_patches} -git init -if [ -z "$GIT_COMMITTER_NAME" ]; then -git config user.email "kde@lists.fedoraproject.org" -git config user.name "Fedora KDE SIG" -fi -git add . -git commit -a -q -m "%{version} baseline." - -# Apply all the patches -git am -p1 %{patches} < /dev/null -%endif - %build mkdir -p %{_target_platform} @@ -155,6 +136,9 @@ fi %changelog +* Mon May 05 2014 Rex Dieter 0.9.0-1 +- apper-0.9.0 + * Sat Apr 26 2014 Rex Dieter 0.8.3-0.3.20140426 - respin with translations diff --git a/sources b/sources index df8b417..8fece5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69bfebd661d0e88fc1be5899cbf7329b apper-0.8.3-20140426.tar.xz +6c4b565d430f06e4d8165d12d6601f3d apper-0.9.0.tar.xz From 3dcbdf60b30f8b62c5d2566856391e659dafc62c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 20:11:17 -0500 Subject: [PATCH 052/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 420044c..4aac902 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -136,6 +136,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 05 2014 Rex Dieter 0.9.0-1 - apper-0.9.0 From 026cfe1890acbeef374ff28810049a64cf08f4a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 17 Jul 2014 09:51:31 -0500 Subject: [PATCH 053/111] rebuild (appstream) --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 4aac902..f3e0d3b 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Version: 0.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -136,6 +136,9 @@ fi %changelog +* Thu Jul 17 2014 Rex Dieter 0.9.0-3 +- rebuild (appstream) + * Sat Jun 07 2014 Fedora Release Engineering - 0.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1bb3dde32b8ca8262dab2bed7a760c285dbb52f5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 17 Jul 2014 09:56:02 -0500 Subject: [PATCH 054/111] upstream fixes, mostly appstream related --- ...l-Don-t-use-deprecated-AppStream-API.patch | 39 +++ 0007-Fix-compilation-again.patch | 264 ++++++++++++++++++ ...loper_name-tag-to-AppStream-metadata.patch | 24 ++ 0014-Adjust-to-AppStream-0.7-API-change.patch | 36 +++ apper.spec | 6 +- 5 files changed, 368 insertions(+), 1 deletion(-) create mode 100644 0005-trivial-Don-t-use-deprecated-AppStream-API.patch create mode 100644 0007-Fix-compilation-again.patch create mode 100644 0013-Add-developer_name-tag-to-AppStream-metadata.patch create mode 100644 0014-Adjust-to-AppStream-0.7-API-change.patch diff --git a/0005-trivial-Don-t-use-deprecated-AppStream-API.patch b/0005-trivial-Don-t-use-deprecated-AppStream-API.patch new file mode 100644 index 0000000..e8deb2e --- /dev/null +++ b/0005-trivial-Don-t-use-deprecated-AppStream-API.patch @@ -0,0 +1,39 @@ +From 6daea708d76302c282e20511f2b77e1bac093fb3 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Mon, 12 May 2014 19:29:17 +0200 +Subject: [PATCH 05/17] trivial: Don't use deprecated AppStream API + +--- + libapper/AppStream.cpp | 2 +- + libapper/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libapper/AppStream.cpp b/libapper/AppStream.cpp +index 4c12c18..65f4853 100644 +--- a/libapper/AppStream.cpp ++++ b/libapper/AppStream.cpp +@@ -95,7 +95,7 @@ bool AppStream::open() + QString pkgName = QString::fromUtf8(as_component_get_pkgname(cpt)); + + // Desktop file +- app.id = QString::fromUtf8(as_component_get_idname(cpt)); ++ app.id = QString::fromUtf8(as_component_get_id(cpt)); + + // Summary + app.summary = QString::fromUtf8(as_component_get_summary(cpt)); +diff --git a/libapper/CMakeLists.txt b/libapper/CMakeLists.txt +index 0c0fd0d..3e4db83 100644 +--- a/libapper/CMakeLists.txt ++++ b/libapper/CMakeLists.txt +@@ -33,7 +33,7 @@ set(libapper_SRCS + + if(APPSTREAM) + pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.36) +- pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6) ++ pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6.2) + + set(libapper_SRCS ${libapper_SRCS} AppStream.cpp) + endif() +-- +1.9.3 + diff --git a/0007-Fix-compilation-again.patch b/0007-Fix-compilation-again.patch new file mode 100644 index 0000000..d3c010b --- /dev/null +++ b/0007-Fix-compilation-again.patch @@ -0,0 +1,264 @@ +From 99de7068da018df4dfd490f8e8751e8532699589 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Tue, 20 May 2014 01:57:03 +0200 +Subject: [PATCH 07/17] Fix compilation again + +* Drop RepairSystem(), no longer supported by PackageKit +* Adjust to AppStream-based Listaller API +--- + AppSetup/CMakeLists.txt | 5 ++++- + AppSetup/SetupWizard.cpp | 10 ++++++---- + AppSetup/main.cpp | 4 ++-- + Apper/BackendDetails.cpp | 1 - + Apper/BackendDetails.ui | 32 +++++++++++--------------------- + apperd/TransactionWatcher.cpp | 7 +++---- + libapper/PkIcons.cpp | 1 - + libapper/PkStrings.cpp | 8 ++------ + 8 files changed, 28 insertions(+), 40 deletions(-) + +diff --git a/AppSetup/CMakeLists.txt b/AppSetup/CMakeLists.txt +index 05ed512..b4561ac 100644 +--- a/AppSetup/CMakeLists.txt ++++ b/AppSetup/CMakeLists.txt +@@ -1,11 +1,13 @@ + pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.36) +-pkg_check_modules(LISTALLER REQUIRED listaller-glib>=0.5.7) ++pkg_check_modules(LISTALLER REQUIRED listaller-glib>=0.5.8) ++pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6.2) + pkg_check_modules(GEE REQUIRED gee-1.0>=0.6) + + include_directories(${CMAKE_CURRENT_BINARY_DIR} + ${GLIB2_INCLUDE_DIR} + ${GEE_INCLUDE_DIRS} + ${LISTALLER_INCLUDE_DIRS} ++ ${APPSTREAM_INCLUDE_DIRS} + ) + + set(AppSetup_SRCS main.cpp +@@ -28,6 +30,7 @@ target_link_libraries(apper-appsetup + ${KDE4_KDEUI_LIBS} + ${GLIB2_LIBRARIES} + ${LISTALLER_LIBRARIES} ++ ${APPSTREAM_LIBRARIES} + apper + ) + +diff --git a/AppSetup/SetupWizard.cpp b/AppSetup/SetupWizard.cpp +index 91008b7..94392e9 100644 +--- a/AppSetup/SetupWizard.cpp ++++ b/AppSetup/SetupWizard.cpp +@@ -18,6 +18,7 @@ + * Boston, MA 02110-1301, USA. + */ + ++#include + #include "SetupWizard.h" + #include "ui_SetupWizard.h" + +@@ -31,7 +32,6 @@ + #include + #include + #include +-#include + + #include "InfoWidget.h" + #include "SimplePage.h" +@@ -82,7 +82,8 @@ void on_lisetup_status_changed(GObject *sender, ListallerStatusItem *status, Set + ListallerStatusEnum statusType = listaller_status_item_get_status(status); + + if (statusType == LISTALLER_STATUS_ENUM_INSTALLATION_FINISHED) { +- QString appName = QString::fromUtf8(listaller_app_item_get_full_name(d->appID)); ++ AsComponent *info = listaller_app_item_get_info (d->appID); ++ QString appName = QString::fromUtf8(as_component_get_name (info)); + d->infoPage->reset(); + d->infoPage->setWindowTitle(i18n("Installation finished!")); + d->infoPage->setDescription(i18n("%1 has been installed successfully!", appName)); +@@ -183,7 +184,8 @@ bool SetupWizard::constructWizardLayout() + return false; + } + +- QString appName = listaller_app_item_get_full_name(d->appID); ++ AsComponent *info = listaller_app_item_get_info (d->appID); ++ QString appName = as_component_get_name(info); + + // Welcome page + SimplePage *introP = new SimplePage(this); +@@ -257,7 +259,7 @@ bool SetupWizard::constructWizardLayout() + SimplePage *descP = new SimplePage(this); + descP->setTitle(i18n("Application description")); + descP->setDescription(i18n("Description")); +- descP->setDetails(listaller_app_item_get_description(d->appID)); ++ descP->setDetails(as_component_get_description(info)); + ui->stackedWidget->addWidget(descP); + d->preparationPageCount++; + +diff --git a/AppSetup/main.cpp b/AppSetup/main.cpp +index ea9e74a..b42d2eb 100644 +--- a/AppSetup/main.cpp ++++ b/AppSetup/main.cpp +@@ -18,14 +18,14 @@ + * Boston, MA 02110-1301, USA. + */ + ++#include ++#include + #include + #include + #include + #include + #include + #include +-#include +-#include + + #include "SetupWizard.h" + +diff --git a/Apper/BackendDetails.cpp b/Apper/BackendDetails.cpp +index 54638d1..6826a11 100644 +--- a/Apper/BackendDetails.cpp ++++ b/Apper/BackendDetails.cpp +@@ -77,7 +77,6 @@ BackendDetails::BackendDetails(QWidget *parent) : + ui->whatProvidesCB->setChecked(actions & Transaction::RoleWhatProvides); + ui->getPackagesCB->setChecked(actions & Transaction::RoleGetPackages); + ui->repairSystemCB->setChecked(actions & Transaction::RoleRepairSystem); +- ui->upgradeSystemCB->setChecked(actions & Transaction::RoleUpgradeSystem); + + // FILTERS - Setup filters + Transaction::Filters filters = Daemon::global()->filters(); +diff --git a/Apper/BackendDetails.ui b/Apper/BackendDetails.ui +index 85d7338..1157f4b 100644 +--- a/Apper/BackendDetails.ui ++++ b/Apper/BackendDetails.ui +@@ -7,7 +7,7 @@ + 0 + 0 + 552 +- 462 ++ 509 + + + +@@ -287,26 +287,6 @@ + + + +- +- +- +- false +- +- +- Repair System +- +- +- +- +- +- +- false +- +- +- Upgrade System +- +- +- + + + +@@ -357,6 +337,16 @@ + + + ++ ++ ++ ++ false ++ ++ ++ Repair System ++ ++ ++ + + + +diff --git a/apperd/TransactionWatcher.cpp b/apperd/TransactionWatcher.cpp +index 23ded5c..95a0768 100644 +--- a/apperd/TransactionWatcher.cpp ++++ b/apperd/TransactionWatcher.cpp +@@ -91,7 +91,7 @@ void TransactionWatcher::watchTransaction(const QDBusObjectPath &tid, bool inter + this, SLOT(finished(PackageKit::Transaction::Exit))); + + // Store the transaction id +- m_transactions[tid] = transaction; ++ m_transactions[tid] = transaction; + } else { + transaction = m_transactions[tid]; + +@@ -112,8 +112,7 @@ void TransactionWatcher::transactionReady() + (role == Transaction::RoleInstallPackages || + role == Transaction::RoleInstallFiles || + role == Transaction::RoleRemovePackages || +- role == Transaction::RoleUpdatePackages || +- role == Transaction::RoleUpgradeSystem)) { ++ role == Transaction::RoleUpdatePackages)) { + // AVOID showing messages and restart requires when + // the user was just simulating an instalation + connect(transaction, SIGNAL(message(PackageKit::Transaction::Message,QString)), +@@ -153,7 +152,7 @@ void TransactionWatcher::finished(PackageKit::Transaction::Exit exit) + { + // check if the transaction emitted any require restart + Transaction *transaction = qobject_cast(sender()); +- QDBusObjectPath tid = transaction->tid(); ++ QDBusObjectPath tid = transaction->tid(); + transaction->disconnect(this); + m_transactions.remove(tid); + m_transactionJob.remove(tid); +diff --git a/libapper/PkIcons.cpp b/libapper/PkIcons.cpp +index b0eb4ec..a1237ce 100644 +--- a/libapper/PkIcons.cpp ++++ b/libapper/PkIcons.cpp +@@ -206,7 +206,6 @@ QString PkIcons::actionIconName(Transaction::Role role) + case Transaction::RoleSearchGroup : return "search-package"; + case Transaction::RoleSearchName : return "search-package"; + case Transaction::RoleUpdatePackages : return "package-update"; +- case Transaction::RoleUpgradeSystem : return "distro-upgrade";//TODO + case Transaction::RoleWhatProvides : return "search-package"; + case Transaction::RoleRepairSystem : return "package-rollback"; + } +diff --git a/libapper/PkStrings.cpp b/libapper/PkStrings.cpp +index ece1cdf..ada20ce 100644 +--- a/libapper/PkStrings.cpp ++++ b/libapper/PkStrings.cpp +@@ -262,8 +262,6 @@ QString PkStrings::action(Transaction::Role role, Transaction::TransactionFlags + return i18nc("The role of the transaction, in present tense", "Getting categories"); + case Transaction::RoleGetOldTransactions : + return i18nc("The role of the transaction, in present tense", "Getting old transactions"); +- case Transaction::RoleUpgradeSystem : +- return i18nc("The role of the transaction, in present tense", "Upgrading system"); + case Transaction::RoleRepairSystem : + return i18nc("The role of the transaction, in present tense", "Repairing system"); + case Transaction::RoleRepoRemove: +@@ -336,8 +334,6 @@ QString PkStrings::actionPast(Transaction::Role action) + return i18nc("The role of the transaction, in past tense", "Got categories"); + case Transaction::RoleGetOldTransactions : + return i18nc("The role of the transaction, in past tense", "Got old transactions"); +- case Transaction::RoleUpgradeSystem : +- return i18nc("The role of the transaction, in past tense", "Upgraded system"); + case Transaction::RoleRepairSystem: + return i18nc("The role of the transaction, in past tense", "Repaired system"); + case Transaction::RoleRepoRemove: +@@ -853,8 +849,8 @@ QString PkStrings::packageQuantity(bool updates, int packages, int selected) + "1 Update", "%1 Updates", + packages); + } else { +- return i18nc("Type of update, in the case it's just an update", "%1, %2", +- i18ncp("Part of: %1 Updates, %1 Selected", "%1 Update", "%1 Updates", packages), ++ return i18nc("Type of update, in the case it's just an update", "%1, %2", ++ i18ncp("Part of: %1 Updates, %1 Selected", "%1 Update", "%1 Updates", packages), + i18ncp("Part of: %1 Updates, %1 Selected", "%1 Selected", "%1 Selected", selected)); + } + } else { +-- +1.9.3 + diff --git a/0013-Add-developer_name-tag-to-AppStream-metadata.patch b/0013-Add-developer_name-tag-to-AppStream-metadata.patch new file mode 100644 index 0000000..9c66bfb --- /dev/null +++ b/0013-Add-developer_name-tag-to-AppStream-metadata.patch @@ -0,0 +1,24 @@ +From 115874b0314223c35c7275345315df24e62571a8 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Wed, 9 Jul 2014 18:25:19 +0200 +Subject: [PATCH 13/17] Add developer_name tag to AppStream metadata + +--- + Apper/apper.appdata.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Apper/apper.appdata.xml b/Apper/apper.appdata.xml +index 60400fc..fb4e7c2 100644 +--- a/Apper/apper.appdata.xml ++++ b/Apper/apper.appdata.xml +@@ -203,6 +203,7 @@ + https://projects.kde.org/projects/extragear/sysadmin/apper/ + https://bugs.kde.org/enter_bug.cgi?format=guided&product=apper + KDE ++ The KDE Community + + apper + +-- +1.9.3 + diff --git a/0014-Adjust-to-AppStream-0.7-API-change.patch b/0014-Adjust-to-AppStream-0.7-API-change.patch new file mode 100644 index 0000000..99482b7 --- /dev/null +++ b/0014-Adjust-to-AppStream-0.7-API-change.patch @@ -0,0 +1,36 @@ +From 4c728a349a926ef13b38a6def909e27d01113a99 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Mon, 14 Jul 2014 17:30:17 +0200 +Subject: [PATCH 14/17] Adjust to AppStream 0.7 API change + +--- + libapper/AppStream.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libapper/AppStream.cpp b/libapper/AppStream.cpp +index 65f4853..4507f0a 100644 +--- a/libapper/AppStream.cpp ++++ b/libapper/AppStream.cpp +@@ -82,6 +82,7 @@ bool AppStream::open() + AsComponent *cpt; + GPtrArray *sshot_array; + AsScreenshot *sshot; ++ gchar **pkgs; + cpt = (AsComponent*) g_ptr_array_index(cptArray, i); + // we only want desktop apps at time + if (as_component_get_kind (cpt) != AS_COMPONENT_KIND_DESKTOP_APP) +@@ -92,7 +93,10 @@ bool AppStream::open() + app.name = QString::fromUtf8(as_component_get_name(cpt)); + + // Package name +- QString pkgName = QString::fromUtf8(as_component_get_pkgname(cpt)); ++ pkgs = as_component_get_pkgnames(cpt); ++ QString pkgName; ++ if (pkgs != NULL) ++ pkgName = QString::fromUtf8(pkgs[0]); + + // Desktop file + app.id = QString::fromUtf8(as_component_get_id(cpt)); +-- +1.9.3 + diff --git a/apper.spec b/apper.spec index f3e0d3b..cc4ad94 100644 --- a/apper.spec +++ b/apper.spec @@ -22,6 +22,10 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-org.packagekit.updater.js ## upstream patches +Patch105: 0005-trivial-Don-t-use-deprecated-AppStream-API.patch +Patch107: 0007-Fix-compilation-again.patch +Patch113: 0013-Add-developer_name-tag-to-AppStream-metadata.patch +Patch114: 0014-Adjust-to-AppStream-0.7-API-change.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -55,7 +59,7 @@ KDE interface for PackageKit. %prep -%setup -q +%autosetup -p1 %build From bbd7734eeb0340c278f557af673ab31493abfdfe Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:45:41 +0000 Subject: [PATCH 055/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index cc4ad94..889e8a7 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Version: 0.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -140,6 +140,9 @@ fi %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 0.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 17 2014 Rex Dieter 0.9.0-3 - rebuild (appstream) From 6aa1700406dbef3ecb36d6a90f8b864d0783bcfc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 26 Aug 2014 16:49:05 -0500 Subject: [PATCH 056/111] apper-0.9.1 --- .gitignore | 5 +- ...l-Don-t-use-deprecated-AppStream-API.patch | 39 --- 0007-Fix-compilation-again.patch | 264 ------------------ ...loper_name-tag-to-AppStream-metadata.patch | 24 -- 0014-Adjust-to-AppStream-0.7-API-change.patch | 36 --- apper.spec | 11 +- sources | 2 +- 7 files changed, 7 insertions(+), 374 deletions(-) delete mode 100644 0005-trivial-Don-t-use-deprecated-AppStream-API.patch delete mode 100644 0007-Fix-compilation-again.patch delete mode 100644 0013-Add-developer_name-tag-to-AppStream-metadata.patch delete mode 100644 0014-Adjust-to-AppStream-0.7-API-change.patch diff --git a/.gitignore b/.gitignore index b52b63b..432c32e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/apper-0.8.2.tar.bz2 -/apper-0.8.3-20140422.tar.xz -/apper-0.8.3-20140426.tar.xz -/apper-0.9.0.tar.xz +/apper-0.9.1.tar.xz diff --git a/0005-trivial-Don-t-use-deprecated-AppStream-API.patch b/0005-trivial-Don-t-use-deprecated-AppStream-API.patch deleted file mode 100644 index e8deb2e..0000000 --- a/0005-trivial-Don-t-use-deprecated-AppStream-API.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6daea708d76302c282e20511f2b77e1bac093fb3 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Mon, 12 May 2014 19:29:17 +0200 -Subject: [PATCH 05/17] trivial: Don't use deprecated AppStream API - ---- - libapper/AppStream.cpp | 2 +- - libapper/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libapper/AppStream.cpp b/libapper/AppStream.cpp -index 4c12c18..65f4853 100644 ---- a/libapper/AppStream.cpp -+++ b/libapper/AppStream.cpp -@@ -95,7 +95,7 @@ bool AppStream::open() - QString pkgName = QString::fromUtf8(as_component_get_pkgname(cpt)); - - // Desktop file -- app.id = QString::fromUtf8(as_component_get_idname(cpt)); -+ app.id = QString::fromUtf8(as_component_get_id(cpt)); - - // Summary - app.summary = QString::fromUtf8(as_component_get_summary(cpt)); -diff --git a/libapper/CMakeLists.txt b/libapper/CMakeLists.txt -index 0c0fd0d..3e4db83 100644 ---- a/libapper/CMakeLists.txt -+++ b/libapper/CMakeLists.txt -@@ -33,7 +33,7 @@ set(libapper_SRCS - - if(APPSTREAM) - pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.36) -- pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6) -+ pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6.2) - - set(libapper_SRCS ${libapper_SRCS} AppStream.cpp) - endif() --- -1.9.3 - diff --git a/0007-Fix-compilation-again.patch b/0007-Fix-compilation-again.patch deleted file mode 100644 index d3c010b..0000000 --- a/0007-Fix-compilation-again.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 99de7068da018df4dfd490f8e8751e8532699589 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Tue, 20 May 2014 01:57:03 +0200 -Subject: [PATCH 07/17] Fix compilation again - -* Drop RepairSystem(), no longer supported by PackageKit -* Adjust to AppStream-based Listaller API ---- - AppSetup/CMakeLists.txt | 5 ++++- - AppSetup/SetupWizard.cpp | 10 ++++++---- - AppSetup/main.cpp | 4 ++-- - Apper/BackendDetails.cpp | 1 - - Apper/BackendDetails.ui | 32 +++++++++++--------------------- - apperd/TransactionWatcher.cpp | 7 +++---- - libapper/PkIcons.cpp | 1 - - libapper/PkStrings.cpp | 8 ++------ - 8 files changed, 28 insertions(+), 40 deletions(-) - -diff --git a/AppSetup/CMakeLists.txt b/AppSetup/CMakeLists.txt -index 05ed512..b4561ac 100644 ---- a/AppSetup/CMakeLists.txt -+++ b/AppSetup/CMakeLists.txt -@@ -1,11 +1,13 @@ - pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.36) --pkg_check_modules(LISTALLER REQUIRED listaller-glib>=0.5.7) -+pkg_check_modules(LISTALLER REQUIRED listaller-glib>=0.5.8) -+pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6.2) - pkg_check_modules(GEE REQUIRED gee-1.0>=0.6) - - include_directories(${CMAKE_CURRENT_BINARY_DIR} - ${GLIB2_INCLUDE_DIR} - ${GEE_INCLUDE_DIRS} - ${LISTALLER_INCLUDE_DIRS} -+ ${APPSTREAM_INCLUDE_DIRS} - ) - - set(AppSetup_SRCS main.cpp -@@ -28,6 +30,7 @@ target_link_libraries(apper-appsetup - ${KDE4_KDEUI_LIBS} - ${GLIB2_LIBRARIES} - ${LISTALLER_LIBRARIES} -+ ${APPSTREAM_LIBRARIES} - apper - ) - -diff --git a/AppSetup/SetupWizard.cpp b/AppSetup/SetupWizard.cpp -index 91008b7..94392e9 100644 ---- a/AppSetup/SetupWizard.cpp -+++ b/AppSetup/SetupWizard.cpp -@@ -18,6 +18,7 @@ - * Boston, MA 02110-1301, USA. - */ - -+#include - #include "SetupWizard.h" - #include "ui_SetupWizard.h" - -@@ -31,7 +32,6 @@ - #include - #include - #include --#include - - #include "InfoWidget.h" - #include "SimplePage.h" -@@ -82,7 +82,8 @@ void on_lisetup_status_changed(GObject *sender, ListallerStatusItem *status, Set - ListallerStatusEnum statusType = listaller_status_item_get_status(status); - - if (statusType == LISTALLER_STATUS_ENUM_INSTALLATION_FINISHED) { -- QString appName = QString::fromUtf8(listaller_app_item_get_full_name(d->appID)); -+ AsComponent *info = listaller_app_item_get_info (d->appID); -+ QString appName = QString::fromUtf8(as_component_get_name (info)); - d->infoPage->reset(); - d->infoPage->setWindowTitle(i18n("Installation finished!")); - d->infoPage->setDescription(i18n("%1 has been installed successfully!", appName)); -@@ -183,7 +184,8 @@ bool SetupWizard::constructWizardLayout() - return false; - } - -- QString appName = listaller_app_item_get_full_name(d->appID); -+ AsComponent *info = listaller_app_item_get_info (d->appID); -+ QString appName = as_component_get_name(info); - - // Welcome page - SimplePage *introP = new SimplePage(this); -@@ -257,7 +259,7 @@ bool SetupWizard::constructWizardLayout() - SimplePage *descP = new SimplePage(this); - descP->setTitle(i18n("Application description")); - descP->setDescription(i18n("Description")); -- descP->setDetails(listaller_app_item_get_description(d->appID)); -+ descP->setDetails(as_component_get_description(info)); - ui->stackedWidget->addWidget(descP); - d->preparationPageCount++; - -diff --git a/AppSetup/main.cpp b/AppSetup/main.cpp -index ea9e74a..b42d2eb 100644 ---- a/AppSetup/main.cpp -+++ b/AppSetup/main.cpp -@@ -18,14 +18,14 @@ - * Boston, MA 02110-1301, USA. - */ - -+#include -+#include - #include - #include - #include - #include - #include - #include --#include --#include - - #include "SetupWizard.h" - -diff --git a/Apper/BackendDetails.cpp b/Apper/BackendDetails.cpp -index 54638d1..6826a11 100644 ---- a/Apper/BackendDetails.cpp -+++ b/Apper/BackendDetails.cpp -@@ -77,7 +77,6 @@ BackendDetails::BackendDetails(QWidget *parent) : - ui->whatProvidesCB->setChecked(actions & Transaction::RoleWhatProvides); - ui->getPackagesCB->setChecked(actions & Transaction::RoleGetPackages); - ui->repairSystemCB->setChecked(actions & Transaction::RoleRepairSystem); -- ui->upgradeSystemCB->setChecked(actions & Transaction::RoleUpgradeSystem); - - // FILTERS - Setup filters - Transaction::Filters filters = Daemon::global()->filters(); -diff --git a/Apper/BackendDetails.ui b/Apper/BackendDetails.ui -index 85d7338..1157f4b 100644 ---- a/Apper/BackendDetails.ui -+++ b/Apper/BackendDetails.ui -@@ -7,7 +7,7 @@ - 0 - 0 - 552 -- 462 -+ 509 - - - -@@ -287,26 +287,6 @@ - - - -- -- -- -- false -- -- -- Repair System -- -- -- -- -- -- -- false -- -- -- Upgrade System -- -- -- - - - -@@ -357,6 +337,16 @@ - - - -+ -+ -+ -+ false -+ -+ -+ Repair System -+ -+ -+ - - - -diff --git a/apperd/TransactionWatcher.cpp b/apperd/TransactionWatcher.cpp -index 23ded5c..95a0768 100644 ---- a/apperd/TransactionWatcher.cpp -+++ b/apperd/TransactionWatcher.cpp -@@ -91,7 +91,7 @@ void TransactionWatcher::watchTransaction(const QDBusObjectPath &tid, bool inter - this, SLOT(finished(PackageKit::Transaction::Exit))); - - // Store the transaction id -- m_transactions[tid] = transaction; -+ m_transactions[tid] = transaction; - } else { - transaction = m_transactions[tid]; - -@@ -112,8 +112,7 @@ void TransactionWatcher::transactionReady() - (role == Transaction::RoleInstallPackages || - role == Transaction::RoleInstallFiles || - role == Transaction::RoleRemovePackages || -- role == Transaction::RoleUpdatePackages || -- role == Transaction::RoleUpgradeSystem)) { -+ role == Transaction::RoleUpdatePackages)) { - // AVOID showing messages and restart requires when - // the user was just simulating an instalation - connect(transaction, SIGNAL(message(PackageKit::Transaction::Message,QString)), -@@ -153,7 +152,7 @@ void TransactionWatcher::finished(PackageKit::Transaction::Exit exit) - { - // check if the transaction emitted any require restart - Transaction *transaction = qobject_cast(sender()); -- QDBusObjectPath tid = transaction->tid(); -+ QDBusObjectPath tid = transaction->tid(); - transaction->disconnect(this); - m_transactions.remove(tid); - m_transactionJob.remove(tid); -diff --git a/libapper/PkIcons.cpp b/libapper/PkIcons.cpp -index b0eb4ec..a1237ce 100644 ---- a/libapper/PkIcons.cpp -+++ b/libapper/PkIcons.cpp -@@ -206,7 +206,6 @@ QString PkIcons::actionIconName(Transaction::Role role) - case Transaction::RoleSearchGroup : return "search-package"; - case Transaction::RoleSearchName : return "search-package"; - case Transaction::RoleUpdatePackages : return "package-update"; -- case Transaction::RoleUpgradeSystem : return "distro-upgrade";//TODO - case Transaction::RoleWhatProvides : return "search-package"; - case Transaction::RoleRepairSystem : return "package-rollback"; - } -diff --git a/libapper/PkStrings.cpp b/libapper/PkStrings.cpp -index ece1cdf..ada20ce 100644 ---- a/libapper/PkStrings.cpp -+++ b/libapper/PkStrings.cpp -@@ -262,8 +262,6 @@ QString PkStrings::action(Transaction::Role role, Transaction::TransactionFlags - return i18nc("The role of the transaction, in present tense", "Getting categories"); - case Transaction::RoleGetOldTransactions : - return i18nc("The role of the transaction, in present tense", "Getting old transactions"); -- case Transaction::RoleUpgradeSystem : -- return i18nc("The role of the transaction, in present tense", "Upgrading system"); - case Transaction::RoleRepairSystem : - return i18nc("The role of the transaction, in present tense", "Repairing system"); - case Transaction::RoleRepoRemove: -@@ -336,8 +334,6 @@ QString PkStrings::actionPast(Transaction::Role action) - return i18nc("The role of the transaction, in past tense", "Got categories"); - case Transaction::RoleGetOldTransactions : - return i18nc("The role of the transaction, in past tense", "Got old transactions"); -- case Transaction::RoleUpgradeSystem : -- return i18nc("The role of the transaction, in past tense", "Upgraded system"); - case Transaction::RoleRepairSystem: - return i18nc("The role of the transaction, in past tense", "Repaired system"); - case Transaction::RoleRepoRemove: -@@ -853,8 +849,8 @@ QString PkStrings::packageQuantity(bool updates, int packages, int selected) - "1 Update", "%1 Updates", - packages); - } else { -- return i18nc("Type of update, in the case it's just an update", "%1, %2", -- i18ncp("Part of: %1 Updates, %1 Selected", "%1 Update", "%1 Updates", packages), -+ return i18nc("Type of update, in the case it's just an update", "%1, %2", -+ i18ncp("Part of: %1 Updates, %1 Selected", "%1 Update", "%1 Updates", packages), - i18ncp("Part of: %1 Updates, %1 Selected", "%1 Selected", "%1 Selected", selected)); - } - } else { --- -1.9.3 - diff --git a/0013-Add-developer_name-tag-to-AppStream-metadata.patch b/0013-Add-developer_name-tag-to-AppStream-metadata.patch deleted file mode 100644 index 9c66bfb..0000000 --- a/0013-Add-developer_name-tag-to-AppStream-metadata.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 115874b0314223c35c7275345315df24e62571a8 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Wed, 9 Jul 2014 18:25:19 +0200 -Subject: [PATCH 13/17] Add developer_name tag to AppStream metadata - ---- - Apper/apper.appdata.xml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Apper/apper.appdata.xml b/Apper/apper.appdata.xml -index 60400fc..fb4e7c2 100644 ---- a/Apper/apper.appdata.xml -+++ b/Apper/apper.appdata.xml -@@ -203,6 +203,7 @@ - https://projects.kde.org/projects/extragear/sysadmin/apper/ - https://bugs.kde.org/enter_bug.cgi?format=guided&product=apper - KDE -+ The KDE Community - - apper - --- -1.9.3 - diff --git a/0014-Adjust-to-AppStream-0.7-API-change.patch b/0014-Adjust-to-AppStream-0.7-API-change.patch deleted file mode 100644 index 99482b7..0000000 --- a/0014-Adjust-to-AppStream-0.7-API-change.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4c728a349a926ef13b38a6def909e27d01113a99 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Mon, 14 Jul 2014 17:30:17 +0200 -Subject: [PATCH 14/17] Adjust to AppStream 0.7 API change - ---- - libapper/AppStream.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libapper/AppStream.cpp b/libapper/AppStream.cpp -index 65f4853..4507f0a 100644 ---- a/libapper/AppStream.cpp -+++ b/libapper/AppStream.cpp -@@ -82,6 +82,7 @@ bool AppStream::open() - AsComponent *cpt; - GPtrArray *sshot_array; - AsScreenshot *sshot; -+ gchar **pkgs; - cpt = (AsComponent*) g_ptr_array_index(cptArray, i); - // we only want desktop apps at time - if (as_component_get_kind (cpt) != AS_COMPONENT_KIND_DESKTOP_APP) -@@ -92,7 +93,10 @@ bool AppStream::open() - app.name = QString::fromUtf8(as_component_get_name(cpt)); - - // Package name -- QString pkgName = QString::fromUtf8(as_component_get_pkgname(cpt)); -+ pkgs = as_component_get_pkgnames(cpt); -+ QString pkgName; -+ if (pkgs != NULL) -+ pkgName = QString::fromUtf8(pkgs[0]); - - // Desktop file - app.id = QString::fromUtf8(as_component_get_id(cpt)); --- -1.9.3 - diff --git a/apper.spec b/apper.spec index 889e8a7..5feb5e9 100644 --- a/apper.spec +++ b/apper.spec @@ -5,8 +5,8 @@ %define appstream 1 Name: apper -Version: 0.9.0 -Release: 4%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -22,10 +22,6 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-org.packagekit.updater.js ## upstream patches -Patch105: 0005-trivial-Don-t-use-deprecated-AppStream-API.patch -Patch107: 0007-Fix-compilation-again.patch -Patch113: 0013-Add-developer_name-tag-to-AppStream-metadata.patch -Patch114: 0014-Adjust-to-AppStream-0.7-API-change.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -140,6 +136,9 @@ fi %changelog +* Tue Aug 26 2014 Rex Dieter 0.9.1-1 +- apper-0.9.1 + * Fri Aug 15 2014 Fedora Release Engineering - 0.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 8fece5f..4f1d80b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c4b565d430f06e4d8165d12d6601f3d apper-0.9.0.tar.xz +2cb2d739decb876744c4194562cb8d32 apper-0.9.1.tar.xz From 8e8b3a43c232231ae7ad9e58dc31db9f0713ffa8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 28 Oct 2014 19:45:23 -0500 Subject: [PATCH 057/111] pull in some upstream fixes --- 0004-trivial-Fix-dependency-on-gee.patch | 25 +++++++++++ ...atypes-for-the-plasmoid-as-that-thos.patch | 44 +++++++++++++++++++ apper.spec | 7 ++- 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 0004-trivial-Fix-dependency-on-gee.patch create mode 100644 0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch diff --git a/0004-trivial-Fix-dependency-on-gee.patch b/0004-trivial-Fix-dependency-on-gee.patch new file mode 100644 index 0000000..dbbaa61 --- /dev/null +++ b/0004-trivial-Fix-dependency-on-gee.patch @@ -0,0 +1,25 @@ +From f2664cf5a701153e438944af3d83a8d5a43e0c33 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Tue, 9 Sep 2014 01:58:44 +0200 +Subject: [PATCH 4/9] trivial: Fix dependency on gee + +--- + AppSetup/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/AppSetup/CMakeLists.txt b/AppSetup/CMakeLists.txt +index b4561ac..68a4f48 100644 +--- a/AppSetup/CMakeLists.txt ++++ b/AppSetup/CMakeLists.txt +@@ -1,7 +1,7 @@ + pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.36) + pkg_check_modules(LISTALLER REQUIRED listaller-glib>=0.5.8) + pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6.2) +-pkg_check_modules(GEE REQUIRED gee-1.0>=0.6) ++pkg_check_modules(GEE REQUIRED gee-0.8>=0.10) + + include_directories(${CMAKE_CURRENT_BINARY_DIR} + ${GLIB2_INCLUDE_DIR} +-- +1.9.3 + diff --git a/0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch b/0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch new file mode 100644 index 0000000..9fb5c0c --- /dev/null +++ b/0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch @@ -0,0 +1,44 @@ +From 75b3d7d1587d4fe66ea8d157efc022f20d853dc1 Mon Sep 17 00:00:00 2001 +From: Raymond Wooninck +Date: Sat, 4 Oct 2014 20:15:21 +0200 +Subject: [PATCH 6/9] Register the metatypes for the plasmoid as that those + were removed from PackageKit-qt itself + +CCMAIL: dantti12@gmail.com +--- + declarative-plugins/qmlplugins.cpp | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/declarative-plugins/qmlplugins.cpp b/declarative-plugins/qmlplugins.cpp +index b39b3d2..d2b6f8d 100644 +--- a/declarative-plugins/qmlplugins.cpp ++++ b/declarative-plugins/qmlplugins.cpp +@@ -50,6 +50,25 @@ void QmlPlugins::registerTypes(const char* uri) + qmlRegisterType(uri, 0, 1, "Transaction"); + qmlRegisterUncreatableType(uri, 0, 1, "Daemon", "Global"); + qRegisterMetaType("PkTransaction::ExitStatus"); ++ qRegisterMetaType("PackageKit::Daemon::Network"); ++ qRegisterMetaType("PackageKit::Daemon::Authorize"); ++ qRegisterMetaType("PackageKit::Transaction::InternalError"); ++ qRegisterMetaType("PackageKit::Transaction::Role"); ++ qRegisterMetaType("PackageKit::Transaction::Error"); ++ qRegisterMetaType("PackageKit::Transaction::Exit"); ++ qRegisterMetaType("PackageKit::Transaction::Filter"); ++ qRegisterMetaType("PackageKit::Transaction::Message"); ++ qRegisterMetaType("PackageKit::Transaction::Status"); ++ qRegisterMetaType("PackageKit::Transaction::MediaType"); ++ qRegisterMetaType("PackageKit::Transaction::DistroUpgrade"); ++ qRegisterMetaType("PackageKit::Transaction::TransactionFlag"); ++ qRegisterMetaType("PackageKit::Transaction::TransactionFlags"); ++ qRegisterMetaType("PackageKit::Transaction::Restart"); ++ qRegisterMetaType("PackageKit::Transaction::UpdateState"); ++ qRegisterMetaType("PackageKit::Transaction::Group"); ++ qRegisterMetaType("PackageKit::Transaction::Info"); ++ qRegisterMetaType("PackageKit::Transaction::SigType"); ++ + } + + void QmlPlugins::initializeEngine(QDeclarativeEngine *engine, const char *uri) +-- +1.9.3 + diff --git a/apper.spec b/apper.spec index 5feb5e9..cf75f5b 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -22,6 +22,8 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-org.packagekit.updater.js ## upstream patches +Patch04: 0004-trivial-Fix-dependency-on-gee.patch +Patch06: 0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -136,6 +138,9 @@ fi %changelog +* Tue Oct 28 2014 Rex Dieter 0.9.1-2 +- pull in some upstream fixes + * Tue Aug 26 2014 Rex Dieter 0.9.1-1 - apper-0.9.1 From 010c2ee4b438411b57d29d46de38b4d0bb3df23b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 6 Dec 2014 13:21:03 -0600 Subject: [PATCH 058/111] don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063) --- apper-0.9.1-allow_deps.patch | 12 ++++++++++++ apper.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 apper-0.9.1-allow_deps.patch diff --git a/apper-0.9.1-allow_deps.patch b/apper-0.9.1-allow_deps.patch new file mode 100644 index 0000000..868d274 --- /dev/null +++ b/apper-0.9.1-allow_deps.patch @@ -0,0 +1,12 @@ +diff -up apper-0.9.1/libapper/PkTransaction.cpp.allow_deps apper-0.9.1/libapper/PkTransaction.cpp +--- apper-0.9.1/libapper/PkTransaction.cpp.allow_deps 2014-12-06 13:03:13.509607955 -0600 ++++ apper-0.9.1/libapper/PkTransaction.cpp 2014-12-06 13:05:02.574126072 -0600 +@@ -136,7 +136,7 @@ void PkTransaction::removePackages(const + { + if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { + d->originalRole = Transaction::RoleRemovePackages; +- d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so ++ d->allowDeps = true; // Default to avoid dependencies removal unless simulate says so + d->packages = packages; + d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; + diff --git a/apper.spec b/apper.spec index cf75f5b..b2ade42 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -25,6 +25,12 @@ Source10: 01-fedora-org.packagekit.updater.js Patch04: 0004-trivial-Fix-dependency-on-gee.patch Patch06: 0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch +## upstreamable patches +# -hif (and yum?) backends apparently do not support !allow_deps at all, so don't try +# https://bugzilla.redhat.com/show_bug.cgi?id=877038 +# http://bugs.kde.org/show_bug.cgi?id=315063 +Patch50: apper-0.9.1-allow_deps.patch + Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} # required because gnome-packagekit provides exactly the same interface @@ -138,6 +144,9 @@ fi %changelog +* Sat Dec 06 2014 Rex Dieter 0.9.1-3 +- don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063) + * Tue Oct 28 2014 Rex Dieter 0.9.1-2 - pull in some upstream fixes From 7a2548ef68dd96e9e4c223198fcb0ade7dadd692 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 Dec 2014 11:50:56 -0600 Subject: [PATCH 059/111] update URL: (use projects.kde.org) --- apper.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apper.spec b/apper.spec index b2ade42..e721807 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -16,7 +16,8 @@ Source0: apper-%{version}-%{snap}.tar.xz %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.xz %endif -URL: http://kde-apps.org/content/show.php/Apper?content=84745 +URL: https://projects.kde.org/projects/extragear/sysadmin/apper +#URL: http://kde-apps.org/content/show.php/Apper?content=84745 # plasma js to enable apper plasma applet Source10: 01-fedora-org.packagekit.updater.js @@ -144,6 +145,9 @@ fi %changelog +* Mon Dec 15 2014 Rex Dieter 0.9.1-4 +- update URL: (use projects.kde.org) + * Sat Dec 06 2014 Rex Dieter 0.9.1-3 - don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063) From fa4a5ec6ea7d6450b318e8e5e7c6c714f1fdb646 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 Dec 2014 14:54:01 -0600 Subject: [PATCH 060/111] Your current backend does not support installing files (#1167018) --- ...to-return-an-error-if-it-doesn-t-sup.patch | 91 +++++++++++++++++++ apper.spec | 6 +- 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch diff --git a/0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch b/0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch new file mode 100644 index 0000000..c076173 --- /dev/null +++ b/0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch @@ -0,0 +1,91 @@ +From 21d93baaf5b89a076cb128566e1ff004153f1e6a Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Mon, 15 Dec 2014 18:03:40 -0200 +Subject: [PATCH 26/26] Let the Backend to return an error if it doesn't + support the fetures we need + +--- + libapper/PkTransaction.cpp | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp +index bce515e..c3030a6 100644 +--- a/libapper/PkTransaction.cpp ++++ b/libapper/PkTransaction.cpp +@@ -108,47 +108,47 @@ PkTransaction::~PkTransaction() + + void PkTransaction::installFiles(const QStringList &files) + { +- if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { ++// if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { + d->originalRole = Transaction::RoleInstallFiles; + d->files = files; + d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; + + setupTransaction(Daemon::installFiles(files, d->flags)); +- } else { +- showError(i18n("Current backend does not support installing files."), i18n("Error")); +- } ++// } else { ++// showError(i18n("Current backend does not support installing files."), i18n("Error")); ++// } + } + + void PkTransaction::installPackages(const QStringList &packages) + { +- if (Daemon::global()->roles() & Transaction::RoleInstallPackages) { ++// if (Daemon::global()->roles() & Transaction::RoleInstallPackages) { + d->originalRole = Transaction::RoleInstallPackages; + d->packages = packages; + d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; + + setupTransaction(Daemon::installPackages(d->packages, d->flags)); +- } else { +- showError(i18n("Current backend does not support installing packages."), i18n("Error")); +- } ++// } else { ++// showError(i18n("Current backend does not support installing packages."), i18n("Error")); ++// } + } + + void PkTransaction::removePackages(const QStringList &packages) + { +- if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { ++// if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { + d->originalRole = Transaction::RoleRemovePackages; + d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so + d->packages = packages; + d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; + + setupTransaction(Daemon::removePackages(d->packages, d->allowDeps, AUTOREMOVE, d->flags)); +- } else { +- showError(i18n("The current backend does not support removing packages."), i18n("Error")); +- } ++// } else { ++// showError(i18n("The current backend does not support removing packages."), i18n("Error")); ++// } + } + + void PkTransaction::updatePackages(const QStringList &packages, bool downloadOnly) + { +- if (Daemon::global()->roles() & Transaction::RoleUpdatePackages) { ++// if (Daemon::global()->roles() & Transaction::RoleUpdatePackages) { + d->originalRole = Transaction::RoleUpdatePackages; + d->packages = packages; + if (downloadOnly) { +@@ -159,9 +159,9 @@ void PkTransaction::updatePackages(const QStringList &packages, bool downloadOnl + } + + setupTransaction(Daemon::updatePackages(d->packages, d->flags)); +- } else { +- showError(i18n("The current backend does not support updating packages."), i18n("Error")); +- } ++// } else { ++// showError(i18n("The current backend does not support updating packages."), i18n("Error")); ++// } + } + + void PkTransaction::refreshCache(bool force) +-- +2.1.0 + diff --git a/apper.spec b/apper.spec index e721807..d4e5f82 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Version: 0.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -25,6 +25,7 @@ Source10: 01-fedora-org.packagekit.updater.js ## upstream patches Patch04: 0004-trivial-Fix-dependency-on-gee.patch Patch06: 0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch +Patch26: 0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch ## upstreamable patches # -hif (and yum?) backends apparently do not support !allow_deps at all, so don't try @@ -145,6 +146,9 @@ fi %changelog +* Mon Dec 15 2014 Rex Dieter 0.9.1-5 +- Your current backend does not support installing files (#1167018) + * Mon Dec 15 2014 Rex Dieter 0.9.1-4 - update URL: (use projects.kde.org) From 2d380815fd0eae8453d76d72fe97d21759a97e8d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 13 Jan 2015 11:11:27 -0600 Subject: [PATCH 061/111] disable appstream support (#1180819) --- apper.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apper.spec b/apper.spec index d4e5f82..1464ccb 100644 --- a/apper.spec +++ b/apper.spec @@ -1,12 +1,12 @@ %define pk_min_version 0.9.2 -## include app-install support and/or for testing/customizing categories.xml -#define appinstall 1 -%define appstream 1 +## appstream disabled, just not ready yet, +## https://bugzilla.redhat.com/1180819#c20 +#define appstream 1 Name: apper Version: 0.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -146,6 +146,9 @@ fi %changelog +* Tue Jan 13 2015 Rex Dieter 0.9.1-6 +- disable appstream support (#1180819) + * Mon Dec 15 2014 Rex Dieter 0.9.1-5 - Your current backend does not support installing files (#1167018) From 422188456d1e9e83e97a9f4a9625d68447b4c297 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 31 Mar 2015 09:54:51 -0500 Subject: [PATCH 062/111] drop unused left-over app_install conditional --- apper.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apper.spec b/apper.spec index 1464ccb..3cf8f91 100644 --- a/apper.spec +++ b/apper.spec @@ -128,12 +128,6 @@ fi %{_kde4_appsdir}/apperd/ %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service %{_kde4_libexecdir}/apper-pk-session -%if 0%{?app_install} -# own this until app-install or something better comes along -- Rex -%dir %{_datadir}/app-install -# TODO: fix this to match comps' categories/groups -%{_datadir}/app-install/categories.xml -%endif %{_mandir}/man1/apper.1* # plasma-applet-updater %{_kde4_appsdir}/plasma/plasmoids/org.packagekit.updater/ From 41d40b20c81212617f4896f5d8538ac8f6f428ae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 31 Mar 2015 13:08:29 -0500 Subject: [PATCH 063/111] omit plasma4-based updater applet (f22+) --- apper.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 3cf8f91..bffb4d9 100644 --- a/apper.spec +++ b/apper.spec @@ -4,9 +4,13 @@ ## https://bugzilla.redhat.com/1180819#c20 #define appstream 1 +%if 0%{?fedora} > 21 +%define plasma5 1 +%endif + Name: apper Version: 0.9.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -67,6 +71,13 @@ KDE interface for PackageKit. %prep %autosetup -p1 +%if 0%{?plasma5} +sed -e 's|^add_subdirectory(declarative-plugins)|#add_subdirectory(declarative-plugins)|g' \ + -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \ + -i CMakeLists.txt +rm -fv po/*/plasma_applet_org.packagekit.updater.po +%endif + %build mkdir -p %{_target_platform} @@ -95,11 +106,13 @@ mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ chrpath --list %{buildroot}%{_kde4_bindir}/apper chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper +%if ! 0%{?plasma5} # show apper updater systray applet by default install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js mkdir -p %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/ ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js \ %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js +%endif %check @@ -129,17 +142,22 @@ fi %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service %{_kde4_libexecdir}/apper-pk-session %{_mandir}/man1/apper.1* +%if ! 0%{?plasma5} # plasma-applet-updater %{_kde4_appsdir}/plasma/plasmoids/org.packagekit.updater/ %{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js %{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js %{_kde4_datadir}/kde4/services/plasma-applet-org.packagekit.updater.desktop %{_kde4_libdir}/kde4/imports/org/kde/apper/ +%endif # appdata %{_datadir}/appdata/apper.appdata.xml %changelog +* Tue Mar 31 2015 Rex Dieter 0.9.1-7 +- omit plasma4-based updater applet (f22+) + * Tue Jan 13 2015 Rex Dieter 0.9.1-6 - disable appstream support (#1180819) From b3d53c67797f0dc51cdd199e2ea0f73f7503febb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 22 Apr 2015 11:21:05 -0500 Subject: [PATCH 064/111] 0.9.1-8 - Requires: plasma-pk-updates (#1214397) - use %{?kde_runtime_requires} macro --- apper.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apper.spec b/apper.spec index bffb4d9..155cacf 100644 --- a/apper.spec +++ b/apper.spec @@ -10,7 +10,7 @@ Name: apper Version: 0.9.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -60,9 +60,11 @@ BuildRequires: pkgconfig(packagekitqt4) >= %{pk_min_version} %global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo %{pk_min_version}) %endif -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%{?kde_runtime_requires} Requires: PackageKit-Qt%{?_isa} >= %{pk_version} +%if 0%{?plasma5} +Requires: plasma-pk-updates +%endif %description KDE interface for PackageKit. @@ -155,6 +157,10 @@ fi %changelog +* Wed Apr 22 2015 Rex Dieter - 0.9.1-8 +- Requires: plasma-pk-updates (#1214397) +- use %%{?kde_runtime_requires} macro + * Tue Mar 31 2015 Rex Dieter 0.9.1-7 - omit plasma4-based updater applet (f22+) From f91803aa830877f2e5d0939008a7dd3c90311cb7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 27 Apr 2015 14:30:06 -0500 Subject: [PATCH 065/111] Apper won't check for updates (#1188207) --- apper-0.9.1-pk_cache_age.patch | 62 ++++++++++++++++++++++++++++++++++ apper.spec | 7 +++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 apper-0.9.1-pk_cache_age.patch diff --git a/apper-0.9.1-pk_cache_age.patch b/apper-0.9.1-pk_cache_age.patch new file mode 100644 index 0000000..7d4344e --- /dev/null +++ b/apper-0.9.1-pk_cache_age.patch @@ -0,0 +1,62 @@ +diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age apper-0.9.1/apperd/RefreshCacheTask.cpp +--- apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/apperd/RefreshCacheTask.cpp 2015-04-27 14:25:21.663347177 -0500 +@@ -33,7 +33,8 @@ RefreshCacheTask::RefreshCacheTask(QObje + QObject(parent), + m_transaction(0), + m_notification(0), +- m_lastError(Transaction::ErrorUnknown) ++ m_lastError(Transaction::ErrorUnknown), ++ m_cacheAge (3600); + { + } + +@@ -43,6 +44,7 @@ void RefreshCacheTask::refreshCache() + if (!m_transaction) { + // Refresh Cache is false otherwise it will rebuild + // the whole cache on Fedora ++ Daemon::setHints (QLatin1String("cache-age=")+QString::number(m_cacheAge)); + m_transaction = Daemon::refreshCache(false); + connect(m_transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), + this, SLOT(refreshCacheFinished(PackageKit::Transaction::Exit,uint))); +diff -up apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age apper-0.9.1/apperd/RefreshCacheTask.h +--- apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/apperd/RefreshCacheTask.h 2015-04-27 14:24:13.004451853 -0500 +@@ -44,6 +44,7 @@ private: + Transaction *m_transaction; + KNotification *m_notification; + Transaction::Error m_lastError; ++ uint m_cacheAge; + QString m_lastErrorString; + }; + +diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age apper-0.9.1/ApperKCM/ApperKCM.cpp +--- apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/ApperKCM/ApperKCM.cpp 2015-04-27 14:22:58.971449606 -0500 +@@ -77,6 +77,7 @@ ApperKCM::ApperKCM(QWidget *parent, cons + m_findIcon("edit-find"), + m_cancelIcon("dialog-cancel"), + m_forceRefreshCache(false), ++ m_cacheAge(600) + m_history(0), + m_searchRole(Transaction::RoleUnknown) + { +@@ -760,6 +761,7 @@ void ApperKCM::refreshCache() + PkTransactionWidget *transactionW = new PkTransactionWidget(this); + connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); + QPointer transaction = new PkTransaction(transactionW); ++ Daemon::setHints (QLatin1String("cache-age=")+QString::number(m_cacheAge)); + transaction->refreshCache(m_forceRefreshCache); + transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); + +diff -up apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age apper-0.9.1/ApperKCM/ApperKCM.h +--- apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/ApperKCM/ApperKCM.h 2015-04-27 14:22:01.562706932 -0500 +@@ -119,6 +119,7 @@ private: + FiltersMenu *m_filtersMenu; + Transaction::Roles m_roles; + bool m_forceRefreshCache; ++ uint m_cacheAge; + + TransactionHistory *m_history; + diff --git a/apper.spec b/apper.spec index 155cacf..ae03de0 100644 --- a/apper.spec +++ b/apper.spec @@ -10,7 +10,7 @@ Name: apper Version: 0.9.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -36,6 +36,8 @@ Patch26: 0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch # https://bugzilla.redhat.com/show_bug.cgi?id=877038 # http://bugs.kde.org/show_bug.cgi?id=315063 Patch50: apper-0.9.1-allow_deps.patch +# explicitly set PackageKit cache-age parameter, since PK defaults to something silly like inifinity. +Patch51: apper-0.9.1-pk_cache_age.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -157,6 +159,9 @@ fi %changelog +* Mon Apr 27 2015 Rex Dieter 0.9.1-9 +- Apper won't check for updates (#1188207) + * Wed Apr 22 2015 Rex Dieter - 0.9.1-8 - Requires: plasma-pk-updates (#1214397) - use %%{?kde_runtime_requires} macro From e06ea69671acf05607db0e662dada41120595117 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 27 Apr 2015 14:37:50 -0500 Subject: [PATCH 066/111] patch typo --- apper-0.9.1-pk_cache_age.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper-0.9.1-pk_cache_age.patch b/apper-0.9.1-pk_cache_age.patch index 7d4344e..63a0ba5 100644 --- a/apper-0.9.1-pk_cache_age.patch +++ b/apper-0.9.1-pk_cache_age.patch @@ -37,7 +37,7 @@ diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age apper-0.9.1/ApperKCM/App m_findIcon("edit-find"), m_cancelIcon("dialog-cancel"), m_forceRefreshCache(false), -+ m_cacheAge(600) ++ m_cacheAge(600), m_history(0), m_searchRole(Transaction::RoleUnknown) { From c81a0e6bf133f8ca51793f1ac1e7070a3fc02999 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 27 Apr 2015 15:05:35 -0500 Subject: [PATCH 067/111] whitespace typo --- apper-0.9.1-pk_cache_age.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper-0.9.1-pk_cache_age.patch b/apper-0.9.1-pk_cache_age.patch index 63a0ba5..e18aac7 100644 --- a/apper-0.9.1-pk_cache_age.patch +++ b/apper-0.9.1-pk_cache_age.patch @@ -7,7 +7,7 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age apper-0.9.1/apperd m_notification(0), - m_lastError(Transaction::ErrorUnknown) + m_lastError(Transaction::ErrorUnknown), -+ m_cacheAge (3600); ++ m_cacheAge(3600); { } From ae9e006a7b9157e682b6bad8580d9938a4a4816d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 27 Apr 2015 15:21:25 -0500 Subject: [PATCH 068/111] actually do test build, works now :) --- apper-0.9.1-pk_cache_age.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper-0.9.1-pk_cache_age.patch b/apper-0.9.1-pk_cache_age.patch index e18aac7..9f0ddf5 100644 --- a/apper-0.9.1-pk_cache_age.patch +++ b/apper-0.9.1-pk_cache_age.patch @@ -7,7 +7,7 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age apper-0.9.1/apperd m_notification(0), - m_lastError(Transaction::ErrorUnknown) + m_lastError(Transaction::ErrorUnknown), -+ m_cacheAge(3600); ++ m_cacheAge(3600) { } From 8b014bbac9c0c887a21f61cf3d481d343384a36d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 28 Apr 2015 10:01:55 -0500 Subject: [PATCH 069/111] use cache_age for updater applet too (#1188207) --- apper-0.9.1-pk_cache_age.patch | 66 +++++++++++++++++++++++++++------- apper.spec | 5 ++- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/apper-0.9.1-pk_cache_age.patch b/apper-0.9.1-pk_cache_age.patch index 9f0ddf5..a66574a 100644 --- a/apper-0.9.1-pk_cache_age.patch +++ b/apper-0.9.1-pk_cache_age.patch @@ -1,6 +1,6 @@ -diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age apper-0.9.1/apperd/RefreshCacheTask.cpp ---- apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/apperd/RefreshCacheTask.cpp 2015-04-27 14:25:21.663347177 -0500 +diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.orig apper-0.9.1/apperd/RefreshCacheTask.cpp +--- apper-0.9.1/apperd/RefreshCacheTask.cpp.orig 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/apperd/RefreshCacheTask.cpp 2015-04-28 09:54:49.676361482 -0500 @@ -33,7 +33,8 @@ RefreshCacheTask::RefreshCacheTask(QObje QObject(parent), m_transaction(0), @@ -19,9 +19,9 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age apper-0.9.1/apperd m_transaction = Daemon::refreshCache(false); connect(m_transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), this, SLOT(refreshCacheFinished(PackageKit::Transaction::Exit,uint))); -diff -up apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age apper-0.9.1/apperd/RefreshCacheTask.h ---- apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/apperd/RefreshCacheTask.h 2015-04-27 14:24:13.004451853 -0500 +diff -up apper-0.9.1/apperd/RefreshCacheTask.h.orig apper-0.9.1/apperd/RefreshCacheTask.h +--- apper-0.9.1/apperd/RefreshCacheTask.h.orig 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/apperd/RefreshCacheTask.h 2015-04-28 09:54:49.676361482 -0500 @@ -44,6 +44,7 @@ private: Transaction *m_transaction; KNotification *m_notification; @@ -30,9 +30,9 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age apper-0.9.1/apperd/R QString m_lastErrorString; }; -diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age apper-0.9.1/ApperKCM/ApperKCM.cpp ---- apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/ApperKCM/ApperKCM.cpp 2015-04-27 14:22:58.971449606 -0500 +diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.orig apper-0.9.1/ApperKCM/ApperKCM.cpp +--- apper-0.9.1/ApperKCM/ApperKCM.cpp.orig 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/ApperKCM/ApperKCM.cpp 2015-04-28 09:54:49.677361486 -0500 @@ -77,6 +77,7 @@ ApperKCM::ApperKCM(QWidget *parent, cons m_findIcon("edit-find"), m_cancelIcon("dialog-cancel"), @@ -49,9 +49,9 @@ diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age apper-0.9.1/ApperKCM/App transaction->refreshCache(m_forceRefreshCache); transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); -diff -up apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age apper-0.9.1/ApperKCM/ApperKCM.h ---- apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/ApperKCM/ApperKCM.h 2015-04-27 14:22:01.562706932 -0500 +diff -up apper-0.9.1/ApperKCM/ApperKCM.h.orig apper-0.9.1/ApperKCM/ApperKCM.h +--- apper-0.9.1/ApperKCM/ApperKCM.h.orig 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/ApperKCM/ApperKCM.h 2015-04-28 09:54:49.677361486 -0500 @@ -119,6 +119,7 @@ private: FiltersMenu *m_filtersMenu; Transaction::Roles m_roles; @@ -60,3 +60,45 @@ diff -up apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age apper-0.9.1/ApperKCM/Apper TransactionHistory *m_history; +diff -up apper-0.9.1/declarative-plugins/daemonhelper.cpp.orig apper-0.9.1/declarative-plugins/daemonhelper.cpp +--- apper-0.9.1/declarative-plugins/daemonhelper.cpp.orig 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/declarative-plugins/daemonhelper.cpp 2015-04-28 09:56:00.150621345 -0500 +@@ -32,3 +32,8 @@ uint DaemonHelper::getTimeSinceLastRefre + { + return Daemon::global()->getTimeSinceAction(Transaction::RoleRefreshCache); + } ++ ++void DaemonHelper::setCacheAge (int age) ++{ ++ Daemon::setHints(QLatin1String("cache-age=")+QString::number(age)); ++} +diff -up apper-0.9.1/declarative-plugins/daemonhelper.h.orig apper-0.9.1/declarative-plugins/daemonhelper.h +--- apper-0.9.1/declarative-plugins/daemonhelper.h.orig 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/declarative-plugins/daemonhelper.h 2015-04-28 09:55:29.216507280 -0500 +@@ -30,6 +30,7 @@ public: + + public slots: + uint getTimeSinceLastRefresh(); ++ void setCacheAge (int age); + }; + + #endif // DAEMONHELPER_H +diff -up apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml.orig apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml +--- apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml.orig 2014-08-25 13:51:50.000000000 -0500 ++++ apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml 2015-04-28 09:56:59.005838365 -0500 +@@ -27,6 +27,7 @@ FocusScope { + clip: true + + property int progressWidth: 30 ++ property int cacheAge: 600 + property alias transaction: updateTransaction + + signal finished(bool success); +@@ -38,6 +39,7 @@ FocusScope { + + function refreshCache() { + updateTransaction.enableJobWatcher(false); ++ DaemonHelper.setCacheAge(cacheAge); + updateTransaction.refreshCache(false); + } + diff --git a/apper.spec b/apper.spec index ae03de0..5f19ca5 100644 --- a/apper.spec +++ b/apper.spec @@ -10,7 +10,7 @@ Name: apper Version: 0.9.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -159,6 +159,9 @@ fi %changelog +* Tue Apr 28 2015 Rex Dieter 0.9.1-10 +- use cache_age for updater applet too (#1188207) + * Mon Apr 27 2015 Rex Dieter 0.9.1-9 - Apper won't check for updates (#1188207) From f28979907364cc246e98b700169534c27a1fcd1a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 May 2015 07:59:08 -0500 Subject: [PATCH 070/111] omit kded/apperd on plasma5/f22+ --- apper.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apper.spec b/apper.spec index 5f19ca5..faa1e03 100644 --- a/apper.spec +++ b/apper.spec @@ -10,7 +10,7 @@ Name: apper Version: 0.9.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -77,6 +77,7 @@ KDE interface for PackageKit. %if 0%{?plasma5} sed -e 's|^add_subdirectory(declarative-plugins)|#add_subdirectory(declarative-plugins)|g' \ + -d 's|^add_subdirectory(apperd)|#add_subdirectory(apperd)|g' \ -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \ -i CMakeLists.txt rm -fv po/*/plasma_applet_org.packagekit.updater.po @@ -136,17 +137,18 @@ fi %{_kde4_bindir}/apper %{_kde4_libdir}/apper/ %{_kde4_libdir}/kde4/kcm_apper.so -%{_kde4_libdir}/kde4/kded_apperd.so %{_kde4_datadir}/applications/kde4/apper.desktop %{_kde4_datadir}/applications/kde4/apper_*.desktop %{_kde4_datadir}/kde4/services/kcm_apper.desktop -%{_kde4_datadir}/kde4/services/kded/apperd.desktop %{_kde4_appsdir}/apper/ -%{_kde4_appsdir}/apperd/ %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service %{_kde4_libexecdir}/apper-pk-session %{_mandir}/man1/apper.1* %if ! 0%{?plasma5} +# apperd +%{_kde4_libdir}/kde4/kded_apperd.so +%{_kde4_datadir}/kde4/services/kded/apperd.desktop +%{_kde4_appsdir}/apperd/ # plasma-applet-updater %{_kde4_appsdir}/plasma/plasmoids/org.packagekit.updater/ %{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js @@ -159,6 +161,9 @@ fi %changelog +* Mon May 04 2015 Rex Dieter 0.9.1-11 +- omit kded/apperd on plasma5/f22+ + * Tue Apr 28 2015 Rex Dieter 0.9.1-10 - use cache_age for updater applet too (#1188207) From c9f06b4f396b157ec3cdc01b1ea202cf5b85f027 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 May 2015 08:24:40 -0500 Subject: [PATCH 071/111] typo --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index faa1e03..5957033 100644 --- a/apper.spec +++ b/apper.spec @@ -77,7 +77,7 @@ KDE interface for PackageKit. %if 0%{?plasma5} sed -e 's|^add_subdirectory(declarative-plugins)|#add_subdirectory(declarative-plugins)|g' \ - -d 's|^add_subdirectory(apperd)|#add_subdirectory(apperd)|g' \ + -e 's|^add_subdirectory(apperd)|#add_subdirectory(apperd)|g' \ -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \ -i CMakeLists.txt rm -fv po/*/plasma_applet_org.packagekit.updater.po From e62e443659be4a161ea369a328829f3299761379 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 00:50:33 +0000 Subject: [PATCH 072/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 5957033..d9c1d3f 100644 --- a/apper.spec +++ b/apper.spec @@ -10,7 +10,7 @@ Name: apper Version: 0.9.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -161,6 +161,9 @@ fi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.9.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon May 04 2015 Rex Dieter 0.9.1-11 - omit kded/apperd on plasma5/f22+ From 116aeedb213a25cb5ceaa514983f5c919ce6f01f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 28 Oct 2015 12:00:02 -0500 Subject: [PATCH 073/111] 0.9.2, upstream patches --- .gitignore | 2 +- 0004-trivial-Fix-dependency-on-gee.patch | 25 ---- ...atypes-for-the-plasmoid-as-that-thos.patch | 44 ------ ...ndle-dependencies-on-package-removal.patch | 26 ++++ ... => 0015-explicitly-set-PK-cache-age.patch | 125 +++++++++++------- ...to-return-an-error-if-it-doesn-t-sup.patch | 91 ------------- apper-0.9.1-allow_deps.patch | 12 -- apper.spec | 18 +-- sources | 2 +- 9 files changed, 114 insertions(+), 231 deletions(-) delete mode 100644 0004-trivial-Fix-dependency-on-gee.patch delete mode 100644 0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch create mode 100644 0014-handle-dependencies-on-package-removal.patch rename apper-0.9.1-pk_cache_age.patch => 0015-explicitly-set-PK-cache-age.patch (51%) delete mode 100644 0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch delete mode 100644 apper-0.9.1-allow_deps.patch diff --git a/.gitignore b/.gitignore index 432c32e..89b91fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/apper-0.9.1.tar.xz +/apper-0.9.2.tar.xz diff --git a/0004-trivial-Fix-dependency-on-gee.patch b/0004-trivial-Fix-dependency-on-gee.patch deleted file mode 100644 index dbbaa61..0000000 --- a/0004-trivial-Fix-dependency-on-gee.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f2664cf5a701153e438944af3d83a8d5a43e0c33 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Tue, 9 Sep 2014 01:58:44 +0200 -Subject: [PATCH 4/9] trivial: Fix dependency on gee - ---- - AppSetup/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/AppSetup/CMakeLists.txt b/AppSetup/CMakeLists.txt -index b4561ac..68a4f48 100644 ---- a/AppSetup/CMakeLists.txt -+++ b/AppSetup/CMakeLists.txt -@@ -1,7 +1,7 @@ - pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.36) - pkg_check_modules(LISTALLER REQUIRED listaller-glib>=0.5.8) - pkg_check_modules(APPSTREAM REQUIRED appstream>=0.6.2) --pkg_check_modules(GEE REQUIRED gee-1.0>=0.6) -+pkg_check_modules(GEE REQUIRED gee-0.8>=0.10) - - include_directories(${CMAKE_CURRENT_BINARY_DIR} - ${GLIB2_INCLUDE_DIR} --- -1.9.3 - diff --git a/0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch b/0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch deleted file mode 100644 index 9fb5c0c..0000000 --- a/0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 75b3d7d1587d4fe66ea8d157efc022f20d853dc1 Mon Sep 17 00:00:00 2001 -From: Raymond Wooninck -Date: Sat, 4 Oct 2014 20:15:21 +0200 -Subject: [PATCH 6/9] Register the metatypes for the plasmoid as that those - were removed from PackageKit-qt itself - -CCMAIL: dantti12@gmail.com ---- - declarative-plugins/qmlplugins.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/declarative-plugins/qmlplugins.cpp b/declarative-plugins/qmlplugins.cpp -index b39b3d2..d2b6f8d 100644 ---- a/declarative-plugins/qmlplugins.cpp -+++ b/declarative-plugins/qmlplugins.cpp -@@ -50,6 +50,25 @@ void QmlPlugins::registerTypes(const char* uri) - qmlRegisterType(uri, 0, 1, "Transaction"); - qmlRegisterUncreatableType(uri, 0, 1, "Daemon", "Global"); - qRegisterMetaType("PkTransaction::ExitStatus"); -+ qRegisterMetaType("PackageKit::Daemon::Network"); -+ qRegisterMetaType("PackageKit::Daemon::Authorize"); -+ qRegisterMetaType("PackageKit::Transaction::InternalError"); -+ qRegisterMetaType("PackageKit::Transaction::Role"); -+ qRegisterMetaType("PackageKit::Transaction::Error"); -+ qRegisterMetaType("PackageKit::Transaction::Exit"); -+ qRegisterMetaType("PackageKit::Transaction::Filter"); -+ qRegisterMetaType("PackageKit::Transaction::Message"); -+ qRegisterMetaType("PackageKit::Transaction::Status"); -+ qRegisterMetaType("PackageKit::Transaction::MediaType"); -+ qRegisterMetaType("PackageKit::Transaction::DistroUpgrade"); -+ qRegisterMetaType("PackageKit::Transaction::TransactionFlag"); -+ qRegisterMetaType("PackageKit::Transaction::TransactionFlags"); -+ qRegisterMetaType("PackageKit::Transaction::Restart"); -+ qRegisterMetaType("PackageKit::Transaction::UpdateState"); -+ qRegisterMetaType("PackageKit::Transaction::Group"); -+ qRegisterMetaType("PackageKit::Transaction::Info"); -+ qRegisterMetaType("PackageKit::Transaction::SigType"); -+ - } - - void QmlPlugins::initializeEngine(QDeclarativeEngine *engine, const char *uri) --- -1.9.3 - diff --git a/0014-handle-dependencies-on-package-removal.patch b/0014-handle-dependencies-on-package-removal.patch new file mode 100644 index 0000000..19a113b --- /dev/null +++ b/0014-handle-dependencies-on-package-removal.patch @@ -0,0 +1,26 @@ +From cc472bd1e3da2f79059e2e30e021d36f4f2b016a Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Wed, 28 Oct 2015 08:27:00 -0500 +Subject: [PATCH 14/15] handle dependencies on package removal + +BUG: 315063 +--- + libapper/PkTransaction.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp +index 75c9daa..c070810 100644 +--- a/libapper/PkTransaction.cpp ++++ b/libapper/PkTransaction.cpp +@@ -133,7 +133,7 @@ void PkTransaction::removePackages(const QStringList &packages) + { + // if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { + d->originalRole = Transaction::RoleRemovePackages; +- d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so ++ d->allowDeps = true; // *was* false, Default to avoid dependencies removal unless simulate says so, except for https://bugs.kde.org/show_bug.cgi?id=315063 + d->packages = packages; + d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; + +-- +1.9.3 + diff --git a/apper-0.9.1-pk_cache_age.patch b/0015-explicitly-set-PK-cache-age.patch similarity index 51% rename from apper-0.9.1-pk_cache_age.patch rename to 0015-explicitly-set-PK-cache-age.patch index a66574a..6b76692 100644 --- a/apper-0.9.1-pk_cache_age.patch +++ b/0015-explicitly-set-PK-cache-age.patch @@ -1,7 +1,59 @@ -diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.orig apper-0.9.1/apperd/RefreshCacheTask.cpp ---- apper-0.9.1/apperd/RefreshCacheTask.cpp.orig 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/apperd/RefreshCacheTask.cpp 2015-04-28 09:54:49.676361482 -0500 -@@ -33,7 +33,8 @@ RefreshCacheTask::RefreshCacheTask(QObje +From 0e13f4c2005235cd7e3d200f5382ca7725bb7431 Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Wed, 28 Oct 2015 08:28:41 -0500 +Subject: [PATCH 15/15] explicitly set PK cache-age + +Recent versions of PackageKit default to cache-age of infinity, since +https://github.com/hughsie/PackageKit/commit/1615ace6ea5f3348ab8c76b713809bbe5a450d23 + +REVIEW: 125840 +--- + ApperKCM/ApperKCM.cpp | 2 ++ + ApperKCM/ApperKCM.h | 1 + + apperd/RefreshCacheTask.cpp | 4 +++- + apperd/RefreshCacheTask.h | 1 + + declarative-plugins/daemonhelper.cpp | 5 +++++ + declarative-plugins/daemonhelper.h | 1 + + plasmoid/package/contents/ui/Transaction.qml | 2 ++ + 7 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp +index c0d8dc7..8cfe823 100644 +--- a/ApperKCM/ApperKCM.cpp ++++ b/ApperKCM/ApperKCM.cpp +@@ -78,6 +78,7 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : + m_findIcon("edit-find"), + m_cancelIcon("dialog-cancel"), + m_forceRefreshCache(false), ++ m_cacheAge(600), + m_history(0), + m_searchRole(Transaction::RoleUnknown) + { +@@ -761,6 +762,7 @@ void ApperKCM::refreshCache() + PkTransactionWidget *transactionW = new PkTransactionWidget(this); + connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); + QPointer transaction = new PkTransaction(transactionW); ++ Daemon::setHints (QLatin1String("cache-age=")+QString::number(m_cacheAge)); + transaction->refreshCache(m_forceRefreshCache); + transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); + +diff --git a/ApperKCM/ApperKCM.h b/ApperKCM/ApperKCM.h +index 317ba3a..18e9c70 100644 +--- a/ApperKCM/ApperKCM.h ++++ b/ApperKCM/ApperKCM.h +@@ -119,6 +119,7 @@ private: + FiltersMenu *m_filtersMenu; + Transaction::Roles m_roles; + bool m_forceRefreshCache; ++ uint m_cacheAge; + + TransactionHistory *m_history; + +diff --git a/apperd/RefreshCacheTask.cpp b/apperd/RefreshCacheTask.cpp +index c10aeec..7a6ee3f 100644 +--- a/apperd/RefreshCacheTask.cpp ++++ b/apperd/RefreshCacheTask.cpp +@@ -33,7 +33,8 @@ RefreshCacheTask::RefreshCacheTask(QObject *parent) : QObject(parent), m_transaction(0), m_notification(0), @@ -19,9 +71,10 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.orig apper-0.9.1/apperd/Refresh m_transaction = Daemon::refreshCache(false); connect(m_transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), this, SLOT(refreshCacheFinished(PackageKit::Transaction::Exit,uint))); -diff -up apper-0.9.1/apperd/RefreshCacheTask.h.orig apper-0.9.1/apperd/RefreshCacheTask.h ---- apper-0.9.1/apperd/RefreshCacheTask.h.orig 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/apperd/RefreshCacheTask.h 2015-04-28 09:54:49.676361482 -0500 +diff --git a/apperd/RefreshCacheTask.h b/apperd/RefreshCacheTask.h +index a10c78f..13859ff 100644 +--- a/apperd/RefreshCacheTask.h ++++ b/apperd/RefreshCacheTask.h @@ -44,6 +44,7 @@ private: Transaction *m_transaction; KNotification *m_notification; @@ -30,40 +83,11 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.h.orig apper-0.9.1/apperd/RefreshCa QString m_lastErrorString; }; -diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.orig apper-0.9.1/ApperKCM/ApperKCM.cpp ---- apper-0.9.1/ApperKCM/ApperKCM.cpp.orig 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/ApperKCM/ApperKCM.cpp 2015-04-28 09:54:49.677361486 -0500 -@@ -77,6 +77,7 @@ ApperKCM::ApperKCM(QWidget *parent, cons - m_findIcon("edit-find"), - m_cancelIcon("dialog-cancel"), - m_forceRefreshCache(false), -+ m_cacheAge(600), - m_history(0), - m_searchRole(Transaction::RoleUnknown) - { -@@ -760,6 +761,7 @@ void ApperKCM::refreshCache() - PkTransactionWidget *transactionW = new PkTransactionWidget(this); - connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); - QPointer transaction = new PkTransaction(transactionW); -+ Daemon::setHints (QLatin1String("cache-age=")+QString::number(m_cacheAge)); - transaction->refreshCache(m_forceRefreshCache); - transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); - -diff -up apper-0.9.1/ApperKCM/ApperKCM.h.orig apper-0.9.1/ApperKCM/ApperKCM.h ---- apper-0.9.1/ApperKCM/ApperKCM.h.orig 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/ApperKCM/ApperKCM.h 2015-04-28 09:54:49.677361486 -0500 -@@ -119,6 +119,7 @@ private: - FiltersMenu *m_filtersMenu; - Transaction::Roles m_roles; - bool m_forceRefreshCache; -+ uint m_cacheAge; - - TransactionHistory *m_history; - -diff -up apper-0.9.1/declarative-plugins/daemonhelper.cpp.orig apper-0.9.1/declarative-plugins/daemonhelper.cpp ---- apper-0.9.1/declarative-plugins/daemonhelper.cpp.orig 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/declarative-plugins/daemonhelper.cpp 2015-04-28 09:56:00.150621345 -0500 -@@ -32,3 +32,8 @@ uint DaemonHelper::getTimeSinceLastRefre +diff --git a/declarative-plugins/daemonhelper.cpp b/declarative-plugins/daemonhelper.cpp +index 9e5dc97..df6740e 100644 +--- a/declarative-plugins/daemonhelper.cpp ++++ b/declarative-plugins/daemonhelper.cpp +@@ -32,3 +32,8 @@ uint DaemonHelper::getTimeSinceLastRefresh() { return Daemon::global()->getTimeSinceAction(Transaction::RoleRefreshCache); } @@ -72,20 +96,22 @@ diff -up apper-0.9.1/declarative-plugins/daemonhelper.cpp.orig apper-0.9.1/decla +{ + Daemon::setHints(QLatin1String("cache-age=")+QString::number(age)); +} -diff -up apper-0.9.1/declarative-plugins/daemonhelper.h.orig apper-0.9.1/declarative-plugins/daemonhelper.h ---- apper-0.9.1/declarative-plugins/daemonhelper.h.orig 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/declarative-plugins/daemonhelper.h 2015-04-28 09:55:29.216507280 -0500 +diff --git a/declarative-plugins/daemonhelper.h b/declarative-plugins/daemonhelper.h +index 469a481..b49d292 100644 +--- a/declarative-plugins/daemonhelper.h ++++ b/declarative-plugins/daemonhelper.h @@ -30,6 +30,7 @@ public: - public slots: + public Q_SLOTS: uint getTimeSinceLastRefresh(); + void setCacheAge (int age); }; #endif // DAEMONHELPER_H -diff -up apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml.orig apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml ---- apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml.orig 2014-08-25 13:51:50.000000000 -0500 -+++ apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml 2015-04-28 09:56:59.005838365 -0500 +diff --git a/plasmoid/package/contents/ui/Transaction.qml b/plasmoid/package/contents/ui/Transaction.qml +index f16409f..9153365 100644 +--- a/plasmoid/package/contents/ui/Transaction.qml ++++ b/plasmoid/package/contents/ui/Transaction.qml @@ -27,6 +27,7 @@ FocusScope { clip: true @@ -102,3 +128,6 @@ diff -up apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml.orig apper-0.9 updateTransaction.refreshCache(false); } +-- +1.9.3 + diff --git a/0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch b/0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch deleted file mode 100644 index c076173..0000000 --- a/0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 21d93baaf5b89a076cb128566e1ff004153f1e6a Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Mon, 15 Dec 2014 18:03:40 -0200 -Subject: [PATCH 26/26] Let the Backend to return an error if it doesn't - support the fetures we need - ---- - libapper/PkTransaction.cpp | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp -index bce515e..c3030a6 100644 ---- a/libapper/PkTransaction.cpp -+++ b/libapper/PkTransaction.cpp -@@ -108,47 +108,47 @@ PkTransaction::~PkTransaction() - - void PkTransaction::installFiles(const QStringList &files) - { -- if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { -+// if (Daemon::global()->roles() & Transaction::RoleInstallFiles) { - d->originalRole = Transaction::RoleInstallFiles; - d->files = files; - d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; - - setupTransaction(Daemon::installFiles(files, d->flags)); -- } else { -- showError(i18n("Current backend does not support installing files."), i18n("Error")); -- } -+// } else { -+// showError(i18n("Current backend does not support installing files."), i18n("Error")); -+// } - } - - void PkTransaction::installPackages(const QStringList &packages) - { -- if (Daemon::global()->roles() & Transaction::RoleInstallPackages) { -+// if (Daemon::global()->roles() & Transaction::RoleInstallPackages) { - d->originalRole = Transaction::RoleInstallPackages; - d->packages = packages; - d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; - - setupTransaction(Daemon::installPackages(d->packages, d->flags)); -- } else { -- showError(i18n("Current backend does not support installing packages."), i18n("Error")); -- } -+// } else { -+// showError(i18n("Current backend does not support installing packages."), i18n("Error")); -+// } - } - - void PkTransaction::removePackages(const QStringList &packages) - { -- if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { -+// if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { - d->originalRole = Transaction::RoleRemovePackages; - d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so - d->packages = packages; - d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; - - setupTransaction(Daemon::removePackages(d->packages, d->allowDeps, AUTOREMOVE, d->flags)); -- } else { -- showError(i18n("The current backend does not support removing packages."), i18n("Error")); -- } -+// } else { -+// showError(i18n("The current backend does not support removing packages."), i18n("Error")); -+// } - } - - void PkTransaction::updatePackages(const QStringList &packages, bool downloadOnly) - { -- if (Daemon::global()->roles() & Transaction::RoleUpdatePackages) { -+// if (Daemon::global()->roles() & Transaction::RoleUpdatePackages) { - d->originalRole = Transaction::RoleUpdatePackages; - d->packages = packages; - if (downloadOnly) { -@@ -159,9 +159,9 @@ void PkTransaction::updatePackages(const QStringList &packages, bool downloadOnl - } - - setupTransaction(Daemon::updatePackages(d->packages, d->flags)); -- } else { -- showError(i18n("The current backend does not support updating packages."), i18n("Error")); -- } -+// } else { -+// showError(i18n("The current backend does not support updating packages."), i18n("Error")); -+// } - } - - void PkTransaction::refreshCache(bool force) --- -2.1.0 - diff --git a/apper-0.9.1-allow_deps.patch b/apper-0.9.1-allow_deps.patch deleted file mode 100644 index 868d274..0000000 --- a/apper-0.9.1-allow_deps.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up apper-0.9.1/libapper/PkTransaction.cpp.allow_deps apper-0.9.1/libapper/PkTransaction.cpp ---- apper-0.9.1/libapper/PkTransaction.cpp.allow_deps 2014-12-06 13:03:13.509607955 -0600 -+++ apper-0.9.1/libapper/PkTransaction.cpp 2014-12-06 13:05:02.574126072 -0600 -@@ -136,7 +136,7 @@ void PkTransaction::removePackages(const - { - if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { - d->originalRole = Transaction::RoleRemovePackages; -- d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so -+ d->allowDeps = true; // Default to avoid dependencies removal unless simulate says so - d->packages = packages; - d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; - diff --git a/apper.spec b/apper.spec index d9c1d3f..ebe83af 100644 --- a/apper.spec +++ b/apper.spec @@ -9,9 +9,9 @@ %endif Name: apper -Version: 0.9.1 -Release: 12%{?dist} Summary: KDE interface for PackageKit +Version: 0.9.2 +Release: 1%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -27,17 +27,14 @@ URL: https://projects.kde.org/projects/extragear/sysadmin/apper Source10: 01-fedora-org.packagekit.updater.js ## upstream patches -Patch04: 0004-trivial-Fix-dependency-on-gee.patch -Patch06: 0006-Register-the-metatypes-for-the-plasmoid-as-that-thos.patch -Patch26: 0026-Let-the-Backend-to-return-an-error-if-it-doesn-t-sup.patch - -## upstreamable patches # -hif (and yum?) backends apparently do not support !allow_deps at all, so don't try # https://bugzilla.redhat.com/show_bug.cgi?id=877038 # http://bugs.kde.org/show_bug.cgi?id=315063 -Patch50: apper-0.9.1-allow_deps.patch +Patch14: 0014-handle-dependencies-on-package-removal.patch # explicitly set PackageKit cache-age parameter, since PK defaults to something silly like inifinity. -Patch51: apper-0.9.1-pk_cache_age.patch +Patch15: 0015-explicitly-set-PK-cache-age.patch + +## upstreamable patches Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -161,6 +158,9 @@ fi %changelog +* Wed Oct 28 2015 Rex Dieter 0.9.2-1 +- 0.9.2, upstream patches + * Wed Jun 17 2015 Fedora Release Engineering - 0.9.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 4f1d80b..672392d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cb2d739decb876744c4194562cb8d32 apper-0.9.1.tar.xz +58a49ef36393c412be4b00bd62f79985 apper-0.9.2.tar.xz From d3a21facd41d1a7e6753447a039971b4c540c219 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 29 Oct 2015 18:45:55 -0500 Subject: [PATCH 074/111] .spec cosmetics, use %license, (explicitly) Requires: PackageKit --- apper.spec | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/apper.spec b/apper.spec index ebe83af..a0c5083 100644 --- a/apper.spec +++ b/apper.spec @@ -1,5 +1,3 @@ -%define pk_min_version 0.9.2 - ## appstream disabled, just not ready yet, ## https://bugzilla.redhat.com/1180819#c20 #define appstream 1 @@ -11,7 +9,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -52,15 +50,12 @@ BuildRequires: pkgconfig(appstream) #Requires: appstream-data %endif BuildRequires: pkgconfig(dbus-1) -%if 0%{?pk_version:1} -BuildRequires: PackageKit-Qt-devel >= %{pk_version} -%else -BuildRequires: pkgconfig(packagekitqt4) >= %{pk_min_version} -%global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo %{pk_min_version}) -%endif +BuildRequires: pkgconfig(packagekitqt4) >= 0.9.2 +%global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo 0.9.2) %{?kde_runtime_requires} Requires: PackageKit-Qt%{?_isa} >= %{pk_version} +Requires: PackageKit %if 0%{?plasma5} Requires: plasma-pk-updates %endif @@ -82,7 +77,7 @@ rm -fv po/*/plasma_applet_org.packagekit.updater.po %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ %{?appinstall:-DAPPINSTALL:BOOL=ON} \ @@ -95,7 +90,6 @@ make %{?_smp_mflags} -C %{_target_platform} %install - make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %find_lang apper --all-name --with-kde || echo "WARNING: missing translations" @@ -130,7 +124,8 @@ update-desktop-database -q 2> /dev/null ||: fi %files -f apper.lang -%doc COPYING TODO +%doc TODO +%license COPYING %{_kde4_bindir}/apper %{_kde4_libdir}/apper/ %{_kde4_libdir}/kde4/kcm_apper.so @@ -158,6 +153,9 @@ fi %changelog +* Thu Oct 29 2015 Rex Dieter 0.9.2-2 +- .spec cosmetics, use %%license, (explicitly) Requires: PackageKit + * Wed Oct 28 2015 Rex Dieter 0.9.2-1 - 0.9.2, upstream patches From 9291af7897e0ef4e26a528c0a3e6f9b79ca89b0a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 29 Oct 2015 20:11:18 -0500 Subject: [PATCH 075/111] rebuild (PackageKit-Qt) --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index a0c5083..012fb08 100644 --- a/apper.spec +++ b/apper.spec @@ -9,7 +9,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -153,6 +153,9 @@ fi %changelog +* Thu Oct 29 2015 Rex Dieter 0.9.2-3 +- rebuild (PackageKit-Qt) + * Thu Oct 29 2015 Rex Dieter 0.9.2-2 - .spec cosmetics, use %%license, (explicitly) Requires: PackageKit From c8e79f657a6925f2bec0dbd3c2d4e9f56e1f72c3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 17 Dec 2015 14:13:34 -0600 Subject: [PATCH 076/111] (unversioned) Requires: kde-runtime --- apper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apper.spec b/apper.spec index 012fb08..43b074f 100644 --- a/apper.spec +++ b/apper.spec @@ -9,7 +9,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -53,7 +53,7 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(packagekitqt4) >= 0.9.2 %global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo 0.9.2) -%{?kde_runtime_requires} +Requires: kde-runtime Requires: PackageKit-Qt%{?_isa} >= %{pk_version} Requires: PackageKit %if 0%{?plasma5} @@ -153,6 +153,9 @@ fi %changelog +* Thu Dec 17 2015 Rex Dieter 0.9.2-4 +- (unversioned) Requires: kde-runtime + * Thu Oct 29 2015 Rex Dieter 0.9.2-3 - rebuild (PackageKit-Qt) From 6610d5c25bf923462bf4c5c1b0e882b63c412156 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:22:29 +0000 Subject: [PATCH 077/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 43b074f..7ecde63 100644 --- a/apper.spec +++ b/apper.spec @@ -9,7 +9,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -153,6 +153,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.9.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Dec 17 2015 Rex Dieter 0.9.2-4 - (unversioned) Requires: kde-runtime From 08dfb5ff392d8697b33a30ef4909740f655840cf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 5 May 2016 08:18:19 -0500 Subject: [PATCH 078/111] hard-code style (plastique/oxygen) to workaround UI glitches (#1209017) --- apper-0.9.2-style.patch | 14 ++++++++++++++ apper.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 apper-0.9.2-style.patch diff --git a/apper-0.9.2-style.patch b/apper-0.9.2-style.patch new file mode 100644 index 0000000..ee2f6d6 --- /dev/null +++ b/apper-0.9.2-style.patch @@ -0,0 +1,14 @@ +diff -up apper-0.9.2/Apper/main.cpp.style apper-0.9.2/Apper/main.cpp +--- apper-0.9.2/Apper/main.cpp.style 2016-05-05 08:01:51.686047737 -0500 ++++ apper-0.9.2/Apper/main.cpp 2016-05-05 08:08:44.685622848 -0500 +@@ -127,5 +127,10 @@ int main(int argc, char **argv) + + Apper app; + ++ if ( ! qgetenv("KDE_FULL_SESSION").isEmpty() ) { ++ app.setStyle(QString("cleanlooks")); ++ app.setStyle(QString("oxygen")); ++ } ++ + return app.exec(); + } diff --git a/apper.spec b/apper.spec index 7ecde63..f57ca70 100644 --- a/apper.spec +++ b/apper.spec @@ -9,7 +9,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -33,6 +33,8 @@ Patch14: 0014-handle-dependencies-on-package-removal.patch Patch15: 0015-explicitly-set-PK-cache-age.patch ## upstreamable patches +# hardcode known-good styles +Patch100: apper-0.9.2-style.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -153,6 +155,9 @@ fi %changelog +* Thu May 05 2016 Rex Dieter - 0.9.2-6 +- hard-code style (plastique/oxygen) to workaround UI glitches (#1209017) + * Wed Feb 03 2016 Fedora Release Engineering - 0.9.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From fe6ea754e4fd32e42556f15c78997a12dffdb597 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 5 May 2016 12:36:10 -0500 Subject: [PATCH 079/111] %%autosetup (on rawhide) uses default patch flags now and at least 1 needs fuzz --- apper.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apper.spec b/apper.spec index f57ca70..23b5c4c 100644 --- a/apper.spec +++ b/apper.spec @@ -24,6 +24,8 @@ URL: https://projects.kde.org/projects/extragear/sysadmin/apper # plasma js to enable apper plasma applet Source10: 01-fedora-org.packagekit.updater.js +%global _default_patch_fuzz 2 + ## upstream patches # -hif (and yum?) backends apparently do not support !allow_deps at all, so don't try # https://bugzilla.redhat.com/show_bug.cgi?id=877038 From d582772e300673115ad180bc589e7ed45b83101d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 2 Jun 2016 13:13:59 -0500 Subject: [PATCH 080/111] master/ branch snapshot, kf5-based --- .gitignore | 1 + ...ndle-dependencies-on-package-removal.patch | 26 ---- 0015-explicitly-set-PK-cache-age.patch | 133 ---------------- 01-fedora-org.packagekit.updater.js | 51 ------ apper-0.9.2-style.patch | 14 -- apper-0.9.3-style.patch | 13 ++ apper.sh | 16 ++ apper.spec | 146 +++++++----------- sources | 2 +- 9 files changed, 88 insertions(+), 314 deletions(-) delete mode 100644 0014-handle-dependencies-on-package-removal.patch delete mode 100644 0015-explicitly-set-PK-cache-age.patch delete mode 100644 01-fedora-org.packagekit.updater.js delete mode 100644 apper-0.9.2-style.patch create mode 100644 apper-0.9.3-style.patch create mode 100644 apper.sh diff --git a/.gitignore b/.gitignore index 89b91fb..914433e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /apper-0.9.2.tar.xz +/apper-0.9.3-20160329git.tar.xz diff --git a/0014-handle-dependencies-on-package-removal.patch b/0014-handle-dependencies-on-package-removal.patch deleted file mode 100644 index 19a113b..0000000 --- a/0014-handle-dependencies-on-package-removal.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cc472bd1e3da2f79059e2e30e021d36f4f2b016a Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Wed, 28 Oct 2015 08:27:00 -0500 -Subject: [PATCH 14/15] handle dependencies on package removal - -BUG: 315063 ---- - libapper/PkTransaction.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp -index 75c9daa..c070810 100644 ---- a/libapper/PkTransaction.cpp -+++ b/libapper/PkTransaction.cpp -@@ -133,7 +133,7 @@ void PkTransaction::removePackages(const QStringList &packages) - { - // if (Daemon::global()->roles() & Transaction::RoleRemovePackages) { - d->originalRole = Transaction::RoleRemovePackages; -- d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so -+ d->allowDeps = true; // *was* false, Default to avoid dependencies removal unless simulate says so, except for https://bugs.kde.org/show_bug.cgi?id=315063 - d->packages = packages; - d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate; - --- -1.9.3 - diff --git a/0015-explicitly-set-PK-cache-age.patch b/0015-explicitly-set-PK-cache-age.patch deleted file mode 100644 index 6b76692..0000000 --- a/0015-explicitly-set-PK-cache-age.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 0e13f4c2005235cd7e3d200f5382ca7725bb7431 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Wed, 28 Oct 2015 08:28:41 -0500 -Subject: [PATCH 15/15] explicitly set PK cache-age - -Recent versions of PackageKit default to cache-age of infinity, since -https://github.com/hughsie/PackageKit/commit/1615ace6ea5f3348ab8c76b713809bbe5a450d23 - -REVIEW: 125840 ---- - ApperKCM/ApperKCM.cpp | 2 ++ - ApperKCM/ApperKCM.h | 1 + - apperd/RefreshCacheTask.cpp | 4 +++- - apperd/RefreshCacheTask.h | 1 + - declarative-plugins/daemonhelper.cpp | 5 +++++ - declarative-plugins/daemonhelper.h | 1 + - plasmoid/package/contents/ui/Transaction.qml | 2 ++ - 7 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/ApperKCM/ApperKCM.cpp b/ApperKCM/ApperKCM.cpp -index c0d8dc7..8cfe823 100644 ---- a/ApperKCM/ApperKCM.cpp -+++ b/ApperKCM/ApperKCM.cpp -@@ -78,6 +78,7 @@ ApperKCM::ApperKCM(QWidget *parent, const QVariantList &args) : - m_findIcon("edit-find"), - m_cancelIcon("dialog-cancel"), - m_forceRefreshCache(false), -+ m_cacheAge(600), - m_history(0), - m_searchRole(Transaction::RoleUnknown) - { -@@ -761,6 +762,7 @@ void ApperKCM::refreshCache() - PkTransactionWidget *transactionW = new PkTransactionWidget(this); - connect(transactionW, SIGNAL(titleChangedProgress(QString)), this, SIGNAL(caption(QString))); - QPointer transaction = new PkTransaction(transactionW); -+ Daemon::setHints (QLatin1String("cache-age=")+QString::number(m_cacheAge)); - transaction->refreshCache(m_forceRefreshCache); - transactionW->setTransaction(transaction, Transaction::RoleRefreshCache); - -diff --git a/ApperKCM/ApperKCM.h b/ApperKCM/ApperKCM.h -index 317ba3a..18e9c70 100644 ---- a/ApperKCM/ApperKCM.h -+++ b/ApperKCM/ApperKCM.h -@@ -119,6 +119,7 @@ private: - FiltersMenu *m_filtersMenu; - Transaction::Roles m_roles; - bool m_forceRefreshCache; -+ uint m_cacheAge; - - TransactionHistory *m_history; - -diff --git a/apperd/RefreshCacheTask.cpp b/apperd/RefreshCacheTask.cpp -index c10aeec..7a6ee3f 100644 ---- a/apperd/RefreshCacheTask.cpp -+++ b/apperd/RefreshCacheTask.cpp -@@ -33,7 +33,8 @@ RefreshCacheTask::RefreshCacheTask(QObject *parent) : - QObject(parent), - m_transaction(0), - m_notification(0), -- m_lastError(Transaction::ErrorUnknown) -+ m_lastError(Transaction::ErrorUnknown), -+ m_cacheAge(3600) - { - } - -@@ -43,6 +44,7 @@ void RefreshCacheTask::refreshCache() - if (!m_transaction) { - // Refresh Cache is false otherwise it will rebuild - // the whole cache on Fedora -+ Daemon::setHints (QLatin1String("cache-age=")+QString::number(m_cacheAge)); - m_transaction = Daemon::refreshCache(false); - connect(m_transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)), - this, SLOT(refreshCacheFinished(PackageKit::Transaction::Exit,uint))); -diff --git a/apperd/RefreshCacheTask.h b/apperd/RefreshCacheTask.h -index a10c78f..13859ff 100644 ---- a/apperd/RefreshCacheTask.h -+++ b/apperd/RefreshCacheTask.h -@@ -44,6 +44,7 @@ private: - Transaction *m_transaction; - KNotification *m_notification; - Transaction::Error m_lastError; -+ uint m_cacheAge; - QString m_lastErrorString; - }; - -diff --git a/declarative-plugins/daemonhelper.cpp b/declarative-plugins/daemonhelper.cpp -index 9e5dc97..df6740e 100644 ---- a/declarative-plugins/daemonhelper.cpp -+++ b/declarative-plugins/daemonhelper.cpp -@@ -32,3 +32,8 @@ uint DaemonHelper::getTimeSinceLastRefresh() - { - return Daemon::global()->getTimeSinceAction(Transaction::RoleRefreshCache); - } -+ -+void DaemonHelper::setCacheAge (int age) -+{ -+ Daemon::setHints(QLatin1String("cache-age=")+QString::number(age)); -+} -diff --git a/declarative-plugins/daemonhelper.h b/declarative-plugins/daemonhelper.h -index 469a481..b49d292 100644 ---- a/declarative-plugins/daemonhelper.h -+++ b/declarative-plugins/daemonhelper.h -@@ -30,6 +30,7 @@ public: - - public Q_SLOTS: - uint getTimeSinceLastRefresh(); -+ void setCacheAge (int age); - }; - - #endif // DAEMONHELPER_H -diff --git a/plasmoid/package/contents/ui/Transaction.qml b/plasmoid/package/contents/ui/Transaction.qml -index f16409f..9153365 100644 ---- a/plasmoid/package/contents/ui/Transaction.qml -+++ b/plasmoid/package/contents/ui/Transaction.qml -@@ -27,6 +27,7 @@ FocusScope { - clip: true - - property int progressWidth: 30 -+ property int cacheAge: 600 - property alias transaction: updateTransaction - - signal finished(bool success); -@@ -38,6 +39,7 @@ FocusScope { - - function refreshCache() { - updateTransaction.enableJobWatcher(false); -+ DaemonHelper.setCacheAge(cacheAge); - updateTransaction.refreshCache(false); - } - --- -1.9.3 - diff --git a/01-fedora-org.packagekit.updater.js b/01-fedora-org.packagekit.updater.js deleted file mode 100644 index 8f201aa..0000000 --- a/01-fedora-org.packagekit.updater.js +++ /dev/null @@ -1,51 +0,0 @@ -/* - 01-fedora-apper.js - Add Apper updater plasmoid to the systray - Copyright (C) 2010-2012 Kevin Kofler - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - Portions lifted from 01-kubuntu-10.04.js: - Harald Sitter, apachelogger@ubuntu.com 2010-04-02 - Jonathan Riddell, jriddell@ubuntu.com 2010-02-18 - Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later -*/ - -if (userDataPath() != "/home/liveuser") { - -systrayFound = false; -pids = panelIds; -for (i = 0; i < pids.length; ++i) { - p = panelById(pids[i]); - if (!p) continue; - ids = p.widgetIds; - for (j = 0; j < ids.length; ++j) { - w = p.widgetById(ids[j]); - if (!w || w.type != "systemtray") continue; - systrayFound = true; - w.currentConfigGroup = new Array("Applets"); - max = 0; - for (k = 0; k < w.configGroups.length; ++k) - if (parseInt(w.configGroups[k]) > max) - max = parseInt(w.configGroups[k]); - w.currentConfigGroup = new Array("Applets", max + 1); - w.writeConfig("plugin", "org.packagekit.updater"); - print("Apper updater plasmoid added to the systray"); - break; - } - if (systrayFound) break; -} -if (!systrayFound) - print("No systray found"); - -} diff --git a/apper-0.9.2-style.patch b/apper-0.9.2-style.patch deleted file mode 100644 index ee2f6d6..0000000 --- a/apper-0.9.2-style.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up apper-0.9.2/Apper/main.cpp.style apper-0.9.2/Apper/main.cpp ---- apper-0.9.2/Apper/main.cpp.style 2016-05-05 08:01:51.686047737 -0500 -+++ apper-0.9.2/Apper/main.cpp 2016-05-05 08:08:44.685622848 -0500 -@@ -127,5 +127,10 @@ int main(int argc, char **argv) - - Apper app; - -+ if ( ! qgetenv("KDE_FULL_SESSION").isEmpty() ) { -+ app.setStyle(QString("cleanlooks")); -+ app.setStyle(QString("oxygen")); -+ } -+ - return app.exec(); - } diff --git a/apper-0.9.3-style.patch b/apper-0.9.3-style.patch new file mode 100644 index 0000000..395808a --- /dev/null +++ b/apper-0.9.3-style.patch @@ -0,0 +1,13 @@ +diff -up apper-0.9.3/Apper/main.cpp.style apper-0.9.3/Apper/main.cpp +--- apper-0.9.3/Apper/main.cpp.style 2016-03-29 09:11:50.000000000 -0500 ++++ apper-0.9.3/Apper/main.cpp 2016-05-12 13:43:40.037400293 -0500 +@@ -49,5 +49,9 @@ int main(int argc, char **argv) + + app.activate(app.arguments(), QDir::currentPath()); + ++ if ( ! qgetenv("KDE_FULL_SESSION").isEmpty() ) { ++ app.setStyle(QString("fusion")); ++ } ++ + return app.exec(); + } diff --git a/apper.sh b/apper.sh new file mode 100644 index 0000000..1a528eb --- /dev/null +++ b/apper.sh @@ -0,0 +1,16 @@ +MODULE=apper +VERSION=0.9.3 +DATE=$(date +%Y%m%d)git + +set -x + +rm -rf $MODULE + +git clone kde:$MODULE +pushd $MODULE +git archive master --format tar --prefix=${MODULE}-${VERSION}/ | xz -9 > ../${MODULE}-${VERSION}-${DATE}.tar.xz +popd + +rm -rf $MODULE + + diff --git a/apper.spec b/apper.spec index 23b5c4c..4a410fa 100644 --- a/apper.spec +++ b/apper.spec @@ -1,42 +1,24 @@ -## appstream disabled, just not ready yet, -## https://bugzilla.redhat.com/1180819#c20 -#define appstream 1 -%if 0%{?fedora} > 21 -%define plasma5 1 -%endif +%global snap 20160329 Name: apper Summary: KDE interface for PackageKit -Version: 0.9.2 -Release: 6%{?dist} +Version: 0.9.3 +Release: 0.1.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} -# use releaseme/apper.rc -Source0: apper-%{version}-%{snap}.tar.xz +Source0: apper-%{version}-%{snap}git.tar.xz %else -Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.xz +Source0: http://download.kde.org/stable/apper/%{version}/src/apper-0.9.2.tar.xz %endif -URL: https://projects.kde.org/projects/extragear/sysadmin/apper -#URL: http://kde-apps.org/content/show.php/Apper?content=84745 - -# plasma js to enable apper plasma applet -Source10: 01-fedora-org.packagekit.updater.js - -%global _default_patch_fuzz 2 +URL: https://quickgit.kde.org/?p=%{name}.git ## upstream patches -# -hif (and yum?) backends apparently do not support !allow_deps at all, so don't try -# https://bugzilla.redhat.com/show_bug.cgi?id=877038 -# http://bugs.kde.org/show_bug.cgi?id=315063 -Patch14: 0014-handle-dependencies-on-package-removal.patch -# explicitly set PackageKit cache-age parameter, since PK defaults to something silly like inifinity. -Patch15: 0015-explicitly-set-PK-cache-age.patch ## upstreamable patches -# hardcode known-good styles -Patch100: apper-0.9.2-style.patch +# hardcode known-good styles (fusion) +Patch100: apper-0.9.3-style.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -46,48 +28,48 @@ Provides: PackageKit-session-service BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: kdelibs4-devel -BuildRequires: kde-workspace-devel -%if 0%{?appstream:1} -BuildRequires: pkgconfig(appstream) -## http://bugzilla.redhat.com/1026117 -#Requires: appstream-data -%endif -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(packagekitqt4) >= 0.9.2 -%global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo 0.9.2) +BuildRequires: cmake(KDED) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(LibKWorkspace) + +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(packagekitqt5) -Requires: kde-runtime -Requires: PackageKit-Qt%{?_isa} >= %{pk_version} Requires: PackageKit -%if 0%{?plasma5} -Requires: plasma-pk-updates -%endif %description KDE interface for PackageKit. +%package updater +Summary: Apper plasma updater applet +Requires: %{name} = %{version}-%{release} +%description updater +%{summary}. + %prep %autosetup -p1 -%if 0%{?plasma5} -sed -e 's|^add_subdirectory(declarative-plugins)|#add_subdirectory(declarative-plugins)|g' \ - -e 's|^add_subdirectory(apperd)|#add_subdirectory(apperd)|g' \ - -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \ - -i CMakeLists.txt -rm -fv po/*/plasma_applet_org.packagekit.updater.po -%endif +# disable update applet by default +sed -i \ + -e 's|X-KDE-PluginInfo-EnabledByDefault=.*|X-KDE-PluginInfo-EnabledByDefault=false|g' \ + plasmoid/package/metadata.desktop %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} \ - %{?appinstall:-DAPPINSTALL:BOOL=ON} \ +%{cmake_kf5} .. \ %{?appstream:-DAPPSTREAM:BOOL=ON} \ - -DAUTOREMOVE:BOOL=OFF \ - .. + -DAUTOREMOVE:BOOL=OFF popd make %{?_smp_mflags} -C %{_target_platform} @@ -96,27 +78,13 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang apper --all-name --with-kde || echo "WARNING: missing translations" - # hack around gnome-packagekit conflict mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ %{buildroot}%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -# hack around rpath oddness -chrpath --list %{buildroot}%{_kde4_bindir}/apper -chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper - -%if ! 0%{?plasma5} -# show apper updater systray applet by default -install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js -mkdir -p %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/ -ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js \ - %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js -%endif - %check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.desktop +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/apper.desktop %posttrans @@ -127,36 +95,36 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q 2> /dev/null ||: fi -%files -f apper.lang +%files %doc TODO %license COPYING -%{_kde4_bindir}/apper -%{_kde4_libdir}/apper/ -%{_kde4_libdir}/kde4/kcm_apper.so -%{_kde4_datadir}/applications/kde4/apper.desktop -%{_kde4_datadir}/applications/kde4/apper_*.desktop -%{_kde4_datadir}/kde4/services/kcm_apper.desktop -%{_kde4_appsdir}/apper/ +%{_kf5_bindir}/apper +%{_kf5_datadir}/apper/ +%{_kf5_datadir}/applications/apper.desktop +%{_kf5_datadir}/applications/apper_installer.desktop +%{_kf5_datadir}/applications/apper_settings.desktop +%{_kf5_datadir}/applications/apper_updates.desktop +%{_kf5_libdir}/apper/ +%{_qt5_importdir}/org/kde/apper/ +%{_libexecdir}/apper-pk-session %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -%{_kde4_libexecdir}/apper-pk-session +%{_kf5_qtplugindir}/kcm_apper.so +%{_kf5_datadir}/kservices5/kcm_apper.desktop +%{_kf5_qtplugindir}/kded_apperd.so +%{_kf5_datadir}/kservices5/kded/apperd.desktop +%{_kf5_datadir}/apperd/ %{_mandir}/man1/apper.1* -%if ! 0%{?plasma5} -# apperd -%{_kde4_libdir}/kde4/kded_apperd.so -%{_kde4_datadir}/kde4/services/kded/apperd.desktop -%{_kde4_appsdir}/apperd/ -# plasma-applet-updater -%{_kde4_appsdir}/plasma/plasmoids/org.packagekit.updater/ -%{_kde4_appsdir}/plasma-desktop/init/01-fedora-org.packagekit.updater.js -%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-org.packagekit.updater.js -%{_kde4_datadir}/kde4/services/plasma-applet-org.packagekit.updater.desktop -%{_kde4_libdir}/kde4/imports/org/kde/apper/ -%endif -# appdata %{_datadir}/appdata/apper.appdata.xml +%files updater +%{_kf5_datadir}/kservices5/plasma-applet-org.packagekit.updater.desktop +%{_kf5_datadir}/plasma/plasmoids/org.packagekit.updater/ + %changelog +* Thu Jun 02 2016 Rex Dieter - 0.9.3-0.1.20160329 +- master/ branch snapshot, kf5-based + * Thu May 05 2016 Rex Dieter - 0.9.2-6 - hard-code style (plastique/oxygen) to workaround UI glitches (#1209017) diff --git a/sources b/sources index 672392d..e389090 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58a49ef36393c412be4b00bd62f79985 apper-0.9.2.tar.xz +f6bfad2525ab1e843dd0305ed4da7474 apper-0.9.3-20160329git.tar.xz From 081dd58301c849a563e9ef520cb419b9bae93712 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 2 Jun 2016 13:26:30 -0500 Subject: [PATCH 081/111] BR: ecm kf5-rpm-macros --- apper.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apper.spec b/apper.spec index 4a410fa..3f77df6 100644 --- a/apper.spec +++ b/apper.spec @@ -39,6 +39,8 @@ BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5KDELibs4Support) BuildRequires: cmake(LibKWorkspace) +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(packagekitqt5) From fe0ee2062ebe4bc13dbc86389850563596dd6f44 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 3 Jun 2016 06:41:57 -0500 Subject: [PATCH 082/111] BR: Qt5 deps --- apper.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apper.spec b/apper.spec index 3f77df6..94072f0 100644 --- a/apper.spec +++ b/apper.spec @@ -39,6 +39,10 @@ BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5KDELibs4Support) BuildRequires: cmake(LibKWorkspace) +BuildRequires: cmake(Qt5QuickConfig) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros From 65af31f195164cc3ac9fb3c8654e018269b01e16 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 3 Jun 2016 06:46:59 -0500 Subject: [PATCH 083/111] typo, fix Qt5Quick BR --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 94072f0..776ad59 100644 --- a/apper.spec +++ b/apper.spec @@ -39,7 +39,7 @@ BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5KDELibs4Support) BuildRequires: cmake(LibKWorkspace) -BuildRequires: cmake(Qt5QuickConfig) +BuildRequires: cmake(Qt5Quick) BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5XmlPatterns) From 47243584e35c9f330d80119c7fd8b31723356d5f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 5 Jul 2016 07:56:10 -0500 Subject: [PATCH 084/111] %check: verify rpath --- apper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 776ad59..780b970 100644 --- a/apper.spec +++ b/apper.spec @@ -4,7 +4,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -90,6 +90,7 @@ mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ %check +chrpath --list %{buildroot}%{_kf5_bindir}/apper desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/apper.desktop @@ -128,6 +129,9 @@ fi %changelog +* Tue Jul 05 2016 Rex Dieter - 0.9.3-0.2.20160329 +- %%check: verify rpath + * Thu Jun 02 2016 Rex Dieter - 0.9.3-0.1.20160329 - master/ branch snapshot, kf5-based From 7285ad4feb8282a4c759fd9b39602050b7e7bad7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Sep 2016 10:39:04 -0500 Subject: [PATCH 085/111] restore rpath hack --- apper.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apper.spec b/apper.spec index 780b970..3312368 100644 --- a/apper.spec +++ b/apper.spec @@ -4,7 +4,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.2.%{snap}%{?dist} +Release: 0.3.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -88,9 +88,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ %{buildroot}%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service +# hack around rpath oddness +chrpath --list %{buildroot}%{_kf5_bindir}/apper +chrpath --replace %{_kf5_libdir}/apper %{buildroot}%{_kf5_bindir}/apper + %check -chrpath --list %{buildroot}%{_kf5_bindir}/apper desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/apper.desktop @@ -129,6 +132,9 @@ fi %changelog +* Tue Sep 20 2016 Rex Dieter - 0.9.3-0.3.20160329 +- restore rpath hack + * Tue Jul 05 2016 Rex Dieter - 0.9.3-0.2.20160329 - %%check: verify rpath From ef7ce9fb8da3ccfa5c1cb87bd1919c076a29da65 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 10 Nov 2016 07:45:53 -0600 Subject: [PATCH 086/111] 0.9.3-0.4.20161109 - 20161109 snapshot, namespaced appdata/.desktop - Recommends: qt5-style-oxygen, support APPER_NO_STYLE_OVERRIDE env --- .gitignore | 1 + apper-0.9.3-style.patch | 4 ++-- apper.spec | 23 ++++++++++++++--------- sources | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 914433e..e5d0180 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.9.2.tar.xz /apper-0.9.3-20160329git.tar.xz +/apper-0.9.3-20161109git.tar.xz diff --git a/apper-0.9.3-style.patch b/apper-0.9.3-style.patch index 395808a..1149b96 100644 --- a/apper-0.9.3-style.patch +++ b/apper-0.9.3-style.patch @@ -5,8 +5,8 @@ diff -up apper-0.9.3/Apper/main.cpp.style apper-0.9.3/Apper/main.cpp app.activate(app.arguments(), QDir::currentPath()); -+ if ( ! qgetenv("KDE_FULL_SESSION").isEmpty() ) { -+ app.setStyle(QString("fusion")); ++ if ( ! qgetenv("KDE_FULL_SESSION").isEmpty() && qgetenv("APPER_NO_STYLE_OVERRIDE").isEmpty() ) { ++ app.setStyle(QString("oxygen")); + } + return app.exec(); diff --git a/apper.spec b/apper.spec index 3312368..6fb6df3 100644 --- a/apper.spec +++ b/apper.spec @@ -1,10 +1,10 @@ -%global snap 20160329 +%global snap 20161109 Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.3.%{snap}%{?dist} +Release: 0.4.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -17,8 +17,9 @@ URL: https://quickgit.kde.org/?p=%{name}.git ## upstream patches ## upstreamable patches -# hardcode known-good styles (fusion) +# hardcode known-good styles (oxygen) Patch100: apper-0.9.3-style.patch +Recommends: qt5-style-oxygen%{?_isa} Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -94,7 +95,7 @@ chrpath --replace %{_kf5_libdir}/apper %{buildroot}%{_kf5_bindir}/apper %check -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/apper.desktop +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.desktop ||: %posttrans @@ -110,10 +111,10 @@ fi %license COPYING %{_kf5_bindir}/apper %{_kf5_datadir}/apper/ -%{_kf5_datadir}/applications/apper.desktop -%{_kf5_datadir}/applications/apper_installer.desktop -%{_kf5_datadir}/applications/apper_settings.desktop -%{_kf5_datadir}/applications/apper_updates.desktop +%{_kf5_datadir}/applications/org.kde.apper.desktop +%{_kf5_datadir}/applications/org.kde.apper_installer.desktop +%{_kf5_datadir}/applications/org.kde.apper_settings.desktop +%{_kf5_datadir}/applications/org.kde.apper_updates.desktop %{_kf5_libdir}/apper/ %{_qt5_importdir}/org/kde/apper/ %{_libexecdir}/apper-pk-session @@ -124,7 +125,7 @@ fi %{_kf5_datadir}/kservices5/kded/apperd.desktop %{_kf5_datadir}/apperd/ %{_mandir}/man1/apper.1* -%{_datadir}/appdata/apper.appdata.xml +%{_datadir}/appdata/org.kde.apper.appdata.xml %files updater %{_kf5_datadir}/kservices5/plasma-applet-org.packagekit.updater.desktop @@ -132,6 +133,10 @@ fi %changelog +* Thu Nov 10 2016 Rex Dieter - 0.9.3-0.4.20161109 +- 20161109 snapshot, namespaced appdata/.desktop +- Recommends: qt5-style-oxygen, support APPER_NO_STYLE_OVERRIDE env + * Tue Sep 20 2016 Rex Dieter - 0.9.3-0.3.20160329 - restore rpath hack diff --git a/sources b/sources index e389090..dcb1d90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6bfad2525ab1e843dd0305ed4da7474 apper-0.9.3-20160329git.tar.xz +7c66df0f58cbf86579fbd3fad62748c4 apper-0.9.3-20161109git.tar.xz From ceacae780cb181197795544cdba4eddf168f3114 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Dec 2016 08:40:16 -0600 Subject: [PATCH 087/111] apper crashes on startup (#1400011, kde#372292) --- .gitignore | 1 + apper.spec | 10 ++++++++-- sources | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e5d0180..9a2308c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /apper-0.9.2.tar.xz /apper-0.9.3-20160329git.tar.xz /apper-0.9.3-20161109git.tar.xz +/0001-use-correct-QDialog-finished-signal-prototype.patch diff --git a/apper.spec b/apper.spec index 6fb6df3..a2fcedd 100644 --- a/apper.spec +++ b/apper.spec @@ -4,7 +4,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.4.%{snap}%{?dist} +Release: 0.5.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -14,7 +14,10 @@ Source0: http://download.kde.org/stable/apper/%{version}/src/apper-0.9.2.tar.xz %endif URL: https://quickgit.kde.org/?p=%{name}.git -## upstream patches +## upstream patches (in lookaside cache) +# https://bugzilla.redhat.com/show_bug.cgi?id=1400011 +# https://bugs.kde.org/show_bug.cgi?id=372292 +Patch1: 0001-use-correct-QDialog-finished-signal-prototype.patch ## upstreamable patches # hardcode known-good styles (oxygen) @@ -133,6 +136,9 @@ fi %changelog +* Thu Dec 22 2016 Rex Dieter - 0.9.3-0.5.20161109 +- apper crashes on startup (#1400011, kde#372292) + * Thu Nov 10 2016 Rex Dieter - 0.9.3-0.4.20161109 - 20161109 snapshot, namespaced appdata/.desktop - Recommends: qt5-style-oxygen, support APPER_NO_STYLE_OVERRIDE env diff --git a/sources b/sources index dcb1d90..64342aa 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -7c66df0f58cbf86579fbd3fad62748c4 apper-0.9.3-20161109git.tar.xz +SHA512 (apper-0.9.3-20161109git.tar.xz) = 084124c82f00b62979a5b62b4c25088d3611a8e6c4a8565aef7058bedb777c706b6cf66b581148bb3e2a5ebd466b4d057bb67604c79d27a8a822e0b307336a84 +SHA512 (0001-use-correct-QDialog-finished-signal-prototype.patch) = dcd6e17d2f11dae93cddbcb90f66563e2af222a3acf72733f55b5908ecf6843084702325e09cf1721d37e826cdbf22a5fe0665e3d1b3ee73d2ab3f7bf0e3a420 From 54f175417e517c1d576cca33f8194171f0a00f41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:09:05 +0000 Subject: [PATCH 088/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index a2fcedd..6e53a37 100644 --- a/apper.spec +++ b/apper.spec @@ -4,7 +4,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.5.%{snap}%{?dist} +Release: 0.6.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -136,6 +136,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.9.3-0.6.20161109 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Dec 22 2016 Rex Dieter - 0.9.3-0.5.20161109 - apper crashes on startup (#1400011, kde#372292) From 956333b3b94b3b57fbb86a89381aeecf2a9bc367 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Mar 2017 09:21:57 -0500 Subject: [PATCH 089/111] fresh snapshot, includes theming fix omit broken -updater subpkg (for now at least) update URL --- .gitignore | 5 +---- apper.spec | 33 ++++++++++++++++++++++++--------- sources | 3 +-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 9a2308c..e7660be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/apper-0.9.2.tar.xz -/apper-0.9.3-20160329git.tar.xz -/apper-0.9.3-20161109git.tar.xz -/0001-use-correct-QDialog-finished-signal-prototype.patch +/apper-0.9.3-20170226git.tar.xz diff --git a/apper.spec b/apper.spec index 6e53a37..ebaaf5b 100644 --- a/apper.spec +++ b/apper.spec @@ -1,10 +1,12 @@ -%global snap 20161109 +%global snap 20170226 +# include -updater applet subpkg or not +#global updater 1 Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.6.%{snap}%{?dist} +Release: 0.7.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -12,23 +14,22 @@ Source0: apper-%{version}-%{snap}git.tar.xz %else Source0: http://download.kde.org/stable/apper/%{version}/src/apper-0.9.2.tar.xz %endif -URL: https://quickgit.kde.org/?p=%{name}.git +URL: https://cgit.kde.org/apper.git ## upstream patches (in lookaside cache) -# https://bugzilla.redhat.com/show_bug.cgi?id=1400011 -# https://bugs.kde.org/show_bug.cgi?id=372292 -Patch1: 0001-use-correct-QDialog-finished-signal-prototype.patch ## upstreamable patches -# hardcode known-good styles (oxygen) -Patch100: apper-0.9.3-style.patch -Recommends: qt5-style-oxygen%{?_isa} +Patch100: apper-0.9.3-crash.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} # required because gnome-packagekit provides exactly the same interface Provides: PackageKit-session-service +%if ! 0%{?updater} +Obsoletes: apper-updater < %{version}-%{release} +%endif + BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext @@ -68,10 +69,17 @@ Requires: %{name} = %{version}-%{release} %prep %autosetup -p1 +%if 0%{?updater} # disable update applet by default sed -i \ -e 's|X-KDE-PluginInfo-EnabledByDefault=.*|X-KDE-PluginInfo-EnabledByDefault=false|g' \ plasmoid/package/metadata.desktop +%else +sed -i.no_plasmoid \ + -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \ + CMakeLists.txt +mv plasmoid plasmoid.no_plasmoid +%endif %build @@ -130,12 +138,19 @@ fi %{_mandir}/man1/apper.1* %{_datadir}/appdata/org.kde.apper.appdata.xml +%if 0%{?updater} %files updater %{_kf5_datadir}/kservices5/plasma-applet-org.packagekit.updater.desktop %{_kf5_datadir}/plasma/plasmoids/org.packagekit.updater/ +%endif %changelog +* Wed Mar 15 2017 Rex Dieter - 0.9.3-0.7.20170226 +- fresh snapshot, includes theming fix +- omit broken -updater subpkg (for now at least) +- update URL + * Fri Feb 10 2017 Fedora Release Engineering - 0.9.3-0.6.20161109 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 64342aa..741ecc7 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (apper-0.9.3-20161109git.tar.xz) = 084124c82f00b62979a5b62b4c25088d3611a8e6c4a8565aef7058bedb777c706b6cf66b581148bb3e2a5ebd466b4d057bb67604c79d27a8a822e0b307336a84 -SHA512 (0001-use-correct-QDialog-finished-signal-prototype.patch) = dcd6e17d2f11dae93cddbcb90f66563e2af222a3acf72733f55b5908ecf6843084702325e09cf1721d37e826cdbf22a5fe0665e3d1b3ee73d2ab3f7bf0e3a420 +SHA512 (apper-0.9.3-20170226git.tar.xz) = d869b20a777b15fe1d98fe5ea5a8a456d57f200a1cffa2c5b40d5ffca1ba3299d795b2fdfa38ab19c45017e57b388d6ef88a58182f40b600a01930cfee3da90c From 650d91f38b763e18ff1b3cb062043319498b7cf4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Mar 2017 09:22:14 -0500 Subject: [PATCH 090/111] drop reference to unused patch --- apper.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apper.spec b/apper.spec index ebaaf5b..1a772c8 100644 --- a/apper.spec +++ b/apper.spec @@ -19,7 +19,6 @@ URL: https://cgit.kde.org/apper.git ## upstream patches (in lookaside cache) ## upstreamable patches -Patch100: apper-0.9.3-crash.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} From bca058139000549c7e457ef85f0e0268cd3a2f79 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 27 Mar 2017 07:23:41 -0500 Subject: [PATCH 091/111] drop old/unused patch --- apper-0.9.3-style.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 apper-0.9.3-style.patch diff --git a/apper-0.9.3-style.patch b/apper-0.9.3-style.patch deleted file mode 100644 index 1149b96..0000000 --- a/apper-0.9.3-style.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up apper-0.9.3/Apper/main.cpp.style apper-0.9.3/Apper/main.cpp ---- apper-0.9.3/Apper/main.cpp.style 2016-03-29 09:11:50.000000000 -0500 -+++ apper-0.9.3/Apper/main.cpp 2016-05-12 13:43:40.037400293 -0500 -@@ -49,5 +49,9 @@ int main(int argc, char **argv) - - app.activate(app.arguments(), QDir::currentPath()); - -+ if ( ! qgetenv("KDE_FULL_SESSION").isEmpty() && qgetenv("APPER_NO_STYLE_OVERRIDE").isEmpty() ) { -+ app.setStyle(QString("oxygen")); -+ } -+ - return app.exec(); - } From 1730bc5044700561170f1a0f7344f02d523ae3a9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 27 Mar 2017 07:29:40 -0500 Subject: [PATCH 092/111] apper: K4AboutData::appName crasher (#1383747) --- D5193.diff | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ apper.spec | 7 ++- 2 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 D5193.diff diff --git a/D5193.diff b/D5193.diff new file mode 100644 index 0000000..d467b31 --- /dev/null +++ b/D5193.diff @@ -0,0 +1,129 @@ +diff --git a/PkSession/CMakeLists.txt b/PkSession/CMakeLists.txt +--- a/PkSession/CMakeLists.txt ++++ b/PkSession/CMakeLists.txt +@@ -44,6 +44,7 @@ + KF5::KIOFileWidgets + KF5::KDELibs4Support + KF5::IconThemes ++ KF5::DBusAddons + ${PackageKitQt5_LIBRARIES} + apper_private + ) +diff --git a/PkSession/PkSession.h b/PkSession/PkSession.h +--- a/PkSession/PkSession.h ++++ b/PkSession/PkSession.h +@@ -21,15 +21,15 @@ + #ifndef PKSESSION_H + #define PKSESSION_H + +-#include ++#include + #include + + class PkInterface; +-class PkSession : public KUniqueApplication ++class PkSession : public QObject + { + Q_OBJECT + public: +- PkSession(); ++ explicit PkSession(QObject* parent = 0); + virtual ~PkSession(); + int newInstance(); + +diff --git a/PkSession/PkSession.cpp b/PkSession/PkSession.cpp +--- a/PkSession/PkSession.cpp ++++ b/PkSession/PkSession.cpp +@@ -22,6 +22,7 @@ + + #include "PkInterface.h" + ++#include + #include + + #include +@@ -35,8 +36,8 @@ + + using namespace PackageKit; + +-PkSession::PkSession() : +- KUniqueApplication() ++PkSession::PkSession(QObject* parent) ++ : QObject(parent) + { + m_pkInterface = new PkInterface(this); + connect(m_pkInterface, SIGNAL(close()), +@@ -46,7 +47,7 @@ + Daemon::global()->setHints(QLatin1String("locale=") % locale); + + // this enables not quitting when closing a transaction ui +- setQuitOnLastWindowClosed(false); ++ qApp->setQuitOnLastWindowClosed(false); + + // create the close timer and connect it's signal + m_closeT = new QTimer(this); +@@ -83,7 +84,7 @@ + // again just to be sure. + if (!isRunning()) { + kDebug() << "Closed by Timer"; +- quit(); ++ qApp->quit(); + } + } + +diff --git a/PkSession/main.cpp b/PkSession/main.cpp +--- a/PkSession/main.cpp ++++ b/PkSession/main.cpp +@@ -21,14 +21,21 @@ + #include "PkSession.h" + #include + +-#include ++#include ++#include ++#include ++#include ++ ++#include + #include ++#include + #include +-#include +-#include + + int main(int argc, char **argv) + { ++ QApplication app(argc, argv); ++ app.setWindowIcon(QIcon::fromTheme("system-software-install")); ++ + KLocalizedString::setApplicationDomain("apper"); + + KAboutData aboutData("PkSession", +@@ -41,18 +48,16 @@ + aboutData.addAuthor(i18n("Trever Fischer"), QString(), "wm161@wm161.net", "http://wm161.net"); + + aboutData.addCredit(i18n("Adrien Bustany"), i18n("libpackagekit-qt and other stuff"),"@"); +- aboutData.setProgramIconName("system-software-install"); + KAboutData::setApplicationData(aboutData); + +- //! KCmdLineArgs::init(argc, argv); +- Q_UNUSED(argc); +- Q_UNUSED(argv); +- +- if (!PkSession::start()) { +- //kDebug() << "PkSession is already running!"; +- return 0; +- } ++ // Let's ensure we only have one PkSession at any one time on the same session ++ KDBusService service(KDBusService::Unique); ++ auto disableSessionManagement = [](QSessionManager &sm) { ++ sm.setRestartHint(QSessionManager::RestartNever); ++ }; ++ QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); ++ QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); + +- PkSession app; ++ PkSession session; + return app.exec(); + } + diff --git a/apper.spec b/apper.spec index 1a772c8..efc00b5 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.7.%{snap}%{?dist} +Release: 0.8.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -19,6 +19,8 @@ URL: https://cgit.kde.org/apper.git ## upstream patches (in lookaside cache) ## upstreamable patches +# https://phabricator.kde.org/D5193 +Patch100: https://phabricator.kde.org/file/data/dos4duccaqmjmlpc3vzo/PHID-FILE-zig6gg67s5y7fp2e4p7w/D5193.diff Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -145,6 +147,9 @@ fi %changelog +* Mon Mar 27 2017 Rex Dieter - 0.9.3-0.8.20170226 +- apper: K4AboutData::appName crasher (#1383747) + * Wed Mar 15 2017 Rex Dieter - 0.9.3-0.7.20170226 - fresh snapshot, includes theming fix - omit broken -updater subpkg (for now at least) From cff11579e477908cc07b2d56aa3046e64dcd3121 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:06:24 +0000 Subject: [PATCH 093/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index efc00b5..60d294a 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.8.%{snap}%{?dist} +Release: 0.9.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -147,6 +147,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.3-0.9.20170226 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Mar 27 2017 Rex Dieter - 0.9.3-0.8.20170226 - apper: K4AboutData::appName crasher (#1383747) From 6e6076c82b3bd9cb3c7361ec885b06245965c109 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:38:42 +0000 Subject: [PATCH 094/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 60d294a..87e0bbf 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.9.%{snap}%{?dist} +Release: 0.10.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -147,6 +147,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.9.3-0.10.20170226 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.9.3-0.9.20170226 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 923eeb9821e7d5a2098574db8155c4df4b16a9c3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 21 Dec 2017 13:54:36 -0600 Subject: [PATCH 095/111] refresh snapshot (20171102) --- .gitignore | 1 + D5193.diff | 129 ----------------------------------------------------- apper.spec | 17 +++---- sources | 2 +- 4 files changed, 9 insertions(+), 140 deletions(-) delete mode 100644 D5193.diff diff --git a/.gitignore b/.gitignore index e7660be..00b1f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /apper-0.9.3-20170226git.tar.xz +/apper-0.9.3-20171102git.tar.xz diff --git a/D5193.diff b/D5193.diff deleted file mode 100644 index d467b31..0000000 --- a/D5193.diff +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/PkSession/CMakeLists.txt b/PkSession/CMakeLists.txt ---- a/PkSession/CMakeLists.txt -+++ b/PkSession/CMakeLists.txt -@@ -44,6 +44,7 @@ - KF5::KIOFileWidgets - KF5::KDELibs4Support - KF5::IconThemes -+ KF5::DBusAddons - ${PackageKitQt5_LIBRARIES} - apper_private - ) -diff --git a/PkSession/PkSession.h b/PkSession/PkSession.h ---- a/PkSession/PkSession.h -+++ b/PkSession/PkSession.h -@@ -21,15 +21,15 @@ - #ifndef PKSESSION_H - #define PKSESSION_H - --#include -+#include - #include - - class PkInterface; --class PkSession : public KUniqueApplication -+class PkSession : public QObject - { - Q_OBJECT - public: -- PkSession(); -+ explicit PkSession(QObject* parent = 0); - virtual ~PkSession(); - int newInstance(); - -diff --git a/PkSession/PkSession.cpp b/PkSession/PkSession.cpp ---- a/PkSession/PkSession.cpp -+++ b/PkSession/PkSession.cpp -@@ -22,6 +22,7 @@ - - #include "PkInterface.h" - -+#include - #include - - #include -@@ -35,8 +36,8 @@ - - using namespace PackageKit; - --PkSession::PkSession() : -- KUniqueApplication() -+PkSession::PkSession(QObject* parent) -+ : QObject(parent) - { - m_pkInterface = new PkInterface(this); - connect(m_pkInterface, SIGNAL(close()), -@@ -46,7 +47,7 @@ - Daemon::global()->setHints(QLatin1String("locale=") % locale); - - // this enables not quitting when closing a transaction ui -- setQuitOnLastWindowClosed(false); -+ qApp->setQuitOnLastWindowClosed(false); - - // create the close timer and connect it's signal - m_closeT = new QTimer(this); -@@ -83,7 +84,7 @@ - // again just to be sure. - if (!isRunning()) { - kDebug() << "Closed by Timer"; -- quit(); -+ qApp->quit(); - } - } - -diff --git a/PkSession/main.cpp b/PkSession/main.cpp ---- a/PkSession/main.cpp -+++ b/PkSession/main.cpp -@@ -21,14 +21,21 @@ - #include "PkSession.h" - #include - --#include -+#include -+#include -+#include -+#include -+ -+#include - #include -+#include - #include --#include --#include - - int main(int argc, char **argv) - { -+ QApplication app(argc, argv); -+ app.setWindowIcon(QIcon::fromTheme("system-software-install")); -+ - KLocalizedString::setApplicationDomain("apper"); - - KAboutData aboutData("PkSession", -@@ -41,18 +48,16 @@ - aboutData.addAuthor(i18n("Trever Fischer"), QString(), "wm161@wm161.net", "http://wm161.net"); - - aboutData.addCredit(i18n("Adrien Bustany"), i18n("libpackagekit-qt and other stuff"),"@"); -- aboutData.setProgramIconName("system-software-install"); - KAboutData::setApplicationData(aboutData); - -- //! KCmdLineArgs::init(argc, argv); -- Q_UNUSED(argc); -- Q_UNUSED(argv); -- -- if (!PkSession::start()) { -- //kDebug() << "PkSession is already running!"; -- return 0; -- } -+ // Let's ensure we only have one PkSession at any one time on the same session -+ KDBusService service(KDBusService::Unique); -+ auto disableSessionManagement = [](QSessionManager &sm) { -+ sm.setRestartHint(QSessionManager::RestartNever); -+ }; -+ QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); -+ QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); - -- PkSession app; -+ PkSession session; - return app.exec(); - } - diff --git a/apper.spec b/apper.spec index 87e0bbf..1b77ce9 100644 --- a/apper.spec +++ b/apper.spec @@ -1,12 +1,12 @@ -%global snap 20170226 +%global snap 20171102 # include -updater applet subpkg or not #global updater 1 Name: apper Summary: KDE interface for PackageKit Version: 0.9.3 -Release: 0.10.%{snap}%{?dist} +Release: 0.11.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -19,8 +19,6 @@ URL: https://cgit.kde.org/apper.git ## upstream patches (in lookaside cache) ## upstreamable patches -# https://phabricator.kde.org/D5193 -Patch100: https://phabricator.kde.org/file/data/dos4duccaqmjmlpc3vzo/PHID-FILE-zig6gg67s5y7fp2e4p7w/D5193.diff Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -75,11 +73,6 @@ Requires: %{name} = %{version}-%{release} sed -i \ -e 's|X-KDE-PluginInfo-EnabledByDefault=.*|X-KDE-PluginInfo-EnabledByDefault=false|g' \ plasmoid/package/metadata.desktop -%else -sed -i.no_plasmoid \ - -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \ - CMakeLists.txt -mv plasmoid plasmoid.no_plasmoid %endif @@ -88,7 +81,8 @@ mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. \ %{?appstream:-DAPPSTREAM:BOOL=ON} \ - -DAUTOREMOVE:BOOL=OFF + -DAUTOREMOVE:BOOL=OFF \ + -DBUILD_PLASMOID=%{?updater:ON}%{?!updater:OFF} popd make %{?_smp_mflags} -C %{_target_platform} @@ -147,6 +141,9 @@ fi %changelog +* Thu Dec 21 2017 Rex Dieter - 0.9.3-0.11.20171102 +- refresh snapshot (20171102) + * Wed Aug 02 2017 Fedora Release Engineering - 0.9.3-0.10.20170226 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 741ecc7..c9cc673 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apper-0.9.3-20170226git.tar.xz) = d869b20a777b15fe1d98fe5ea5a8a456d57f200a1cffa2c5b40d5ffca1ba3299d795b2fdfa38ab19c45017e57b388d6ef88a58182f40b600a01930cfee3da90c +SHA512 (apper-0.9.3-20171102git.tar.xz) = 0ab7e65f4a093da50b20023374d2f635e0b40f36b6bc8aaadba085d5e4e6773f91eb1be58babf0ae9e566776f2822527a33da0bf573f57936a81333bb4097173 From 0e96244ef8b869f44390bfd98583ea561ceb111a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 22 Dec 2017 14:42:04 -0600 Subject: [PATCH 096/111] use %%_kf5_metainfodir --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 1b77ce9..9de3cbe 100644 --- a/apper.spec +++ b/apper.spec @@ -131,7 +131,7 @@ fi %{_kf5_datadir}/kservices5/kded/apperd.desktop %{_kf5_datadir}/apperd/ %{_mandir}/man1/apper.1* -%{_datadir}/appdata/org.kde.apper.appdata.xml +%{_kf5_metainfodir}/org.kde.apper.appdata.xml %if 0%{?updater} %files updater From edd97ca615bf7a4baa8cb3d27866d79b0c11c6cc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 19 Jan 2018 09:35:41 -0600 Subject: [PATCH 097/111] apper-1.0.0 snapshot, PackageKit-Qt-1.0 support --- .gitignore | 1 + apper.sh | 2 +- apper.spec | 19 +++++++++++-------- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 00b1f5b..65e0f23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /apper-0.9.3-20170226git.tar.xz /apper-0.9.3-20171102git.tar.xz +/apper-1.0.0-20180119git.tar.xz diff --git a/apper.sh b/apper.sh index 1a528eb..2a531d4 100644 --- a/apper.sh +++ b/apper.sh @@ -1,5 +1,5 @@ MODULE=apper -VERSION=0.9.3 +VERSION=1.0.0 DATE=$(date +%Y%m%d)git set -x diff --git a/apper.spec b/apper.spec index 9de3cbe..3c4be78 100644 --- a/apper.spec +++ b/apper.spec @@ -1,12 +1,12 @@ -%global snap 20171102 +%global snap 20180119 # include -updater applet subpkg or not #global updater 1 Name: apper Summary: KDE interface for PackageKit -Version: 0.9.3 -Release: 0.11.%{snap}%{?dist} +Version: 1.0.0 +Release: 0.1.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -41,8 +41,10 @@ BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5IconThemes) + BuildRequires: cmake(LibKWorkspace) + BuildRequires: cmake(Qt5Quick) BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Widgets) @@ -50,8 +52,9 @@ BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros +BuildRequires: cmake(packagekitqt5) >= 1.0.0 + BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(packagekitqt5) Requires: PackageKit @@ -122,11 +125,8 @@ fi %{_kf5_datadir}/applications/org.kde.apper_settings.desktop %{_kf5_datadir}/applications/org.kde.apper_updates.desktop %{_kf5_libdir}/apper/ -%{_qt5_importdir}/org/kde/apper/ %{_libexecdir}/apper-pk-session %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -%{_kf5_qtplugindir}/kcm_apper.so -%{_kf5_datadir}/kservices5/kcm_apper.desktop %{_kf5_qtplugindir}/kded_apperd.so %{_kf5_datadir}/kservices5/kded/apperd.desktop %{_kf5_datadir}/apperd/ @@ -141,6 +141,9 @@ fi %changelog +* Fri Jan 19 2018 Rex Dieter - 1.0.0-0.1.20180119 +- apper-1.0.0 snapshot, PackageKit-Qt-1.0 support + * Thu Dec 21 2017 Rex Dieter - 0.9.3-0.11.20171102 - refresh snapshot (20171102) diff --git a/sources b/sources index c9cc673..46db8a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apper-0.9.3-20171102git.tar.xz) = 0ab7e65f4a093da50b20023374d2f635e0b40f36b6bc8aaadba085d5e4e6773f91eb1be58babf0ae9e566776f2822527a33da0bf573f57936a81333bb4097173 +SHA512 (apper-1.0.0-20180119git.tar.xz) = e604de6fef665e657f09d83c8da2f253294add7537e6f58bc75928b32ddec5d65109d03ed55fbd44a0436fbb531a60a348b006bebcc4a7e2ca5f461c04f20519 From 0f3b94c2161693a751ed7be445ae217af1eeb525 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:37:58 +0000 Subject: [PATCH 098/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 3c4be78..018cf72 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -141,6 +141,9 @@ fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.0-0.2.20180119 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 19 2018 Rex Dieter - 1.0.0-0.1.20180119 - apper-1.0.0 snapshot, PackageKit-Qt-1.0 support From 4f9418d45c3522e7ba2db3d060dd59f856639ca2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:08 +0100 Subject: [PATCH 099/111] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- apper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apper.spec b/apper.spec index 018cf72..bd13e7a 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 0.2.%{snap}%{?dist} +Release: 0.3.%{snap}%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -141,6 +141,9 @@ fi %changelog +* Fri Feb 09 2018 Igor Gnatenko - 1.0.0-0.3.20180119 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 1.0.0-0.2.20180119 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -393,7 +396,7 @@ fi - systray_actions patch/hack * Mon Oct 17 2011 Rex Dieter 0.7.0-3 -- apper.desktop: Exec=apper %F (not %U, it only handles files, not urls) +- apper.desktop: Exec=apper %%F (not %%U, it only handles files, not urls) * Mon Oct 17 2011 Rex Dieter 0.7.0-2 - -DAUTOREMOVE:BOOL=OFF (#727788) From 71793bf6f066374283e3a8c044252de5cbe9270f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Feb 2018 14:48:50 -0600 Subject: [PATCH 100/111] 1.0.0 (v1.0.0 tag) --- .gitignore | 1 + apper.sh | 3 ++- apper.spec | 10 +++++++--- sources | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 65e0f23..10c8458 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /apper-0.9.3-20170226git.tar.xz /apper-0.9.3-20171102git.tar.xz /apper-1.0.0-20180119git.tar.xz +/apper-1.0.0.tar.xz diff --git a/apper.sh b/apper.sh index 2a531d4..932696b 100644 --- a/apper.sh +++ b/apper.sh @@ -1,6 +1,7 @@ MODULE=apper VERSION=1.0.0 DATE=$(date +%Y%m%d)git +TAG=v1.0.0 set -x @@ -8,7 +9,7 @@ rm -rf $MODULE git clone kde:$MODULE pushd $MODULE -git archive master --format tar --prefix=${MODULE}-${VERSION}/ | xz -9 > ../${MODULE}-${VERSION}-${DATE}.tar.xz +git archive $TAG --format tar --prefix=${MODULE}-${VERSION}/ | xz -9 > ../${MODULE}-${VERSION}.tar.xz popd rm -rf $MODULE diff --git a/apper.spec b/apper.spec index bd13e7a..96f28ba 100644 --- a/apper.spec +++ b/apper.spec @@ -1,18 +1,19 @@ -%global snap 20180119 +#global snap 20180119 # include -updater applet subpkg or not #global updater 1 Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 0.3.%{snap}%{?dist} +Release: 1%{?dist} License: GPLv2+ %if 0%{?snap:1} Source0: apper-%{version}-%{snap}git.tar.xz %else -Source0: http://download.kde.org/stable/apper/%{version}/src/apper-0.9.2.tar.xz +Source0: apper-%{version}.tar.xz +#Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.xz %endif URL: https://cgit.kde.org/apper.git @@ -141,6 +142,9 @@ fi %changelog +* Tue Feb 20 2018 Rex Dieter - 1.0.0-1 +- 1.0.0 (v1.0.0 tag) + * Fri Feb 09 2018 Igor Gnatenko - 1.0.0-0.3.20180119 - Escape macros in %%changelog diff --git a/sources b/sources index 46db8a7..74ddbf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apper-1.0.0-20180119git.tar.xz) = e604de6fef665e657f09d83c8da2f253294add7537e6f58bc75928b32ddec5d65109d03ed55fbd44a0436fbb531a60a348b006bebcc4a7e2ca5f461c04f20519 +SHA512 (apper-1.0.0.tar.xz) = 04a381b993d7d2ad1134ebb6fa9b4d837b51e1e60c62746d7c21a0c2fc0c596ff0e932fcd81c78e160a63291d858ee772ed42f9aaef138763fcffb90497088ce From be0d1eddc7c3b27cbc2dbeb683c4bed2dbc06c45 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Feb 2018 16:25:05 -0600 Subject: [PATCH 101/111] BR: cmake(AppStreamQt) --- apper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apper.spec b/apper.spec index 96f28ba..e1dd89e 100644 --- a/apper.spec +++ b/apper.spec @@ -53,6 +53,7 @@ BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros +BuildRequires: cmake(AppStreamQt) BuildRequires: cmake(packagekitqt5) >= 1.0.0 BuildRequires: pkgconfig(dbus-1) From f5da493e0a78bbe7f50726fcdc54d6627a3f5e13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:24:45 +0000 Subject: [PATCH 102/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index e1dd89e..d381352 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -143,6 +143,9 @@ fi %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Feb 20 2018 Rex Dieter - 1.0.0-1 - 1.0.0 (v1.0.0 tag) From ae416c41a0c0f2552f38776d8d1fdde9790da78c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 30 Jul 2018 14:42:04 -0500 Subject: [PATCH 103/111] pull in upstream fixes drop deprecated scriptlets drop rpath hacks (no longer needed) --- ...-binary-as-TARGET-instead-of-PROGRAM.patch | 29 +++++++ 0002-Fix-build-without-AppStream.patch | 30 +++++++ ...when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch | 25 ++++++ 0004-Update-AppStream-metadata.patch | 79 +++++++++++++++++++ apper.spec | 26 +++--- 5 files changed, 174 insertions(+), 15 deletions(-) create mode 100644 0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch create mode 100644 0002-Fix-build-without-AppStream.patch create mode 100644 0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch create mode 100644 0004-Update-AppStream-metadata.patch diff --git a/0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch b/0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch new file mode 100644 index 0000000..05d3fed --- /dev/null +++ b/0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch @@ -0,0 +1,29 @@ +From 448527f765b1c4f9dc5452cc069baddecaf55e7e Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Wed, 21 Feb 2018 13:57:28 +0100 +Subject: [PATCH 1/8] Install apper binary as TARGET instead of PROGRAM + +Otherwise the RPATH set in add_target_properties is ignored + +BUG: 390836 +Differential Revision: https://phabricator.kde.org/D10706 +--- + Apper/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Apper/CMakeLists.txt b/Apper/CMakeLists.txt +index 2b71603..a9855a9 100644 +--- a/Apper/CMakeLists.txt ++++ b/Apper/CMakeLists.txt +@@ -49,7 +49,7 @@ target_link_libraries(apper + + set_target_properties(apper PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/apper) + +-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/apper DESTINATION ${CMAKE_INSTALL_BINDIR}) ++install(TARGETS apper DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(FILES org.kde.apper.desktop DESTINATION ${CMAKE_INSTALL_APPDIR}) + install(FILES org.kde.apper_installer.desktop DESTINATION ${CMAKE_INSTALL_APPDIR}) + install(FILES org.kde.apper_settings.desktop DESTINATION ${CMAKE_INSTALL_APPDIR}) +-- +2.17.1 + diff --git a/0002-Fix-build-without-AppStream.patch b/0002-Fix-build-without-AppStream.patch new file mode 100644 index 0000000..ca643ac --- /dev/null +++ b/0002-Fix-build-without-AppStream.patch @@ -0,0 +1,30 @@ +From 29df2bd0bc9f4151f5f914b9b46b76beae117e94 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Wed, 21 Feb 2018 14:13:26 +0100 +Subject: [PATCH 2/8] Fix build without AppStream + +Don't try to link to AppStream-Qt if building with APPSTREAM=OFF +Differential Revision: https://phabricator.kde.org/D10707 +--- + libapper/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libapper/CMakeLists.txt b/libapper/CMakeLists.txt +index 6581778..485e91d 100644 +--- a/libapper/CMakeLists.txt ++++ b/libapper/CMakeLists.txt +@@ -59,7 +59,10 @@ target_link_libraries(apper_private + KF5::I18n + Qt5::Core + PK::packagekitqt5 +- AppStreamQt + ) + ++if(APPSTREAM) ++ target_link_libraries(apper_private AppStreamQt) ++endif() ++ + install(TARGETS apper_private DESTINATION ${CMAKE_INSTALL_LIBDIR}/apper) +-- +2.17.1 + diff --git a/0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch b/0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch new file mode 100644 index 0000000..0496303 --- /dev/null +++ b/0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch @@ -0,0 +1,25 @@ +From c34888dd5461e2674feefefe001be2c7d64e427f Mon Sep 17 00:00:00 2001 +From: Daniel Nicoletti +Date: Wed, 21 Feb 2018 17:19:17 -0300 +Subject: [PATCH 3/8] Fix compilation when EDIT_ORIGNS_DESKTOP_NAME is defined + +--- + Apper/Settings/Settings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Apper/Settings/Settings.cpp b/Apper/Settings/Settings.cpp +index 2175ea7..e077b8e 100644 +--- a/Apper/Settings/Settings.cpp ++++ b/Apper/Settings/Settings.cpp +@@ -154,7 +154,7 @@ Settings::~Settings() + void Settings::on_editOriginsPB_clicked() + { + #ifdef EDIT_ORIGNS_DESKTOP_NAME +- KToolInvocation::startServiceByDesktopName(EDIT_ORIGNS_DESKTOP_NAME); ++ KToolInvocation::startServiceByDesktopName(QLatin1String(EDIT_ORIGNS_DESKTOP_NAME)); + #endif //EDIT_ORIGNS_DESKTOP_NAME + } + +-- +2.17.1 + diff --git a/0004-Update-AppStream-metadata.patch b/0004-Update-AppStream-metadata.patch new file mode 100644 index 0000000..27c9cc4 --- /dev/null +++ b/0004-Update-AppStream-metadata.patch @@ -0,0 +1,79 @@ +From f7e84b2ce9b99c9fef23b859182fed599ee13a54 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Wed, 21 Feb 2018 22:05:47 +0100 +Subject: [PATCH 4/8] Update AppStream metadata + +--- + Apper/org.kde.apper.appdata.xml | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/Apper/org.kde.apper.appdata.xml b/Apper/org.kde.apper.appdata.xml +index 68048a1..aeee039 100644 +--- a/Apper/org.kde.apper.appdata.xml ++++ b/Apper/org.kde.apper.appdata.xml +@@ -1,8 +1,9 @@ + +- +- org.kde.apper.desktop +- CC0-1.0 ++ ++ org.kde.apper ++ FSFAP + GPL-2.0+ ++ + Apper + آپر + Apper +@@ -35,6 +36,7 @@ + xxApperxx + Apper + Apper ++ + KDE application and package management tool + أداة «كدي» لإدارة التّطبيقات والحزم + Ferramienta KDE de xestión d'aplicaciones y paquetes +@@ -67,6 +69,7 @@ + xxKDE application and package management toolxx + KDE 应用程序和包管理工具 + KDE 應用程式與軟體套件管理工具 ++ + +

+ Apper is a graphical management tool for packages and applications +@@ -323,6 +326,7 @@ +

  • 與 KDE Plasma 桌面高度整合
    • + +     ++ + + + https://userbase.kde.org/images.userbase/0/06/Apper-window.png +@@ -357,11 +361,13 @@ + xxThe main window showing a description of the selected packagexx + 主窗口显示了选中包的说明 + 主視窗顯示選取的套件的描述 +- https://userbase.kde.org/images.userbase/0/07/Apper-window1.png ++ https://dantti.files.wordpress.com/2018/02/screenshot_20180220_173026.png + + +- https://projects.kde.org/projects/extragear/sysadmin/apper/ ++ ++ https://www.kde.org/applications/system/apper/ + https://bugs.kde.org/enter_bug.cgi?format=guided&product=apper ++ + KDE + The KDE Community + مجتمع «كدي» +@@ -393,6 +399,9 @@ + xxThe KDE Communityxx + KDE 社区 + KDE 社群 ++ ++ org.kde.apper.desktop ++ + + apper + +-- +2.17.1 + diff --git a/apper.spec b/apper.spec index d381352..bfe3e7f 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -17,7 +17,11 @@ Source0: apper-%{version}.tar.xz %endif URL: https://cgit.kde.org/apper.git -## upstream patches (in lookaside cache) +## upstream patches +Patch1: 0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch +Patch2: 0002-Fix-build-without-AppStream.patch +Patch3: 0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch +Patch4: 0004-Update-AppStream-metadata.patch ## upstreamable patches @@ -30,7 +34,6 @@ Provides: PackageKit-session-service Obsoletes: apper-updater < %{version}-%{release} %endif -BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: cmake(KDED) @@ -100,23 +103,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ %{buildroot}%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -# hack around rpath oddness -chrpath --list %{buildroot}%{_kf5_bindir}/apper -chrpath --replace %{_kf5_libdir}/apper %{buildroot}%{_kf5_bindir}/apper - %check desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.desktop ||: -%posttrans -update-desktop-database -q 2> /dev/null ||: - -%postun -if [ $1 -eq 0 ] ; then -update-desktop-database -q 2> /dev/null ||: -fi - %files %doc TODO %license COPYING @@ -143,6 +134,11 @@ fi %changelog +* Mon Jul 30 2018 Rex Dieter - 1.0.0-3 +- pull in upstream fixes +- drop deprecated scriptlets +- drop rpath hacks (no longer needed) + * Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 88edfce6bfad2a2eed151ed0786234a6759364b4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 31 Jul 2018 09:44:59 -0500 Subject: [PATCH 104/111] qt-5.11 issues --- apper-1.0.0-qt511.patch | 22 ++++++++++++++++++++++ apper.spec | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 apper-1.0.0-qt511.patch diff --git a/apper-1.0.0-qt511.patch b/apper-1.0.0-qt511.patch new file mode 100644 index 0000000..b87a65a --- /dev/null +++ b/apper-1.0.0-qt511.patch @@ -0,0 +1,22 @@ +diff -up apper-1.0.0/Apper/Settings/Settings.cpp.qt511 apper-1.0.0/Apper/Settings/Settings.cpp +--- apper-1.0.0/Apper/Settings/Settings.cpp.qt511 2018-07-31 09:31:10.325795972 -0500 ++++ apper-1.0.0/Apper/Settings/Settings.cpp 2018-07-31 09:33:32.509880561 -0500 +@@ -27,6 +27,7 @@ + #include + #include + ++#include + #include + #include + +diff -up apper-1.0.0/libapper/Requirements.h.qt511 apper-1.0.0/libapper/Requirements.h +--- apper-1.0.0/libapper/Requirements.h.qt511 2018-07-31 09:32:39.579476804 -0500 ++++ apper-1.0.0/libapper/Requirements.h 2018-07-31 09:32:07.813234487 -0500 +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + + namespace Ui { diff --git a/apper.spec b/apper.spec index bfe3e7f..f27d5ae 100644 --- a/apper.spec +++ b/apper.spec @@ -24,6 +24,7 @@ Patch3: 0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch Patch4: 0004-Update-AppStream-metadata.patch ## upstreamable patches +Patch100: apper-1.0.0-qt511.patch Obsoletes: kpackagekit < 0.7.0 Provides: kpackagekit = %{version}-%{release} @@ -138,6 +139,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.des - pull in upstream fixes - drop deprecated scriptlets - drop rpath hacks (no longer needed) +- qt511.patch * Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3c91faf1169af01d27908eb15bf14fb8cf04fce2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:36:03 +0000 Subject: [PATCH 105/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index f27d5ae..08f1b75 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.des %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jul 30 2018 Rex Dieter - 1.0.0-3 - pull in upstream fixes - drop deprecated scriptlets From 1171676b18874418bed18707df8577c8f70083a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:13:16 +0000 Subject: [PATCH 106/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 08f1b75..6423e34 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.des %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From aa5d22e08580121d845df3813988ab07989d98b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:51:05 +0000 Subject: [PATCH 107/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 6423e34..eace6a1 100644 --- a/apper.spec +++ b/apper.spec @@ -6,7 +6,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.des %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c3802a2ff1ef27e7cb15f181f24db331b2ff2c49 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 18 Jul 2020 16:50:58 -0400 Subject: [PATCH 108/111] Update to new out-of-source build mechanism --- apper.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/apper.spec b/apper.spec index eace6a1..2360cba 100644 --- a/apper.spec +++ b/apper.spec @@ -1,3 +1,5 @@ +# Force out of source build +%undefine __cmake_in_source_build #global snap 20180119 # include -updater applet subpkg or not @@ -86,19 +88,16 @@ sed -i \ %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. \ +%cmake_kf5 \ %{?appstream:-DAPPSTREAM:BOOL=ON} \ -DAUTOREMOVE:BOOL=OFF \ -DBUILD_PLASMOID=%{?updater:ON}%{?!updater:OFF} -popd -make %{?_smp_mflags} -C %{_target_platform} +%cmake_build %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%cmake_install # hack around gnome-packagekit conflict mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ From 4d9cf2a75b3c0edab72ae6d438cd340babfd691b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:15:28 +0000 Subject: [PATCH 109/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index 2360cba..fe38ec2 100644 --- a/apper.spec +++ b/apper.spec @@ -8,7 +8,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -134,6 +134,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.des %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7efb3e233e9ab490bdcb35affdcf2ea9cfae9e14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:01:57 +0000 Subject: [PATCH 110/111] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index fe38ec2..1e1475f 100644 --- a/apper.spec +++ b/apper.spec @@ -8,7 +8,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 1.0.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -134,6 +134,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.des %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.0.0-8 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4e2cf4e445f2874db1b8ea866ce0a9241227cfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 4 Jan 2021 10:22:54 +0100 Subject: [PATCH 111/111] Orphaned for 6+ weeks --- .gitignore | 4 - ...-binary-as-TARGET-instead-of-PROGRAM.patch | 29 - 0002-Fix-build-without-AppStream.patch | 30 - ...when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch | 25 - 0004-Update-AppStream-metadata.patch | 79 --- apper-1.0.0-qt511.patch | 22 - apper.sh | 17 - apper.spec | 657 ------------------ dead.package | 1 + sources | 1 - 10 files changed, 1 insertion(+), 864 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch delete mode 100644 0002-Fix-build-without-AppStream.patch delete mode 100644 0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch delete mode 100644 0004-Update-AppStream-metadata.patch delete mode 100644 apper-1.0.0-qt511.patch delete mode 100644 apper.sh delete mode 100644 apper.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 10c8458..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/apper-0.9.3-20170226git.tar.xz -/apper-0.9.3-20171102git.tar.xz -/apper-1.0.0-20180119git.tar.xz -/apper-1.0.0.tar.xz diff --git a/0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch b/0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch deleted file mode 100644 index 05d3fed..0000000 --- a/0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 448527f765b1c4f9dc5452cc069baddecaf55e7e Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 21 Feb 2018 13:57:28 +0100 -Subject: [PATCH 1/8] Install apper binary as TARGET instead of PROGRAM - -Otherwise the RPATH set in add_target_properties is ignored - -BUG: 390836 -Differential Revision: https://phabricator.kde.org/D10706 ---- - Apper/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Apper/CMakeLists.txt b/Apper/CMakeLists.txt -index 2b71603..a9855a9 100644 ---- a/Apper/CMakeLists.txt -+++ b/Apper/CMakeLists.txt -@@ -49,7 +49,7 @@ target_link_libraries(apper - - set_target_properties(apper PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/apper) - --install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/apper DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS apper DESTINATION ${CMAKE_INSTALL_BINDIR}) - install(FILES org.kde.apper.desktop DESTINATION ${CMAKE_INSTALL_APPDIR}) - install(FILES org.kde.apper_installer.desktop DESTINATION ${CMAKE_INSTALL_APPDIR}) - install(FILES org.kde.apper_settings.desktop DESTINATION ${CMAKE_INSTALL_APPDIR}) --- -2.17.1 - diff --git a/0002-Fix-build-without-AppStream.patch b/0002-Fix-build-without-AppStream.patch deleted file mode 100644 index ca643ac..0000000 --- a/0002-Fix-build-without-AppStream.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 29df2bd0bc9f4151f5f914b9b46b76beae117e94 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 21 Feb 2018 14:13:26 +0100 -Subject: [PATCH 2/8] Fix build without AppStream - -Don't try to link to AppStream-Qt if building with APPSTREAM=OFF -Differential Revision: https://phabricator.kde.org/D10707 ---- - libapper/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libapper/CMakeLists.txt b/libapper/CMakeLists.txt -index 6581778..485e91d 100644 ---- a/libapper/CMakeLists.txt -+++ b/libapper/CMakeLists.txt -@@ -59,7 +59,10 @@ target_link_libraries(apper_private - KF5::I18n - Qt5::Core - PK::packagekitqt5 -- AppStreamQt - ) - -+if(APPSTREAM) -+ target_link_libraries(apper_private AppStreamQt) -+endif() -+ - install(TARGETS apper_private DESTINATION ${CMAKE_INSTALL_LIBDIR}/apper) --- -2.17.1 - diff --git a/0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch b/0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch deleted file mode 100644 index 0496303..0000000 --- a/0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c34888dd5461e2674feefefe001be2c7d64e427f Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti -Date: Wed, 21 Feb 2018 17:19:17 -0300 -Subject: [PATCH 3/8] Fix compilation when EDIT_ORIGNS_DESKTOP_NAME is defined - ---- - Apper/Settings/Settings.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Apper/Settings/Settings.cpp b/Apper/Settings/Settings.cpp -index 2175ea7..e077b8e 100644 ---- a/Apper/Settings/Settings.cpp -+++ b/Apper/Settings/Settings.cpp -@@ -154,7 +154,7 @@ Settings::~Settings() - void Settings::on_editOriginsPB_clicked() - { - #ifdef EDIT_ORIGNS_DESKTOP_NAME -- KToolInvocation::startServiceByDesktopName(EDIT_ORIGNS_DESKTOP_NAME); -+ KToolInvocation::startServiceByDesktopName(QLatin1String(EDIT_ORIGNS_DESKTOP_NAME)); - #endif //EDIT_ORIGNS_DESKTOP_NAME - } - --- -2.17.1 - diff --git a/0004-Update-AppStream-metadata.patch b/0004-Update-AppStream-metadata.patch deleted file mode 100644 index 27c9cc4..0000000 --- a/0004-Update-AppStream-metadata.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f7e84b2ce9b99c9fef23b859182fed599ee13a54 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Wed, 21 Feb 2018 22:05:47 +0100 -Subject: [PATCH 4/8] Update AppStream metadata - ---- - Apper/org.kde.apper.appdata.xml | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/Apper/org.kde.apper.appdata.xml b/Apper/org.kde.apper.appdata.xml -index 68048a1..aeee039 100644 ---- a/Apper/org.kde.apper.appdata.xml -+++ b/Apper/org.kde.apper.appdata.xml -@@ -1,8 +1,9 @@ - -- -- org.kde.apper.desktop -- CC0-1.0 -+ -+ org.kde.apper -+ FSFAP - GPL-2.0+ -+ - Apper - آپر - Apper -@@ -35,6 +36,7 @@ - xxApperxx - Apper - Apper -+ - KDE application and package management tool - أداة «كدي» لإدارة التّطبيقات والحزم - Ferramienta KDE de xestión d'aplicaciones y paquetes -@@ -67,6 +69,7 @@ - xxKDE application and package management toolxx - KDE 应用程序和包管理工具 - KDE 應用程式與軟體套件管理工具 -+ - -

    - Apper is a graphical management tool for packages and applications -@@ -323,6 +326,7 @@ -

  • 與 KDE Plasma 桌面高度整合
    • - -     -+ - - - https://userbase.kde.org/images.userbase/0/06/Apper-window.png -@@ -357,11 +361,13 @@ - xxThe main window showing a description of the selected packagexx - 主窗口显示了选中包的说明 - 主視窗顯示選取的套件的描述 -- https://userbase.kde.org/images.userbase/0/07/Apper-window1.png -+ https://dantti.files.wordpress.com/2018/02/screenshot_20180220_173026.png - - -- https://projects.kde.org/projects/extragear/sysadmin/apper/ -+ -+ https://www.kde.org/applications/system/apper/ - https://bugs.kde.org/enter_bug.cgi?format=guided&product=apper -+ - KDE - The KDE Community - مجتمع «كدي» -@@ -393,6 +399,9 @@ - xxThe KDE Communityxx - KDE 社区 - KDE 社群 -+ -+ org.kde.apper.desktop -+ - - apper - --- -2.17.1 - diff --git a/apper-1.0.0-qt511.patch b/apper-1.0.0-qt511.patch deleted file mode 100644 index b87a65a..0000000 --- a/apper-1.0.0-qt511.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up apper-1.0.0/Apper/Settings/Settings.cpp.qt511 apper-1.0.0/Apper/Settings/Settings.cpp ---- apper-1.0.0/Apper/Settings/Settings.cpp.qt511 2018-07-31 09:31:10.325795972 -0500 -+++ apper-1.0.0/Apper/Settings/Settings.cpp 2018-07-31 09:33:32.509880561 -0500 -@@ -27,6 +27,7 @@ - #include - #include - -+#include - #include - #include - -diff -up apper-1.0.0/libapper/Requirements.h.qt511 apper-1.0.0/libapper/Requirements.h ---- apper-1.0.0/libapper/Requirements.h.qt511 2018-07-31 09:32:39.579476804 -0500 -+++ apper-1.0.0/libapper/Requirements.h 2018-07-31 09:32:07.813234487 -0500 -@@ -23,6 +23,7 @@ - - #include - -+#include - #include - - namespace Ui { diff --git a/apper.sh b/apper.sh deleted file mode 100644 index 932696b..0000000 --- a/apper.sh +++ /dev/null @@ -1,17 +0,0 @@ -MODULE=apper -VERSION=1.0.0 -DATE=$(date +%Y%m%d)git -TAG=v1.0.0 - -set -x - -rm -rf $MODULE - -git clone kde:$MODULE -pushd $MODULE -git archive $TAG --format tar --prefix=${MODULE}-${VERSION}/ | xz -9 > ../${MODULE}-${VERSION}.tar.xz -popd - -rm -rf $MODULE - - diff --git a/apper.spec b/apper.spec deleted file mode 100644 index 1e1475f..0000000 --- a/apper.spec +++ /dev/null @@ -1,657 +0,0 @@ -# Force out of source build -%undefine __cmake_in_source_build - -#global snap 20180119 -# include -updater applet subpkg or not -#global updater 1 - -Name: apper -Summary: KDE interface for PackageKit -Version: 1.0.0 -Release: 8%{?dist} - -License: GPLv2+ -%if 0%{?snap:1} -Source0: apper-%{version}-%{snap}git.tar.xz -%else -Source0: apper-%{version}.tar.xz -#Source0: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.xz -%endif -URL: https://cgit.kde.org/apper.git - -## upstream patches -Patch1: 0001-Install-apper-binary-as-TARGET-instead-of-PROGRAM.patch -Patch2: 0002-Fix-build-without-AppStream.patch -Patch3: 0003-Fix-compilation-when-EDIT_ORIGNS_DESKTOP_NAME-is-def.patch -Patch4: 0004-Update-AppStream-metadata.patch - -## upstreamable patches -Patch100: apper-1.0.0-qt511.patch - -Obsoletes: kpackagekit < 0.7.0 -Provides: kpackagekit = %{version}-%{release} -# required because gnome-packagekit provides exactly the same interface -Provides: PackageKit-session-service - -%if ! 0%{?updater} -Obsoletes: apper-updater < %{version}-%{release} -%endif - -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: cmake(KDED) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5IconThemes) - -BuildRequires: cmake(LibKWorkspace) - -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5XmlPatterns) -BuildRequires: extra-cmake-modules -BuildRequires: kf5-rpm-macros - -BuildRequires: cmake(AppStreamQt) -BuildRequires: cmake(packagekitqt5) >= 1.0.0 - -BuildRequires: pkgconfig(dbus-1) - -Requires: PackageKit - -%description -KDE interface for PackageKit. - -%package updater -Summary: Apper plasma updater applet -Requires: %{name} = %{version}-%{release} -%description updater -%{summary}. - - -%prep -%autosetup -p1 - -%if 0%{?updater} -# disable update applet by default -sed -i \ - -e 's|X-KDE-PluginInfo-EnabledByDefault=.*|X-KDE-PluginInfo-EnabledByDefault=false|g' \ - plasmoid/package/metadata.desktop -%endif - - -%build -%cmake_kf5 \ - %{?appstream:-DAPPSTREAM:BOOL=ON} \ - -DAUTOREMOVE:BOOL=OFF \ - -DBUILD_PLASMOID=%{?updater:ON}%{?!updater:OFF} - -%cmake_build - - -%install -%cmake_install - -# hack around gnome-packagekit conflict -mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ - %{buildroot}%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service - - -%check -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.apper.desktop ||: - - -%files -%doc TODO -%license COPYING -%{_kf5_bindir}/apper -%{_kf5_datadir}/apper/ -%{_kf5_datadir}/applications/org.kde.apper.desktop -%{_kf5_datadir}/applications/org.kde.apper_installer.desktop -%{_kf5_datadir}/applications/org.kde.apper_settings.desktop -%{_kf5_datadir}/applications/org.kde.apper_updates.desktop -%{_kf5_libdir}/apper/ -%{_libexecdir}/apper-pk-session -%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -%{_kf5_qtplugindir}/kded_apperd.so -%{_kf5_datadir}/kservices5/kded/apperd.desktop -%{_kf5_datadir}/apperd/ -%{_mandir}/man1/apper.1* -%{_kf5_metainfodir}/org.kde.apper.appdata.xml - -%if 0%{?updater} -%files updater -%{_kf5_datadir}/kservices5/plasma-applet-org.packagekit.updater.desktop -%{_kf5_datadir}/plasma/plasmoids/org.packagekit.updater/ -%endif - - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering - 1.0.0-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.0.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jul 30 2018 Rex Dieter - 1.0.0-3 -- pull in upstream fixes -- drop deprecated scriptlets -- drop rpath hacks (no longer needed) -- qt511.patch - -* Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Feb 20 2018 Rex Dieter - 1.0.0-1 -- 1.0.0 (v1.0.0 tag) - -* Fri Feb 09 2018 Igor Gnatenko - 1.0.0-0.3.20180119 -- Escape macros in %%changelog - -* Wed Feb 07 2018 Fedora Release Engineering - 1.0.0-0.2.20180119 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 19 2018 Rex Dieter - 1.0.0-0.1.20180119 -- apper-1.0.0 snapshot, PackageKit-Qt-1.0 support - -* Thu Dec 21 2017 Rex Dieter - 0.9.3-0.11.20171102 -- refresh snapshot (20171102) - -* Wed Aug 02 2017 Fedora Release Engineering - 0.9.3-0.10.20170226 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.9.3-0.9.20170226 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Mar 27 2017 Rex Dieter - 0.9.3-0.8.20170226 -- apper: K4AboutData::appName crasher (#1383747) - -* Wed Mar 15 2017 Rex Dieter - 0.9.3-0.7.20170226 -- fresh snapshot, includes theming fix -- omit broken -updater subpkg (for now at least) -- update URL - -* Fri Feb 10 2017 Fedora Release Engineering - 0.9.3-0.6.20161109 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Dec 22 2016 Rex Dieter - 0.9.3-0.5.20161109 -- apper crashes on startup (#1400011, kde#372292) - -* Thu Nov 10 2016 Rex Dieter - 0.9.3-0.4.20161109 -- 20161109 snapshot, namespaced appdata/.desktop -- Recommends: qt5-style-oxygen, support APPER_NO_STYLE_OVERRIDE env - -* Tue Sep 20 2016 Rex Dieter - 0.9.3-0.3.20160329 -- restore rpath hack - -* Tue Jul 05 2016 Rex Dieter - 0.9.3-0.2.20160329 -- %%check: verify rpath - -* Thu Jun 02 2016 Rex Dieter - 0.9.3-0.1.20160329 -- master/ branch snapshot, kf5-based - -* Thu May 05 2016 Rex Dieter - 0.9.2-6 -- hard-code style (plastique/oxygen) to workaround UI glitches (#1209017) - -* Wed Feb 03 2016 Fedora Release Engineering - 0.9.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Dec 17 2015 Rex Dieter 0.9.2-4 -- (unversioned) Requires: kde-runtime - -* Thu Oct 29 2015 Rex Dieter 0.9.2-3 -- rebuild (PackageKit-Qt) - -* Thu Oct 29 2015 Rex Dieter 0.9.2-2 -- .spec cosmetics, use %%license, (explicitly) Requires: PackageKit - -* Wed Oct 28 2015 Rex Dieter 0.9.2-1 -- 0.9.2, upstream patches - -* Wed Jun 17 2015 Fedora Release Engineering - 0.9.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 04 2015 Rex Dieter 0.9.1-11 -- omit kded/apperd on plasma5/f22+ - -* Tue Apr 28 2015 Rex Dieter 0.9.1-10 -- use cache_age for updater applet too (#1188207) - -* Mon Apr 27 2015 Rex Dieter 0.9.1-9 -- Apper won't check for updates (#1188207) - -* Wed Apr 22 2015 Rex Dieter - 0.9.1-8 -- Requires: plasma-pk-updates (#1214397) -- use %%{?kde_runtime_requires} macro - -* Tue Mar 31 2015 Rex Dieter 0.9.1-7 -- omit plasma4-based updater applet (f22+) - -* Tue Jan 13 2015 Rex Dieter 0.9.1-6 -- disable appstream support (#1180819) - -* Mon Dec 15 2014 Rex Dieter 0.9.1-5 -- Your current backend does not support installing files (#1167018) - -* Mon Dec 15 2014 Rex Dieter 0.9.1-4 -- update URL: (use projects.kde.org) - -* Sat Dec 06 2014 Rex Dieter 0.9.1-3 -- don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063) - -* Tue Oct 28 2014 Rex Dieter 0.9.1-2 -- pull in some upstream fixes - -* Tue Aug 26 2014 Rex Dieter 0.9.1-1 -- apper-0.9.1 - -* Fri Aug 15 2014 Fedora Release Engineering - 0.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 17 2014 Rex Dieter 0.9.0-3 -- rebuild (appstream) - -* Sat Jun 07 2014 Fedora Release Engineering - 0.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 05 2014 Rex Dieter 0.9.0-1 -- apper-0.9.0 - -* Sat Apr 26 2014 Rex Dieter 0.8.3-0.3.20140426 -- respin with translations - -* Sat Apr 26 2014 Rex Dieter 0.8.3-0.2.20140426 -- 0.8.3 20140426 snapshot, fixed appstream support, sans translations (kde svn down) - -* Tue Apr 22 2014 Rex Dieter 0.8.3-0.1.20140422 -- 0.8.3 20140422 snapshot compatible with PK-0.9 (#1089630) - -* Sat Apr 19 2014 Rex Dieter 0.8.1-5 -- rebuild (PackageKit-Qt) - -* Fri Nov 08 2013 Rex Dieter 0.8.1-4 -- enable appstream support (#1026118) - -* Sun Nov 03 2013 Rex Dieter - 0.8.1-3 -- pull in some upstream fixes -- get ready to enable appstream support (#1026118) - -* Mon Aug 26 2013 Lukáš Tinkl 0.8.1-2 -- fix translations in the updater applet - -* Tue Jul 30 2013 Rex Dieter 0.8.1-1 -- 0.8.1 (final) - -* Mon Jun 24 2013 Rex Dieter 0.8.1-0.4.20130624 -- 0.8.1 20130624 snapshot - -* Mon May 20 2013 Rex Dieter 0.8.1-0.3.20130511 -- test kded crasher fix (kde#319967) - -* Mon May 13 2013 Rex Dieter 0.8.1-0.2.20130511 -- don't run apper applet on live image (#948099) - -* Sat May 11 2013 Rex Dieter 0.8.1-0.1.20130511 -- 0.8.1 201305011 snapshot - -* Mon Apr 29 2013 Rex Dieter 0.8.0-5 -- respin previous patch to use kDebug instead - -* Mon Apr 29 2013 Rex Dieter 0.8.0-4 -- Apper ignores "never check for updates" option (#948099) - -* Wed Feb 13 2013 Rex Dieter 0.8.0-3 -- a few more upstream fixes - -* Wed Jan 09 2013 Rex Dieter 0.8.0-2 -- pull in a few upstream fixes, including followup for kde#302786 - -* Tue Jan 08 2013 Rex Dieter 0.8.0-1 -- 0.8.0 - -* Sat Jan 05 2013 Rex Dieter 0.8.0-0.13.20121231git -- Problems with the display of software origins (#891294) - -* Tue Jan 01 2013 Rex Dieter - 0.8.0-0.12.20121231git -- 20121231 snapshot -- enable apper updater systray applet - -* Mon Nov 26 2012 Rex Dieter 0.8.0-0.11.20121126git -- 20121126git snapshot -- use PackageKit-Qt - -* Fri Nov 02 2012 Rex Dieter 0.8.0-0.10.20121102git -- 20121102git snapshot - -* Tue Oct 30 2012 Rex Dieter 0.8.0-0.9.20121024git -- 20121024git snapshot (for pk-0.8.5) - -* Mon Oct 15 2012 Rex Dieter - 0.8.0-0.8.20121002git -- drop systemd_inhibit (here at least, PK or elsewhere is better) -- Apper: cannot perform system update (#866486) - -* Tue Oct 02 2012 Rex Dieter 0.8.0-0.7.20121002git -- 20121002git snapshot -- initial systemd_inhibit support (#830181) -- displays wrong warning when no updates are available (#851864) - -* Fri Sep 07 2012 Rex Dieter 0.8.0-0.6.20120724git -- add scriptlet to register mimetypes (#836559) - -* Fri Jul 27 2012 Fedora Release Engineering - 0.8.0-0.4.20120724git -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 24 2012 Rex Dieter 0.8.0-0.3.20120724git -- 20120724git snapshot - -* Tue Jul 24 2012 Rex Dieter 0.8.0-0.2.20120628git -- rebuild - -* Thu Jun 28 2012 Rex Dieter 0.8.0-0.1.20120628git -- apper-0.8.0 snapshot - -* Thu Jun 28 2012 Rex Dieter 0.7.2-2 -- rebuild (PackageKit) - -* Mon May 21 2012 Rex Dieter 0.7.2-1 -- apper-0.7.2 - -* Mon May 7 2012 Lukáš Tinkl 0.7.1-5 -- respect the settings and don't check for updates when on battery - -* Wed Apr 25 2012 Rex Dieter 0.7.1-4 -- rebuild (PackageKit-qt) - -* Sat Apr 21 2012 Rex Dieter 0.7.1-3 -- more work on wakeups, kudos to Martin Kho (#752564) - -* Mon Apr 16 2012 Rex Dieter 0.7.1-2 -- "Unsigned packages" popup constantly reappears (#806508) -- Apper wakes up yumBackend.py every 5 to 10 minutes (#752564) - -* Tue Feb 21 2012 Rex Dieter 0.7.1-1 -- 0.7.1 (final) - -* Sat Feb 18 2012 Rex Dieter 0.7.1-0.7.20120218 -- 20120218 snapshot (#749240, #753146, #781726) - -* Thu Jan 12 2012 Fedora Release Engineering - 0.7.1-0.6.20111102 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 02 2011 Rex Dieter 0.7.1-0.5.20111102 -- 20111102 snapshot - -* Wed Oct 26 2011 Fedora Release Engineering - 0.7.1-0.4.20111021 -- Rebuilt for glibc bug#747377 - -* Fri Oct 21 2011 Rex Dieter 0.7.1-0.3.20111021 -- 20111021 snapshot, checkbox fixes, translations. - -* Thu Oct 20 2011 Rex Dieter 0.7.1-0.2.20111020 -- fresher snapshot, more fixes upstream. mmm, mmm, good. - -* Thu Oct 20 2011 Rex Dieter 0.7.1-0.1.20111020 -- 0.7.1 20111020 snapshot (with better fix for hack in 0.7.0-5) - -* Wed Oct 19 2011 Rex Dieter 0.7.0-5 -- hack around crash on installing standalone rpms - -* Wed Oct 19 2011 Rex Dieter 0.7.0-4 -- systray_actions patch/hack - -* Mon Oct 17 2011 Rex Dieter 0.7.0-3 -- apper.desktop: Exec=apper %%F (not %%U, it only handles files, not urls) - -* Mon Oct 17 2011 Rex Dieter 0.7.0-2 -- -DAUTOREMOVE:BOOL=OFF (#727788) - -* Tue Oct 11 2011 Rex Dieter 0.7.0-1 -- kpackagekit -> apper - -* Mon Aug 01 2011 Kevin Kofler 0.6.3.3-3 -- support the InstallResources interface, in particular for Plasma services -- bump minimum PackageKit version to 0.6.16 to support the above - -* Mon Feb 07 2011 Fedora Release Engineering - 0.6.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 03 2011 Rex Dieter 0.6.3.3-1 -- 0.6.3.3 release - -* Thu Dec 23 2010 Rex Dieter 0.6.3.2-2 -- show version information by default (#665372) -- show arch information by default (on multilib-capable archs) -- upstream patch for issues found by valgrind - -* Thu Dec 23 2010 Rex Dieter 0.6.3.2-1 -- 0.6.3.2 release - -* Wed Dec 22 2010 Rex Dieter 0.6.3-3 -- fix for software_sources category -- fix reported version - -* Wed Dec 22 2010 Rex Dieter 0.6.3-2 -- fix/improve browsing pk categories - -* Tue Dec 21 2010 Rex Dieter 0.6.3-1 -- kpk-0.6.3 - -* Wed Dec 15 2010 Kevin Kofler 0.6.3-0.2.20101214 -- fetch translations from SVN - -* Tue Dec 14 2010 Rex Dieter 0.6.3-0.1.20101214 -- 0.6.3 snapshot (sans translations) - -* Tue Oct 12 2010 Steven M. Parrish 0.6.2-1 -- New upstream release - -* Tue Sep 21 2010 Lukas Tinkl - 0.6.1-2 -- fix wrong i18n() usage in a patch resulting in broken translations - -* Tue Sep 07 2010 Steven M. Parrish - 0.6.1-1 -- New upstream release - -* Fri Mar 26 2010 Kevin Kofler - 0.6.0-2 -- rebase InstallPrinterDrivers patch -- readd disttag - -* Fri Mar 26 2010 Steven M. Parrish - 0.6.0-1 -- Official 0.6.0 release - -* Wed Mar 24 2010 Kevin Kofler - 0.6.0-0.9.20100301svn -- add support for automatic printer driver installation (Tim Waugh, #576615) - -* Sat Mar 13 2010 Rex Dieter - 0.6.0-0.8.20100301svn -- add minimal kdelibs4 runtime dependency - -* Tue Mar 02 2010 Kevin Kofler - 0.6.0-0.7.20100301svn -- update to 20100301 SVN snapshot - -* Fri Feb 26 2010 Kevin Kofler - 0.6.0-0.6.20100223svn -- update to 20100223 SVN snapshot -- include translations again - -* Wed Feb 24 2010 Rex Dieter - 0.6.0-0.5.r1095080 -- r1095080 - -* Wed Feb 24 2010 Rex Dieter - 0.6.0-0.4.20100224 -- fresh 20100224 svn snapshot - -* Fri Feb 05 2010 Richard Hughes - 0.6.0-0.3.20100111 -- Add Provides: PackageKit-session-service -- Resolves #561437 - -* Thu Jan 14 2010 Rex Dieter - 0.6.0-0.2.20100111 -- File conflict between kpackagekit and gnome-packagekit (#555139) - -* Mon Jan 11 2010 Rex Dieter - 0.6.0-0.1.20100111 -- kpk-0.6.0 2001-01-11 snapshot - -* Mon Jan 11 2010 Richard Hughes - 0.5.2-3 -- Rebuild for PackageKit-qt soname bump - -* Thu Dec 10 2009 Steven M. Parrish - 0.5.2-2 -- Clean up spec file - -* Mon Dec 07 2009 Steven M. Parrish - 0.5.2-1 -- New upstream release - -* Thu Nov 19 2009 Steven M. Parrish - 0.5.1.1-2 -- Remove no longer need patches - -* Tue Nov 17 2009 Steven M. Parrish - 0.5.1.1-1 -- New upstream release fixes #531447, #533755, #536930 - -* Sat Oct 31 2009 Steven M. Parrish - 0.5.0.3-1 -- Official 0.5.0.3 release - -* Sun Oct 25 2009 Steven M. Parrish - 0.5.0.2-1 -- Official 0.5.0.2 release - -* Tue Oct 20 2009 Steven M. Parrish - 0.5.0.1-1 -- Official 0.5.0.1 release -- Includes patch to fix (#469375) default/none issue - -* Tue Sep 15 2009 Steven M. Parrish - 0.5.0-0.1.20090915svn -- New git snapshot - -* Tue Sep 08 2009 Steven M. Parrish - 0.5.0-0.1.20090908svn -- New git snapshot, disable history - -* Wed Sep 02 2009 Steven M. Parrish - 0.5.0-0.1.20090902svn -- New git snapshot - -* Mon Aug 24 2009 Steven M. Parrish - 0.5.0-0.1.20090824svn -- New git snapshot - -* Wed Aug 19 2009 Steven M. Parrish - 0.5.0-0.1.20090819svn -- New upstream release with PolicyKit 1 integration - -* Fri Jul 24 2009 Fedora Release Engineering - 0.4.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 16 2009 Steven M. Parrish 0.4.1.1-3 -- Now includes Sloval(sk) translations - -* Tue Jul 7 2009 Steven M. Parrish 0.4.1.1-2 -- rebuild for new packagekit - -* Thu Jun 11 2009 Steven M. Parrish 0.4.1.1-1 -- Fixed all krazy issues (2 or 3 not much important changed in backend details) -- With KDE >= 4.2.3 persistent notifications are working again so the code to use it was commented out -- Getting duplicated updates was trully fixed -- Added "details" button on error notifications - -* Fri Jun 05 2009 Rex Dieter - 0.4.1-3 -- apply awol InitialPreference patch - -* Fri Jun 05 2009 Steven M. Parrish - 0.4.1-2 -- Added missing translations - -* Fri Jun 05 2009 Rex Dieter 0.4.1-1 -- min pk_version 0.4.7 -- touchup %%files -- highlight missing translations during build (but make it non-fatal) -- drop upstreamed patches - -* Fri Jun 05 2009 Steven M. Parrish - 0.4.1-0 -- New upstream release. Fixes compatibility with Packagekit 0.4.8 (#503989) - -* Tue Apr 28 2009 Lukáš Tinkl - 0.4.0-7 -- upstream patch to fix catalog loading (#493061) - -* Thu Apr 16 2009 Rex Dieter - 0.4.0-6 -- make update notification persistent (#485796) - -* Tue Mar 31 2009 Lukáš Tinkl - 0.4.0-5 -- another respun tarball to fix using those translations (#493061) - -* Tue Mar 17 2009 Lukáš Tinkl - 0.4.0-4 -- respun (fixed) tarball with translations included - -* Mon Mar 09 2009 Richard Hughes - 0.4.0-3 -- Rebuild for PackageKit-qt soname bump - -* Wed Feb 25 2009 Fedora Release Engineering - 0.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 19 2009 Steven M. Parrish 0.4.0-1 -- Official 0.4.0 release - -* Fri Feb 06 2009 Rex Dieter 0.4.2-0.2.20090128svn -- workaround: mime-type/extension binding for .rpm is wrong (#457783) - -* Wed Jan 28 2009 Steven M. Parrish 0.4.2-0.1.20090128svn -- Corrected release tag - -* Wed Jan 28 2009 Steven M. Parrish 0-0.1.20090128svn -- Corrected release tag - -* Wed Jan 28 2009 Steven M. Parrish 0.4.2-svn.1 -- SVN build to solve compatibility issues with packagekit 0.4.2 - -* Wed Nov 26 2008 Rex Dieter 0.3.1-6 -- respin (PackageKit) -- spec cleanup - -* Sat Nov 01 2008 Rex Dieter 0.3.1-5 -- use PackageKit's FindQPackageKit.cmake - -* Tue Oct 21 2008 Rex Dieter 0.3.1-4 -- build against PackageKit-qt - -* Mon Oct 20 2008 Rex Dieter 0.3.1-3 -- patch kpackagekit.desktop (guessed correct X-DBUS-ServiceName value), -- fixes: KDEInit could not launch "/usr/bin/kpackagekit" -- cleanup %%files - -* Thu Oct 16 2008 Steven M. Parrish 0.3.1-2 -- Fix build error - -* Thu Oct 16 2008 Steven M. Parrish 0.3.1-1 -- New upstream release - -* Mon Sep 29 2008 Steven M. Parrish 0.1-1 -- Official 0.1 release - -* Sun Aug 24 2008 Steven M. Parrish 0.1-0.3.b4 -- Excluded underdevelopment binaries and associated files - -* Fri Aug 22 2008 Steven M. Parrish 0.1-0.2.b4 -- Adding missing files - -* Tue Aug 19 2008 Steven M. Parrish 0.1-0.1.b4 -- New upstream release - -* Fri Aug 01 2008 Steven M. Parrish 0.1-0.5.b3 -- Corrected SPEC file regression - -* Thu Jul 31 2008 Steven M. Parrish 0.1-0.4.b3 -- Changed wording on serveral windows to make them better understood - -* Thu Jul 24 2008 Steven M. Parrish 0.1-0.3.b3 -- Removed additional uneeded BRs - -* Tue Jul 22 2008 Steven M. Parrish 0.1-0.2.b3 -- Removed uneeded BRs -- Made use of predefined macros - -* Wed Jul 16 2008 Steven M. Parrish 0.1-0.1.b3 -- Initial SPEC file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 74ddbf4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (apper-1.0.0.tar.xz) = 04a381b993d7d2ad1134ebb6fa9b4d837b51e1e60c62746d7c21a0c2fc0c596ff0e932fcd81c78e160a63291d858ee772ed42f9aaef138763fcffb90497088ce