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: Wed, 29 Jun 2016 07:41:19
Message-Id: 1467184374.c5c9134c484c5d00f1159ef26066a72daa277b28.monsieurp@gentoo
1 commit: c5c9134c484c5d00f1159ef26066a72daa277b28
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Jun 28 20:22:31 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 07:12:54 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c9134c
7
8 app-admin/packagekit-base: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/1788
11
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 .../packagekit-base-0.7.x-npapi-api-change.patch | 17 -----
15 .../files/packagekit-base-0.7.x-npapi-sdk.patch | 72 ----------------------
16 2 files changed, 89 deletions(-)
17
18 diff --git a/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-api-change.patch b/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-api-change.patch
19 deleted file mode 100644
20 index 5c96e51..0000000
21 --- a/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-api-change.patch
22 +++ /dev/null
23 @@ -1,17 +0,0 @@
24 ---- a/contrib/browser-plugin/pk-main.c
25 -+++ b/contrib/browser-plugin/pk-main.c
26 -@@ -503,11 +503,11 @@ NP_Shutdown ()
27 - /**
28 - * NP_GetMIMEDescription:
29 - **/
30 --const char *
31 -+char *
32 - NP_GetMIMEDescription (void)
33 - {
34 - g_debug ("NP_GetMIMEDescription");
35 -- return (const gchar*) "application/x-packagekit-plugin:bsc:PackageKit Plugin";
36 -+ return (gchar*) "application/x-packagekit-plugin:bsc:PackageKit Plugin";
37 - }
38 -
39 - /**
40 -
41
42 diff --git a/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-sdk.patch b/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-sdk.patch
43 deleted file mode 100644
44 index c3e034d..0000000
45 --- a/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-sdk.patch
46 +++ /dev/null
47 @@ -1,72 +0,0 @@
48 ---- PackageKit-0.7.4.orig/configure
49 -+++ PackageKit-0.7.4/configure
50 -@@ -20283,14 +20283,14 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
51 - elif test -n "$PKG_CONFIG"; then
52 - if test -n "$PKG_CONFIG" && \
53 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
54 -- mozilla-plugin >= 8.0 \\
55 -+ npapi-sdk \\
56 - gio-unix-2.0 \\
57 - nspr >= 4.8 \\
58 - cairo \\
59 - pango \\
60 - gtk+-2.0 >= 2.14.0\""; } >&5
61 - ($PKG_CONFIG --exists --print-errors "\
62 -- mozilla-plugin >= 8.0 \
63 -+ npapi-sdk \
64 - gio-unix-2.0 \
65 - nspr >= 4.8 \
66 - cairo \
67 -@@ -20300,7 +20300,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
68 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
69 - test $ac_status = 0; }; then
70 - pkg_cv_PK_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "\
71 -- mozilla-plugin >= 8.0 \
72 -+ npapi-sdk \
73 - gio-unix-2.0 \
74 - nspr >= 4.8 \
75 - cairo \
76 -@@ -20317,14 +20317,14 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
77 - elif test -n "$PKG_CONFIG"; then
78 - if test -n "$PKG_CONFIG" && \
79 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
80 -- mozilla-plugin >= 8.0 \\
81 -+ npapi-sdk \\
82 - gio-unix-2.0 \\
83 - nspr >= 4.8 \\
84 - cairo \\
85 - pango \\
86 - gtk+-2.0 >= 2.14.0\""; } >&5
87 - ($PKG_CONFIG --exists --print-errors "\
88 -- mozilla-plugin >= 8.0 \
89 -+ npapi-sdk \
90 - gio-unix-2.0 \
91 - nspr >= 4.8 \
92 - cairo \
93 -@@ -20334,7 +20334,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
94 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
95 - test $ac_status = 0; }; then
96 - pkg_cv_PK_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "\
97 -- mozilla-plugin >= 8.0 \
98 -+ npapi-sdk \
99 - gio-unix-2.0 \
100 - nspr >= 4.8 \
101 - cairo \
102 -@@ -20360,7 +20360,7 @@ else
103 - fi
104 - if test $_pkg_short_errors_supported = yes; then
105 - PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
106 -- mozilla-plugin >= 8.0 \
107 -+ npapi-sdk \
108 - gio-unix-2.0 \
109 - nspr >= 4.8 \
110 - cairo \
111 -@@ -20368,7 +20368,7 @@ fi
112 - gtk+-2.0 >= 2.14.0" 2>&1`
113 - else
114 - PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
115 -- mozilla-plugin >= 8.0 \
116 -+ npapi-sdk \
117 - gio-unix-2.0 \
118 - nspr >= 4.8 \
119 - cairo \