Update py-gnome2-extra to 2.25.3.

plus add patches based on Upstream Bug#532856 and hacks for libtool to
build gtkmozembed dynamic module again with xulrunner-1.9.

Overview of Changes from 2.25.2 to 2.25.3
==============================================================================

* gda: Now requires and builds with the latest libgda (3.99.11)
  (Murray Cumming)

Overview of Changes from 2.25.1 to 2.25.2
==============================================================================

* gda: Now requires and builds with the latest libgda (3.99.9)
  (Murray Cumming)

Overview of Changes from 2.19.1 to 2.25.1
==============================================================================
* gda:
  - pygda-3.0 is now replaced by pygda-4.0, wrapping libgda-4.0 instead of
  libgda-3.0, with various API changes.
  (Murray Cumming)
  - On windows, install gda.pyd instead of gda.dll, as expected by Python on
  Windows, along with some other Windows fixes. (Armin Burgmeier)
* Fixed the gdl build.
  (Johannes Schmid)
* gtkmozembed:
  - Fix the build with XUL 1.9. (Gustavo J. A. M. Carneiro)
  - Wrap gtk_moz_embed_set_path(). (Matthew Barnes) Bug #400861
  Bug #503067
* Build:
  - Allow the build and install of some modules to be disabled to make
  life easier for distro packagers. (Arun Raghavan) Bug #534307
  - Allow documentation building to be disabled. (Gian Mario Tagliaretti)
  - Use python-config to get python includes. (Sebastien Bacher) Bug #448182.

Overview of Changes from 2.14.3 to 2.19.1
==============================================================================
* egg.trayicon:
  - By popular demand, undeprecate this, at least until Gtk+ adds all the
    functionality to GtkStatusIcon. (Gustavo Carneiro)
* gda
  - Now use libgda-3.0 instead of libgda-1.2. This breaks API.
    (Murray Cumming, Armin Burgmeier)
* gksu2:
  - New module, Various fixes.
   (Gian Mario Tagliaretti, Gustavo Carneiro)

8 files changed, 270 insertions, 50 deletions

diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index dbfbe546947..39b4a59a7bf 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.41 2011/02/28 14:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2011/03/16 06:51:11 obache Exp $
 #
 
-DISTNAME=	gnome-python-extras-2.14.3
+DISTNAME=	gnome-python-extras-2.25.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	11
 CATEGORIES=	x11 python
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.14/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.25/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Python binding for GNOME2
 
+# need xsltproc to build docs
+BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PY_PATCHPLIST=	YES
@@ -19,14 +21,20 @@ USE_LIBTOOL=	YES
 PKGCONFIG_OVERRIDE+=	gnome-python-extras-2.0.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
-USE_TOOLS+=		pkg-config gmake
+USE_TOOLS+=		pkg-config gmake autoconf automake
+USE_LANGUAGES=	c c++
+CONFIGURE_ARGS+=	--with-gtkmozembed=xulrunner-1.9
+CONFIGURE_ARGS+=	--enable-docs
 
 PYTHON_VERSIONS_ACCEPTED=	27 26 25
 
-SUBST_CLASSES+=	ffhome
-SUBST_STAGE.ffhome=	pre-configure
-SUBST_FILES.ffhome=	gtkmozembed/gtkmozembedmodule.c
-SUBST_VARS.ffhome=	LOCALBASE
+pre-configure:
+	${RM} -f ${WRKSRC}/gtkmozembed/gtkmozembedmodule.c
+	${RUN}cd ${WRKSRC};aclocal;autoheader;automake;autoconf
+
+# for libtool happy
+BUILDLINK_FNAME_TRANSFORM.xulrunner+=	-e 's|/libxpcomglue.a|/libxpcomglue_pic.a|g'	
+BUILDLINK_TRANSFORM+=	l:xpcomglue:xpcomglue_pic
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
diff --git a/x11/py-gnome2-extras/PLIST b/x11/py-gnome2-extras/PLIST
index 8453d1394cc..a887edbd30c 100644
--- a/x11/py-gnome2-extras/PLIST
+++ b/x11/py-gnome2-extras/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/10/30 15:47:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/03/16 06:51:11 obache Exp $
 lib/pkgconfig/gnome-python-extras-2.0.pc
 ${PYSITELIB}/gtk-2.0/egg/__init__.py
 ${PYSITELIB}/gtk-2.0/egg/__init__.pyc
@@ -13,11 +13,13 @@ share/gtk-doc/html/pygtkmozembed/gtkmozembed-class-reference.html
 share/gtk-doc/html/pygtkmozembed/index.html
 share/gtk-doc/html/pygtkmozembed/index.sgml
 share/gtk-doc/html/pygtkmozembed/pygtkmozembed.devhelp
