summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-22 18:56:08 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-22 18:56:08 +0000
commit97cc0b16884e0d6ecba4c9abd0ab2f7935716d05 (patch)
treeea905999e6f35b4988d6ee7ca3f772fca6e15bd1 /app-admin
parentRemove not needed '+' in cmake argument statement and make it local. (diff)
downloadgentoo-2-97cc0b16884e0d6ecba4c9abd0ab2f7935716d05.tar.gz
gentoo-2-97cc0b16884e0d6ecba4c9abd0ab2f7935716d05.tar.bz2
gentoo-2-97cc0b16884e0d6ecba4c9abd0ab2f7935716d05.zip
Build nsplugin against npapi-sdk instead of xulrunner wrt #383141 by Jory A. Pratt
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/packagekit-base/ChangeLog7
-rw-r--r--app-admin/packagekit-base/files/packagekit-base-0.6.x-npapi-sdk.patch87
-rw-r--r--app-admin/packagekit-base/packagekit-base-0.6.20.ebuild8
3 files changed, 99 insertions, 3 deletions
diff --git a/app-admin/packagekit-base/ChangeLog b/app-admin/packagekit-base/ChangeLog
index 44ea38ed6844..bdc098bc5971 100644
--- a/app-admin/packagekit-base/ChangeLog
+++ b/app-admin/packagekit-base/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/packagekit-base
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.16 2012/04/22 18:43:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.17 2012/04/22 18:56:08 ssuominen Exp $
+
+ 22 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+ packagekit-base-0.6.20.ebuild, +files/packagekit-base-0.6.x-npapi-sdk.patch:
+ Build nsplugin against npapi-sdk instead of xulrunner wrt #383141 by Jory A.
+ Pratt
22 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
-packagekit-base-0.6.16.ebuild, -packagekit-base-0.6.17-r1.ebuild,
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.x-npapi-sdk.patch
new file mode 100644
index 000000000000..47de0b3106b9
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-0.6.x-npapi-sdk.patch
@@ -0,0 +1,87 @@
+http://bugs.gentoo.org/383141
+
+--- configure
++++ configure
+@@ -20389,7 +20389,7 @@
+ 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 \\
++ npapi-sdk \\
+ gio-unix-2.0 \\
+ nspr \\
+ cairo \\
+@@ -20397,7 +20397,7 @@
+ gtk+-2.0 >= 2.14.0 \\
+ dbus-glib-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "\
+- mozilla-plugin \
++ npapi-sdk \
+ gio-unix-2.0 \
+ nspr \
+ cairo \
+@@ -20408,7 +20408,7 @@
+ $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 \
++ npapi-sdk \
+ gio-unix-2.0 \
+ nspr \
+ cairo \
+@@ -20426,7 +20426,7 @@
+ 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 \\
++ npapi-sdk \\
+ gio-unix-2.0 \\
+ nspr \\
+ cairo \\
+@@ -20434,7 +20434,7 @@
+ gtk+-2.0 >= 2.14.0 \\
+ dbus-glib-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "\
+- mozilla-plugin \
++ npapi-sdk \
+ gio-unix-2.0 \
+ nspr \
+ cairo \
+@@ -20445,7 +20445,7 @@
+ $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 \
++ npapi-sdk \
+ gio-unix-2.0 \
+ nspr \
+ cairo \
+@@ -20472,7 +20472,7 @@
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+ PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
+- mozilla-plugin \
++ npapi-sdk \
+ gio-unix-2.0 \
+ nspr \
+ cairo \
+@@ -20481,7 +20481,7 @@
+ 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 \
++ npapi-sdk \
+ gio-unix-2.0 \
+ nspr \
+ cairo \
diff --git a/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild b/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild
index 9f2d0cbeebdd..560d6dc53198 100644
--- a/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild,v 1.5 2012/03/12 17:22:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild,v 1.6 2012/04/22 18:56:08 ssuominen Exp $
EAPI="3"
@@ -38,7 +38,7 @@ CDEPEND="connman? ( net-misc/connman )
>=sys-apps/dbus-1.3.0"
DEPEND="${CDEPEND}
doc? ( dev-util/gtk-doc )
- nsplugin? ( >=net-libs/xulrunner-1.9.1 )
+ nsplugin? ( >=net-misc/npapi-sdk-0.27 )
dev-libs/libxslt
>=dev-util/intltool-0.35.0
dev-util/pkgconfig
@@ -70,6 +70,10 @@ RESTRICT="test" # tests are failing atm
# documentation/website with --enable-doc-install
# failing tests
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.6.x-npapi-sdk.patch #383141
+}
+
src_configure() {
local myconf=""