diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2012-05-19 11:21:34 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2012-05-19 11:21:34 +0000 |
| commit | fff983bbfef2a9df7fba5f181f353fa0f4e1cfad (patch) | |
| tree | c53a587036a544ee8d9bb2c805ca12fb30066dfb /app-admin/packagekit-base/files | |
| parent | Add ~x86 keyword (diff) | |
| download | historical-fff983bbfef2a9df7fba5f181f353fa0f4e1cfad.tar.gz historical-fff983bbfef2a9df7fba5f181f353fa0f4e1cfad.tar.bz2 historical-fff983bbfef2a9df7fba5f181f353fa0f4e1cfad.zip | |
version bump
Package-Manager: portage-2.2.0_alpha104_p26/cvs/Linux x86_64
Diffstat (limited to 'app-admin/packagekit-base/files')
| -rw-r--r-- | app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch (renamed from app-admin/packagekit-base/files/packagekit-base-0.6.x-npapi-sdk.patch) | 67 |
1 files changed, 27 insertions, 40 deletions
diff --git a/app-admin/packagekit-base/files/packagekit-base-0.6.x-npapi-sdk.patch b/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch index 47de0b3106b9..7b074d739ff4 100644 --- a/app-admin/packagekit-base/files/packagekit-base-0.6.x-npapi-sdk.patch +++ b/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch @@ -1,87 +1,74 @@ -http://bugs.gentoo.org/383141 - ---- configure -+++ configure -@@ -20389,7 +20389,7 @@ +--- PackageKit-0.6.22.orig/configure ++++ PackageKit-0.6.22/configure +@@ -20504,7 +20504,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ -- mozilla-plugin \\ +- mozilla-plugin >= 8.0 \\ + npapi-sdk \\ gio-unix-2.0 \\ - nspr \\ + nspr >= 4.8 \\ cairo \\ -@@ -20397,7 +20397,7 @@ +@@ -20512,7 +20512,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; gtk+-2.0 >= 2.14.0 \\ dbus-glib-1\""; } >&5 ($PKG_CONFIG --exists --print-errors "\ -- mozilla-plugin \ +- mozilla-plugin >= 8.0 \ + npapi-sdk \ gio-unix-2.0 \ - nspr \ + nspr >= 4.8 \ cairo \ -@@ -20408,7 +20408,7 @@ +@@ -20523,7 +20523,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PK_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "\ -- mozilla-plugin \ +- mozilla-plugin >= 8.0 \ + npapi-sdk \ gio-unix-2.0 \ - nspr \ + nspr >= 4.8 \ cairo \ -@@ -20426,7 +20426,7 @@ +@@ -20541,7 +20541,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ -- mozilla-plugin \\ +- mozilla-plugin >= 8.0 \\ + npapi-sdk \\ gio-unix-2.0 \\ - nspr \\ + nspr >= 4.8 \\ cairo \\ -@@ -20434,7 +20434,7 @@ +@@ -20549,7 +20549,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th gtk+-2.0 >= 2.14.0 \\ dbus-glib-1\""; } >&5 ($PKG_CONFIG --exists --print-errors "\ -- mozilla-plugin \ -+ npapi-sdk \ +- mozilla-plugin >= 8.0 \ ++ npapi-sdk \ gio-unix-2.0 \ - nspr \ + nspr >= 4.8 \ cairo \ -@@ -20445,7 +20445,7 @@ +@@ -20560,7 +20560,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PK_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "\ -- mozilla-plugin \ +- mozilla-plugin >= 8.0 \ + npapi-sdk \ gio-unix-2.0 \ - nspr \ + nspr >= 4.8 \ cairo \ -@@ -20472,7 +20472,7 @@ +@@ -20587,7 +20587,7 @@ else fi if test $_pkg_short_errors_supported = yes; then PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ -- mozilla-plugin \ +- mozilla-plugin >= 8.0 \ + npapi-sdk \ gio-unix-2.0 \ - nspr \ + nspr >= 4.8 \ cairo \ -@@ -20481,7 +20481,7 @@ +@@ -20596,7 +20596,7 @@ fi dbus-glib-1" 2>&1` else PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ -- mozilla-plugin \ -+ npapi-sdk \ - gio-unix-2.0 \ - nspr \ - cairo \ ---- configure.ac -+++ configure.ac -@@ -355,7 +355,7 @@ - enable_browser_plugin=$enableval,enable_browser_plugin=yes) - if test x$enable_browser_plugin = xyes; then - PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \ -- mozilla-plugin \ +- mozilla-plugin >= 8.0 \ + npapi-sdk \ gio-unix-2.0 \ - nspr \ + nspr >= 4.8 \ cairo \ |