Add nspr includes, fixes bug 296924

Package-Manager: portage-2.1.7.15/cvs/Linux i686

4 files changed, 96 insertions, 12 deletions

diff --git a/dev-python/gtkmozembed-python/ChangeLog b/dev-python/gtkmozembed-python/ChangeLog
index 5a9143de86f2..8667121e7c1f 100644
--- a/dev-python/gtkmozembed-python/ChangeLog
+++ b/dev-python/gtkmozembed-python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/gtkmozembed-python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gtkmozembed-python/ChangeLog,v 1.15 2009/08/25 11:57:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gtkmozembed-python/ChangeLog,v 1.16 2009/12/24 16:33:30 nirbheek Exp $
+
+*gtkmozembed-python-2.19.1-r12 (24 Dec 2009)
+
+  24 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gtkmozembed-python-2.19.1-r12.ebuild,
+  +files/gtkmozembed-python-2.19.1-include-nspr.patch:
+  Add nspr includes, fixes bug 296924
 
   25 Aug 2009; Alexis Ballier <aballier@gentoo.org>
   gtkmozembed-python-2.19.1.ebuild:
diff --git a/dev-python/gtkmozembed-python/Manifest b/dev-python/gtkmozembed-python/Manifest
index 9bfab86a2a8a..6d209c4ac004 100644
--- a/dev-python/gtkmozembed-python/Manifest
+++ b/dev-python/gtkmozembed-python/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gtkmozembed-python-2.19.1-include-nspr.patch 1229 RMD160 0f61cc8cf238367eb9b0f9d73ba8b5a0b6ee6ba2 SHA1 198f4f15fa1f0fcff0c03cdea126299b21da1752 SHA256 faabdfefebc986ad88455ccd0b1a5e169bd5c2c88f60194ed59ee56fe30e4baa
 AUX gtkmozembed-python-2.19.1-libtool2.patch 258 RMD160 fde8da7619505c900a4e6bda65c53ed513ede654 SHA1 4572d47c6249fa9625ff9ed9bd1fee03ccb94f92 SHA256 4fc38245da2ce74f6c89d78230dda5aadd8dd1fc1c20756d58ffd4b448bb1259
 AUX gtkmozembed-python-2.19.1-xulrunner19.patch 7617 RMD160 abc760201ea7039f98fd6e2d45433580c314e66b SHA1 f777b30b1fbb0aece97e31f096fec3dc3f798e53 SHA256 45ce580e62b0c541adc1ff85c3359c22282a1ecaf2bb24187ce3de664ae6ad45
 DIST gnome-python-extras-2.19.1-split.patch.gz 2372 RMD160 b8585c0ae6b2e5308c397a596089204e14a6d4f7 SHA1 6235ea983e30cccf28d7ca6ee35e46708c68a511 SHA256 749de35005b788e9f49e463ded51fbcda3f39900014f92eef77b305bf729ddd1
 DIST gnome-python-extras-2.19.1.tar.bz2 361721 RMD160 1dd556def13b6cd10ef9a3a747e73ea38ee70e62 SHA1 f97303aa92c300050818ac8a01d0bc0657b2a9e3 SHA256 c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
 EBUILD gtkmozembed-python-2.19.1-r11.ebuild 1143 RMD160 6149d8ced12e932c50592ef530e8b789c51d2846 SHA1 27a25b20f1a2e5c3afb1f729bf81b52951d6f4ad SHA256 6057808ee1c9d9202114250b26458959dc7164d5892aac9345fc565101fe7846
+EBUILD gtkmozembed-python-2.19.1-r12.ebuild 1245 RMD160 0039766470814dc35579fff943f5c519229edbef SHA1 770b756fafca8f553912c8c770cb902282dfad4a SHA256 edd5a6e8aa9301842b25e3c86636be79a6bf593eb18da43ee7d803443ad06411
 EBUILD gtkmozembed-python-2.19.1.ebuild 1400 RMD160 5cacabde791d5f3bc4196dbaa4f5b8c1d19fafe4 SHA1 b64d295b80acbe77d4bdaee9f48f53ca9d2de3b8 SHA256 e7a4a6953af6e5bff82bb94df429558cec32c3c25b884bedc233689d13945a8a