+share/gtk-doc/html/pygtkmozembed/style.css
 share/gtk-doc/html/pygtkspell/class-gtkspell.html
 share/gtk-doc/html/pygtkspell/gtkspell-class-reference.html
 share/gtk-doc/html/pygtkspell/index.html
 share/gtk-doc/html/pygtkspell/index.sgml
 share/gtk-doc/html/pygtkspell/pygtkspell.devhelp
+share/gtk-doc/html/pygtkspell/style.css
 share/pygtk/2.0/defs/gtkhtml2.defs
 share/pygtk/2.0/defs/gtkmozembed.defs
 share/pygtk/2.0/defs/trayicon.defs
diff --git a/x11/py-gnome2-extras/distinfo b/x11/py-gnome2-extras/distinfo
index 7e97d9672af..5dd5192c8ae 100644
--- a/x11/py-gnome2-extras/distinfo
+++ b/x11/py-gnome2-extras/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2009/02/17 17:48:24 joerg Exp $
+$NetBSD: distinfo,v 1.9 2011/03/16 06:51:11 obache Exp $
 
-SHA1 (gnome-python-extras-2.14.3.tar.bz2) = 35b48fe0a3716c5323337be7d601066e9fd8e0a0
-RMD160 (gnome-python-extras-2.14.3.tar.bz2) = 09673ff84ddbccf961e4b59c802e19d5172314ec
-Size (gnome-python-extras-2.14.3.tar.bz2) = 363684 bytes
-SHA1 (patch-aa) = ca71fde88d061e79c8711a9233583dfc26050dd9
-SHA1 (patch-ab) = 731e5a8c0948224b240690d7bc4f00bd60fe49d5
+SHA1 (gnome-python-extras-2.25.3.tar.bz2) = e69e5288466c960ed6f985bb10c9969b21ed85a4
+RMD160 (gnome-python-extras-2.25.3.tar.bz2) = e09bc0152512e2caa61626a7dc788d7336f24e46
+Size (gnome-python-extras-2.25.3.tar.bz2) = 370489 bytes
+SHA1 (patch-configure.ac) = 99dbd3acf78da883ff10cebd148bafcb6d6a9928
+SHA1 (patch-gtkmozembed_Makefile.am) = d4c3d324c328bec48fd00e4e641f1a539b0628ce
+SHA1 (patch-gtkmozembed_gtkmozembedmodule.cpp) = c870d91b64f222930efccf62c565d7f738081424
diff --git a/x11/py-gnome2-extras/patches/patch-aa b/x11/py-gnome2-extras/patches/patch-aa
deleted file mode 100644
index 52cb47efcfc..00000000000
--- a/x11/py-gnome2-extras/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/09/03 09:39:58 drochner Exp $
-
---- gtkmozembed/gtkmozembedmodule.c.orig	2004-12-15 01:30:45.000000000 +0100
-+++ gtkmozembed/gtkmozembedmodule.c
-@@ -5,6 +5,8 @@
- /* include this first, before NO_IMPORT_PYGOBJECT is defined */
- #include <pygobject.h>
- 
-+#include <stdlib.h>
-+
- void pygtkmozembed_register_classes (PyObject *d);
- void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
- 
-@@ -15,6 +17,8 @@ initgtkmozembed(void)
- {
-     PyObject *m, *d;
- 
-+    setenv("MOZILLA_FIVE_HOME", "@LOCALBASE@/lib/firefox", 1);
-+
-     init_pygobject ();
- 
-     m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
diff --git a/x11/py-gnome2-extras/patches/patch-ab b/x11/py-gnome2-extras/patches/patch-ab
deleted file mode 100644
index 2c5c1927694..00000000000
--- a/x11/py-gnome2-extras/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/02/17 17:48:24 joerg Exp $
-
---- gdl/gdl.override.orig	2009-02-17 18:45:42.000000000 +0100
-+++ gdl/gdl.override
-@@ -6,7 +6,6 @@ headers
- #include <pygtk/pygtk.h>
- #include <gdl/gdl-dock.h>
- #include <gdl/libgdltypebuiltins.h>
--#include <gdl/gdl-icons.h>
- #ifndef HAVE_GDL_0_7
- # include <gdl/gdl-dock-bar.h>
- #endif
diff --git a/x11/py-gnome2-extras/patches/patch-configure.ac b/x11/py-gnome2-extras/patches/patch-configure.ac
new file mode 100644
index 00000000000..25e1361e91e
--- /dev/null
+++ b/x11/py-gnome2-extras/patches/patch-configure.ac
@@ -0,0 +1,138 @@
+$NetBSD: patch-configure.ac,v 1.1 2011/03/16 06:51:13 obache Exp $
+
+* Allow building with xulrunner 1.9
+  https://bugzilla.gnome.org/show_bug.cgi?id=532856
+
+--- configure.ac.orig	2009-02-15 22:20:23.000000000 +0000
++++ configure.ac
+@@ -19,6 +19,7 @@ m4_define(gtkhtml2_required_version,    
+ 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,            3.99.11)
+ m4_define(gksu_required_version,              1.2.5)
+ m4_define(gksu2_required_version,             2.0.4)
+@@ -81,6 +82,8 @@ AM_CONDITIONAL(OS_WIN32, test "$os_win32
+ AC_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
++AC_PROG_CXX
++m4_ifdef([LT_OUTPUT],[LT_OUTPUT])
+ 
+ dnl check for python
+ AM_PATH_PYTHON(2.3)
+@@ -230,65 +233,88 @@ AM_CONDITIONAL(BUILD_EGG, $build_eggrece
+ 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
+ 
++GTKMOZEMBED_CODEGEN_DEFINES=""
+ 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_CHECKING([for extra gtkmozembed code generation flags])
+-         PKG_CHECK_MODULES(XUL19, mozilla-gtkmozembed >= 0.21 gtk+-2.0,
+-                           GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19",
+-                           GTKMOZEMBED_CODEGEN_DEFINES="")
+-         AC_MSG_RESULT([$GTKMOZEMBED_CODEGEN_DEFINES])
+-         ;;
+-     *) 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 ; GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19" ;;
++     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
+ AC_SUBST(GTKMOZEMBED_CODEGEN_DEFINES)
+ 
+-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
+ 
+ AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
+-if test -n "$export_dynamic"; then
+-  GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
+-fi
+-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+-if test -z "$MOZILLA_HOME"; then
+-   MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
+-fi
+-AC_SUBST(MOZILLA_HOME)
++if test $mozpackage = xulrunner-1.9; then
++  GTKMOZEMBED_CFLAGS="$(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding gtk+-2.0)"
++else
++  MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
++  if test -z "$MOZILLA_HOME"; then
++     MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
++  fi
++  AC_SUBST(MOZILLA_HOME)
++fi # $mozpackage = xulrunner-1.9
+ 
+ fi # if build_gtkmozembed
+ 
+ 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])
++if test "$have_xpcom_glue" = "yes"; then
++  AC_DEFINE(HAVE_XPCOM_GLUE, 1,
++    [Define to 1 if libxpcomglue is being used.])
++fi
++
+ if test -n "$export_dynamic"; then
+   GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
+ fi
diff --git a/x11/py-gnome2-extras/patches/patch-gtkmozembed_Makefile.am b/x11/py-gnome2-extras/patches/patch-gtkmozembed_Makefile.am
new file mode 100644
index 00000000000..f8358df8bee
--- /dev/null
+++ b/x11/py-gnome2-extras/patches/patch-gtkmozembed_Makefile.am
@@ -0,0 +1,25 @@
+$NetBSD: patch-gtkmozembed_Makefile.am,v 1.1 2011/03/16 06:51:13 obache Exp $
+
+* Allow building with xulrunner 1.9
+  https://bugzilla.gnome.org/show_bug.cgi?id=532856
+
+--- gtkmozembed/Makefile.am.orig	2008-12-12 01:06:29.000000000 +0000
++++ gtkmozembed/Makefile.am
+@@ -13,9 +13,15 @@ pkgpyexecdir = $(pyexecdir)/gtk-2.0
+ pkgpyexec_LTLIBRARIES = gtkmozembed.la
+ gtkmozembed_la_LDFLAGS = -module -avoid-version	\
+ 	-export-symbols-regex initgtkmozembed	\
+-	-R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
++	$(NULL)
++
++# only use rpath for non-glue builds
++if !HAVE_XPCOM_GLUE
++       gtkmozembed_la_LDFLAGS + = -R$(MOZILLA_HOME) -L$(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/x11/py-gnome2-extras/patches/patch-gtkmozembed_gtkmozembedmodule.cpp b/x11/py-gnome2-extras/patches/patch-gtkmozembed_gtkmozembedmodule.cpp
new file mode 100644
index 00000000000..1ba201c4fe9
--- /dev/null
+++ b/x11/py-gnome2-extras/patches/patch-gtkmozembed_gtkmozembedmodule.cpp
@@ -0,0 +1,80 @@
+$NetBSD: patch-gtkmozembed_gtkmozembedmodule.cpp,v 1.1 2011/03/16 06:51:13 obache Exp $
+
+* Allow building with xulrunner 1.9
+  https://bugzilla.gnome.org/show_bug.cgi?id=532856
+
+--- gtkmozembed/gtkmozembedmodule.cpp.orig	2011-03-12 10:53:59.000000000 +0000
++++ gtkmozembed/gtkmozembedmodule.cpp
+@@ -0,0 +1,72 @@
++#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("GRE_GetGREPathWithProperties failed\n");
++	return;
++    }
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    XPCOMGlueStartup(xpcomLocation);
++    if (NS_FAILED(rv)) {
++        printf("XPCOMGlueStartup failed\n");
++        return;
++    }
++
++    rv = GTKEmbedGlueStartup();
++    if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
++        printf("GTKEmbedGlueStartup failed\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");
++    }
++}