fix compilation with unmasked npapi-sdk (see notes inside ebuild)

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

3 files changed, 27 insertions, 3 deletions

diff --git a/app-admin/packagekit-base/ChangeLog b/app-admin/packagekit-base/ChangeLog
index 43675c4610f3..ddf22a2aa311 100644
--- a/app-admin/packagekit-base/ChangeLog
+++ b/app-admin/packagekit-base/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2012/07/20 13:15:38 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.26 2012/07/20 13:36:26 lxnay Exp $
+
+  20 Jul 2012; Fabio Erculiani <lxnay@gentoo.org> packagekit-base-0.7.4.ebuild,
+  +files/packagekit-base-0.7.x-npapi-api-change.patch:
+  fix compilation with unmasked npapi-sdk (see notes inside ebuild)
 
   20 Jul 2012; Fabio Erculiani <lxnay@gentoo.org> packagekit-base-0.7.4.ebuild:
   properly handle 'connman' USE flag
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
new file mode 100644
index 000000000000..5c96e51a60ec
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-api-change.patch
@@ -0,0 +1,17 @@
+--- a/contrib/browser-plugin/pk-main.c
++++ b/contrib/browser-plugin/pk-main.c
+@@ -503,11 +503,11 @@ NP_Shutdown ()
+ /**
+  * NP_GetMIMEDescription:
+  **/
+-const char *
++char *
+ NP_GetMIMEDescription (void)
+ {
+ 	g_debug ("NP_GetMIMEDescription");
+-	return (const gchar*) "application/x-packagekit-plugin:bsc:PackageKit Plugin";
++	return (gchar*) "application/x-packagekit-plugin:bsc:PackageKit Plugin";
+ }
+ 
+ /**
+
diff --git a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild b/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
index 92cf52a93fab..67121530f275 100644
--- a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.7.4.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.7.4.ebuild,v 1.5 2012/07/20 13:15:38 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild,v 1.6 2012/07/20 13:36:26 lxnay 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-misc/npapi-sdk-0.27 )
+	nsplugin? ( <net-misc/npapi-sdk-0.27.1 )
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
@@ -65,6 +65,8 @@ RESTRICT="test" # tests are failing atm
 # doc is in the tarball and always installed
 # mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2
 #	(R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247
+# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree
+# drop the npapi-api-change patch below and relax the dependency constraints
 
 # UPSTREAM:
 # documentation/website with --enable-doc-install
@@ -72,6 +74,7 @@ RESTRICT="test" # tests are failing atm
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-sdk.patch #383141
+	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711
 	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
 	sed -i -e '/polkit-backend-1/d' configure || die #423431
 }