Actually build and install against xulrunner 1.9, close bug #249470.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64
RepoMan-Options: --force

5 files changed, 278 insertions, 5 deletions

diff --git a/dev-python/gtkmozembed-python/ChangeLog b/dev-python/gtkmozembed-python/ChangeLog
index b14232a093f9..fd479ba6c6c0 100644
--- a/dev-python/gtkmozembed-python/ChangeLog
+++ b/dev-python/gtkmozembed-python/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/gtkmozembed-python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gtkmozembed-python/ChangeLog,v 1.3 2008/11/19 23:56:02 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gtkmozembed-python/ChangeLog,v 1.4 2008/12/14 22:02:53 eva Exp $
+
+*gtkmozembed-python-2.19.1-r11 (14 Dec 2008)
+
+  14 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gtkmozembed-python-2.19.1-libtool2.patch,
+  +files/gtkmozembed-python-2.19.1-xulrunner19.patch,
+  +gtkmozembed-python-2.19.1-r11.ebuild:
+  Actually build and install against xulrunner 1.9, close bug #249470.
 
   19 Nov 2008; Daniel Gryniewicz <dang@gentoo.org>
   gtkmozembed-python-2.19.1-r10.ebuild:
diff --git a/dev-python/gtkmozembed-python/Manifest b/dev-python/gtkmozembed-python/Manifest
index c9930d3a9667..e3d0fa775973 100644
--- a/dev-python/gtkmozembed-python/Manifest
+++ b/dev-python/gtkmozembed-python/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+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-r10.ebuild 1370 RMD160 33181eb744069cbaec6a77bbdcb7c8f9e3b7055f SHA1 1d287851c419866eb183ebc92751fd00f89384aa SHA256 fa08bdf40b639fc5a0c69a735c6fd0e32b1a40a6acfe1f4ec06b98d30d13633b
+EBUILD gtkmozembed-python-2.19.1-r11.ebuild 1080 RMD160 4213b58ab98aba46e86b64b88f242b87d38bd629 SHA1 1b1019e6dd0df3a76c0e01e5a1d82e3890201ed8 SHA256 ce5114d554e81e08bbeca2660509e821302e38efeeda112c6ea7b8ac3d8d06ee
 EBUILD gtkmozembed-python-2.19.1.ebuild 1365 RMD160 8fe406e9252c6375918a6e431c1fdd469773f9db SHA1 ce6877fe21bf535f984932eae5739da79d41383e SHA256 211a78615b8d6f9aeb0244d8bfce5f95b3450a54b75a91383b6088066c86676a
-MISC ChangeLog 806 RMD160 50e36e92c668b6ef52ad58e5ca4112431ef1cfa0 SHA1 aa521ca9dfd724b61ce380c273eb4ce4e1503e57 SHA256 79597f13ad72b8b184f4f3bf8f46507053f040cb21ae77b6022349e31a7ea70d
+MISC ChangeLog 1123 RMD160 81aca63c0a8bb48a86fc013bb50657a3127ef8dd SHA1 2354fece18eaf16ccdab30c951c741ec577c66da SHA256 b0c68ca78122ae2b22e25c163fa4a50802dfe8c8ea25158311434edfc2491095
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJJKefomPajV0RnrERAkMvAJkBtRyRxZZWfFyG4JjMSFTaby0NOACeIVgR
-ta+er8xxoAv7mv0GPYwJ3fE=
-=wDTq
+iEYEARECAAYFAklFgpMACgkQ1fmVwcYIWAbvBgCcDZ41P95CUwdBQIYquiUAA+KG
+1JIAniKPl3X3x/OjjeMYv/Ln0Z1uYhoB
+=t9Es
 -----END PGP SIGNATURE-----