-MISC ChangeLog 2728 RMD160 0d7759f4099f33aed3aa5590bba662f2507c3a14 SHA1 217114f6f88db0854df5b50010be0962c807a7d1 SHA256 e5bc68550db3c29ce7c0f3d84038130c737181bd8081c00880a1989f544807f6
+MISC ChangeLog 2963 RMD160 6661ee8806734bcc958dbba7745dfd228303f51c SHA1 3d39c1f6442223f9359ee0001cabf265e923cfae SHA256 46bd2fd74dfa26026a9a685e2853d67bc8e01ef09706f424524ec061006810b1
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqT0X0ACgkQvFcC4BYPU0qEVQCgleB7fJL/32bp0wzYrRB8YgGh
-zuUAnRwq7S1hpe2MR/hMYQQPCk9PQjec
-=qgSg
------END PGP SIGNATURE-----
diff --git a/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-include-nspr.patch b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-include-nspr.patch
new file mode 100644
index 000000000000..b11af74609da
--- /dev/null
+++ b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-include-nspr.patch
@@ -0,0 +1,39 @@
+Fix building with xulrunner-1.9.2 by including nspr CFLAGS as well
+
+http://bugs.gentoo.org/296924
+
+---
+--- a/gtkmozembed/Makefile.am
++++ b/gtkmozembed/Makefile.am
+@@ -1,7 +1,7 @@
+ # require automake-1.5
+ AUTOMAKE_OPTIONS = 1.5
+ 
+-INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTKMOZEMBED_CFLAGS)
++INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTKMOZEMBED_CFLAGS) $(NSPR_CFLAGS)
+ 
+ defsdir = $(datadir)/pygtk/2.0/defs
+ defs_DATA = gtkmozembed.defs
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,7 @@
+ m4_define(gksu_required_version,              1.2.5)
+ m4_define(gksu2_required_version,             2.0.4)
+ m4_define(gksuui_required_version,            1.0.3)
++m4_define(nspr_required_version,	4.7.4)
+ 
+ AC_INIT(gnome-python-extras, gnome_python_extras_version,
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python])
+@@ -62,6 +63,11 @@
+ AM_PATH_PYTHON(2.3)
+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+ 
++dnl check for nspr
++AC_MSG_CHECKING(for system nspr >= nspr_required_version )
++PKG_CHECK_MODULES(NSPR, nspr >= nspr_required_version)
++AC_SUBST(NSPR_CFLAGS)
++
+ dnl check for pygtk
+ PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)
+ AC_SUBST(PYGTK_CFLAGS)
+
diff --git a/dev-python/gtkmozembed-python/gtkmozembed-python-2.19.1-r12.ebuild b/dev-python/gtkmozembed-python/gtkmozembed-python-2.19.1-r12.ebuild
new file mode 100644
index 000000000000..bf2d5f90ad02
--- /dev/null
+++ b/dev-python/gtkmozembed-python/gtkmozembed-python-2.19.1-r12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gtkmozembed-python/gtkmozembed-python-2.19.1-r12.ebuild,v 1.1 2009/12/24 16:33:30 nirbheek Exp $
+
+EAPI="1"
+
+G_PY_PN="gnome-python-extras"
+
+inherit confutils gnome-python-common
+
+PVP="$(get_version_component_range 1-2)"
+SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2
+	mirror://gentoo/${G_PY_PN}-${PV}-split.patch.gz"
+
+DESCRIPTION="Python bindings for the GtkMozEmbed Gecko library"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="=net-libs/xulrunner-1.9*"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	gnome-python-common_pkg_setup
+
+	G2CONF="${G2CONF} --with-gtkmozembed=xulrunner-1.9"
+}
+
+src_unpack() {
+	gnome-python-common_src_unpack
+
+	epatch "${WORKDIR}/${G_PY_PN}-${PV}-split.patch"
+
+	# Accomodate new releases of libtool
+	epatch "${FILESDIR}/${P}-libtool2.patch"
+
+	# Allow building with xulrunner 1.9, bug #
+	rm "${S}/gtkmozembed/gtkmozembedmodule.c"
+	epatch "${FILESDIR}/${P}-xulrunner19.patch"
+
+	# Fix building with xulrunner-1.9.2, bug 296924
+	epatch "${FILESDIR}/${P}-include-nspr.patch"
+
+	eautoreconf
+}