diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2017-10-30 23:22:11 +0100 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2017-10-30 23:24:29 +0100 |
| commit | 78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085 (patch) | |
| tree | 682ddacec40f41180a95055f293756e71c3fbd61 /app-admin | |
| parent | sys-apps/fakeroot: stable 1.22 for sparc, bug #635850 (thanks to Rolf Eike Beer) (diff) | |
| download | gentoo-78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085.tar.gz gentoo-78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085.tar.bz2 gentoo-78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085.zip | |
*/*: revert https://github.com/gentoo/gentoo/pull/5828.
This commit adds back the string of commits from PR 5828.
Diffstat (limited to 'app-admin')
3 files changed, 51 insertions, 0 deletions
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 new file mode 100644 index 000000000000..e24faeec9a50 --- /dev/null +++ b/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch @@ -0,0 +1,26 @@ +From ee2dfacb275e8145c7ae1ba8da86779054adf902 Mon Sep 17 00:00:00 2001 +From: Fabio Erculiani <lxnay@sabayon.org> +Date: Fri, 6 Dec 2013 07:40:15 +0100 +Subject: [PATCH] entropy: PackageKitEntropyClient.output API update + +--- + backends/entropy/entropyBackend.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py +index 57b6c59..bec8ef6 100755 +--- a/backends/entropy/entropyBackend.py ++++ b/backends/entropy/entropyBackend.py +@@ -776,7 +776,8 @@ class PackageKitEntropyClient(Client): + def init_singleton(self): + Client.init_singleton(self, url_fetcher = PkUrlFetcher) + +- def output(self, text, header = "", footer = "", back = False, ++ @classmethod ++ def output(cls, text, header = "", footer = "", back = False, + importance = 0, level = "info", count = None, percent = False): + """ + Reimplemented from entropy.output.TextInterface. +-- +1.8.4.4 + 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 new file mode 100644 index 000000000000..69a0fd7e5f49 --- /dev/null +++ b/app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch @@ -0,0 +1,12 @@ +Index: PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml +=================================================================== +--- PackageKit-0.8.12.orig/src/org.freedesktop.PackageKit.xml ++++ PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml +@@ -317,6 +317,7 @@ + + <!--*****************************************************************************************--> + <method name="GetPackageHistory"> ++ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariant"/> + <doc:doc> + <doc:description> + <doc:para> 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 new file mode 100644 index 000000000000..59b3ab109648 --- /dev/null +++ b/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 3e8d301..7ba7f4b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -361,7 +361,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br + enable_browser_plugin=$enableval,enable_browser_plugin=yes) + if test x$enable_browser_plugin = xyes; then + PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \ +- mozilla-plugin >= 8.0 \ ++ npapi-sdk \ + gio-unix-2.0 \ + nspr >= 4.8 \ + cairo \ |