Add nspr includes, fixes bug 296924

(Portage version: 2.1.7.15/cvs/Linux i686)

3 files changed, 93 insertions, 1 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/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
+}