diff --git a/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-libtool2.patch b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-libtool2.patch
new file mode 100644
index 000000000000..3ae68280a40e
--- /dev/null
+++ b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-libtool2.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2008-07-01 14:01:35.000000000 +0200
++++ b/configure.ac	2008-07-01 14:02:08.000000000 +0200
+@@ -43,6 +43,8 @@
+ 
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
++AC_PROG_CXX
++m4_ifdef([LT_OUTPUT],[LT_OUTPUT])
+
+ dnl check for python
+ AM_PATH_PYTHON(2.3)
diff --git a/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-xulrunner19.patch b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-xulrunner19.patch
new file mode 100644
index 000000000000..efd5ef3641f2
--- /dev/null
+++ b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-xulrunner19.patch
@@ -0,0 +1,209 @@
+---
+ Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=532856
+ Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=223265
+ Ubuntu: http://patches.ubuntu.com/by-release/extracted/ubuntu/g/gnome-python-extras/2.19.1-0ubuntu13/02_xul19.dpatch
+
+ Ubuntu patch updated to apply on top of our "split gnome-python-extras" patch
+
+diff -Nuar a/configure.ac b/configure.ac
+--- a/configure.ac	2008-12-12 17:15:44.000000000 +0100
++++ b/configure.ac	2008-12-12 17:23:45.000000000 +0100
+@@ -19,6 +19,7 @@
+ m4_define(mozilla_required_version,           1.2b)
+ m4_define(firefox_required_version,           1.0)
+ m4_define(xulrunner_required_version,         1.8)
++m4_define(xulrunner19_required_version,       1.9)
+ m4_define(libgda_required_version,            2.99.6)
+ m4_define(gksu_required_version,              1.2.5)
+ m4_define(gksu2_required_version,             2.0.4)
+@@ -186,46 +187,80 @@
+ dnl should we build the gtkmozembed module?
+ AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])
+ AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
+-                         [--with-gtkmozembed=mozilla|firefox|xulrunner],
++                         [--with-gtkmozembed=mozilla|firefox|xulrunner|xulrunner-1.9],
+                          [package that provides libgtkmozembed]),
+             [mozpackage=$withval], [mozpackage=any])
+ 
+ if "$build_gtkmozembed"; then
+ if test $mozpackage = any ; then
+ 
++PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner19_required_version
++				gtk+-2.0         >= gtk_required_version],
++  [build_gtkmozembed=true; mozpackage=xulrunner-1.9; mozpkgconfig=libxul-embedding],
++  [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
+                                 gtk+-2.0              >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=xulrunner],
++  [build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=$mozpackage-gtkmozembed],
+   [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
+                                 gtk+-2.0            >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=firefox],
++  [build_gtkmozembed=true; mozpackage=firefox; mozpkgconfig=$mozpackage-gtkmozembed],
+   [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
+                                 gtk+-2.0            >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=mozilla],
++  [build_gtkmozembed=true; mozpackage=mozilla; mozpkgconfig=$mozpackage-gtkmozembed],
+   build_gtkmozembed=false)
+   ])
+   ])
++  ])
+ 
+ else
+ 
+ case $mozpackage in
+-     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
+-     firefox) mozpackage_required_version=firefox_required_version ;;
+-     mozilla) mozpackage_required_version=mozilla_required_version ;;
+-     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])
++	xulrunner-1.9) mozpackage_required_version=xulrunner19_required_version ; mozpkgconfig=libxul-embedding ;;
++	xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
++	firefox) mozpackage_required_version=firefox_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
++	mozilla) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
++	*) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', 'xulrunner-1.9' or 'xulrunner'])
+ esac
+ 
+-PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
+-                                gtk+-2.0                >= gtk_required_version],
++PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpkgconfig >= $mozpackage_required_version,
++                                gtk+-2.0      >= gtk_required_version],
+   build_gtkmozembed=true,
+   build_gtkmozembed=false)
+ 
+ fi # if mozpackage = any
+ 
++if test $mozpackage = xulrunner-1.9; then
++GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
++GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS $(pkg-config --libs libxul-embedding)"
++
++else
++
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+ AC_SUBST(MOZILLA_HOME)
++fi
++
++AC_SUBST(GTKMOZEMBED_CFLAGS)
++AC_SUBST(GTKMOZEMBED_LIBS)
++AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
++
++AC_LANG_PUSH(C++)
++_SAVE_CPPFLAGS=$CPPFLAGS
++_SAVE_CXXFLAGS=$CXXFLAGS
++CXXFLAGS=$GTKMOZEMBED_CFLAGS
++CPPFLAGS=
++AC_COMPILE_IFELSE([AC_LANG_SOURCE(
++[[#ifndef XPCOM_GLUE
++#error "no xpcom glue"
++#endif]])],
++[have_xpcom_glue=yes], [have_xpcom_glue=yes]
++)
++CPPFLAGS=$_SAVE_CPPFLAGS
++CXXFLAGS=$_SAVE_CXXFLAGS
++AC_LANG_POP(C++)
++
++AM_CONDITIONAL(HAVE_XPCOM_GLUE, [test $have_xpcom_glue=yes])
+ 
+ fi # if build_gtkmozembed
+ 
+diff -Nuar a/gtkmozembed/gtkmozembedmodule.cpp b/gtkmozembed/gtkmozembedmodule.cpp
+--- a/gtkmozembed/gtkmozembedmodule.cpp	1970-01-01 01:00:00.000000000 +0100
++++ b/gtkmozembed/gtkmozembedmodule.cpp	2008-12-12 17:19:32.000000000 +0100
+@@ -0,0 +1,73 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++/* include this first, before NO_IMPORT_PYGOBJECT is defined */
++#include <pygobject.h>
++#include <pygtk/pygtk.h>
++
++#ifdef XPCOM_GLUE
++#include "gtkmozembed_glue.cpp"
++#endif
++
++G_BEGIN_DECLS
++void initgtkmozembed(void);
++void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
++void pygtkmozembed_register_classes (PyObject *d);
++G_END_DECLS
++
++extern PyMethodDef pygtkmozembed_functions[];
++
++void
++initgtkmozembed(void)
++{
++    PyObject *m, *d;
++    int argc = 0;
++
++    init_pygobject ();
++
++#ifdef XPCOM_GLUE
++    static const GREVersionRange greVersion = {
++    "1.9b", PR_TRUE,
++    "1.9.*", PR_TRUE
++    };
++    char xpcomLocation[4096];
++    nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++    if (NS_FAILED(rv)) {
++	printf("failed 1\n");
++	return;
++    } else printf("location: %s \n", xpcomLocation);
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    XPCOMGlueStartup(xpcomLocation);
++    if (NS_FAILED(rv)) {
++        printf("failed 2\n");
++        return;
++    }
++    printf("before 3\n");
++
++    rv = GTKEmbedGlueStartup();
++    if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
++        printf("failed 3\n");
++        return;
++    }
++
++    //gtk_moz_embed_set_comp_path(xpcomLocation);
++
++    char *lastSlash = strrchr(xpcomLocation, '/');
++    if (lastSlash)
++      *lastSlash = '\0';
++
++    gtk_moz_embed_set_path(xpcomLocation);
++#endif
++
++    m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
++    d = PyModule_GetDict (m);
++
++    pygtkmozembed_add_constants(m, "GTK_MOZ_EMBED_");
++    pygtkmozembed_register_classes (d);
++
++    if (PyErr_Occurred ()) {
++        Py_FatalError ("can't initialise module gtkmozembed");
++    }
++}
+diff -Nuar a/gtkmozembed/Makefile.am b/gtkmozembed/Makefile.am
+--- a/gtkmozembed/Makefile.am	2008-12-12 17:15:44.000000000 +0100
++++ b/gtkmozembed/Makefile.am	2008-12-12 17:19:32.000000000 +0100
+@@ -13,9 +13,17 @@
+ pkgpyexec_LTLIBRARIES = gtkmozembed.la
+ gtkmozembed_la_LDFLAGS = -module -avoid-version	\
+ 	-export-symbols-regex initgtkmozembed	\
+-	-R$(MOZILLA_HOME)
++	$(NULL)
++
++# only use rpath for non-glue builds
++if HAVE_XPCOM_GLUE
++gtkmozembed_la_LDFLAGS += $(NULL)
++else
++gtkmozembed_la_LDFLAGS += -R$(MOZILLA_HOME)
++endif
++
+ gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
+-gtkmozembed_la_SOURCES = gtkmozembedmodule.c
++gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
+ nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
+ gtkmozembed.c: gtkmozembed.defs gtkmozembed.override
+ CLEANFILES = gtkmozembed.c
diff --git a/dev-python/gtkmozembed-python/gtkmozembed-python-2.19.1-r11.ebuild b/dev-python/gtkmozembed-python/gtkmozembed-python-2.19.1-r11.ebuild
new file mode 100644
index 000000000000..68ec2109bec9
--- /dev/null
+++ b/dev-python/gtkmozembed-python/gtkmozembed-python-2.19.1-r11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 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-r11.ebuild,v 1.1 2008/12/14 22:02:53 eva 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"
+
+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"
+
+	eautoreconf
+}