Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/packagekit-base/files/
Date: Mon, 30 Oct 2017 21:31:59
Message-Id: 1509398766.929b17507cd9bf4d308ca590f9311b96a5363b4d.monsieurp@gentoo
1 commit: 929b17507cd9bf4d308ca590f9311b96a5363b4d
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Oct 1 13:27:51 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 30 21:26:06 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929b1750
7
8 app-admin/packagekit-base: remove unused patches.
9
10 Closes: https://github.com/gentoo/gentoo/pull/5828
11
12 ...PackageKitEntropyClient.output-API-update.patch | 26 ----------------------
13 .../packagekit-base-0.8.15-qtdbus-annotate.patch | 12 ----------
14 .../files/packagekit-base-0.8.x-npapi-sdk.patch | 13 -----------
15 3 files changed, 51 deletions(-)
16
17 diff --git a/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch b/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
18 deleted file mode 100644
19 index e24faeec9a5..00000000000
20 --- a/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
21 +++ /dev/null
22 @@ -1,26 +0,0 @@
23 -From ee2dfacb275e8145c7ae1ba8da86779054adf902 Mon Sep 17 00:00:00 2001
24 -From: Fabio Erculiani <lxnay@×××××××.org>
25 -Date: Fri, 6 Dec 2013 07:40:15 +0100
26 -Subject: [PATCH] entropy: PackageKitEntropyClient.output API update
27 -
28 ----
29 - backends/entropy/entropyBackend.py | 3 ++-
30 - 1 file changed, 2 insertions(+), 1 deletion(-)
31 -
32 -diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py
33 -index 57b6c59..bec8ef6 100755
34 ---- a/backends/entropy/entropyBackend.py
35 -+++ b/backends/entropy/entropyBackend.py
36 -@@ -776,7 +776,8 @@ class PackageKitEntropyClient(Client):
37 - def init_singleton(self):
38 - Client.init_singleton(self, url_fetcher = PkUrlFetcher)
39 -
40 -- def output(self, text, header = "", footer = "", back = False,
41 -+ @classmethod
42 -+ def output(cls, text, header = "", footer = "", back = False,
43 - importance = 0, level = "info", count = None, percent = False):
44 - """
45 - Reimplemented from entropy.output.TextInterface.
46 ---
47 -1.8.4.4
48 -
49
50 diff --git a/app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch b/app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch
51 deleted file mode 100644
52 index 69a0fd7e5f4..00000000000
53 --- a/app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch
54 +++ /dev/null
55 @@ -1,12 +0,0 @@
56 -Index: PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml
57 -===================================================================
58 ---- PackageKit-0.8.12.orig/src/org.freedesktop.PackageKit.xml
59 -+++ PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml
60 -@@ -317,6 +317,7 @@
61 -
62 - <!--*****************************************************************************************-->
63 - <method name="GetPackageHistory">
64 -+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariant"/>
65 - <doc:doc>
66 - <doc:description>
67 - <doc:para>
68
69 diff --git a/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch b/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
70 deleted file mode 100644
71 index 59b3ab10964..00000000000
72 --- a/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
73 +++ /dev/null
74 @@ -1,13 +0,0 @@
75 -diff --git a/configure.ac b/configure.ac
76 -index 3e8d301..7ba7f4b 100644
77 ---- a/configure.ac
78 -+++ b/configure.ac
79 -@@ -361,7 +361,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br
80 - enable_browser_plugin=$enableval,enable_browser_plugin=yes)
81 - if test x$enable_browser_plugin = xyes; then
82 - PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \
83 -- mozilla-plugin >= 8.0 \
84 -+ npapi-sdk \
85 - gio-unix-2.0 \
86 - nspr >= 4.8 \
87 - cairo \