working ebuild

gtkmozembed-python-2.19.1-use-1.9.patch (text/plain), 4.05 KB, created by Dmitri Bogomolov on 2008-11-19 14:06:36 UTC

--- gnome-python-extras-2.19.1/configure.ac	2008-11-19 14:43:28.353647972 +0200
+++ gnome-python-extras-2.19.1/configure.ac	2008-11-19 14:37:08.866395933 +0200
@@ -18,7 +18,7 @@
 m4_define(gtkhtml2_required_version,          2.3.1)
 m4_define(mozilla_required_version,           1.0.0)
 m4_define(firefox_required_version,           1.0)
-m4_define(xulrunner_required_version,         1.8)
+m4_define(xulrunner_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)
@@ -191,17 +191,17 @@
 if "$build_gtkmozembed"; then
 if test $mozpackage = any ; then
 
-PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
+PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner_required_version
                                 gtk+-2.0              >= gtk_required_version],
-  [build_gtkmozembed=true; mozpackage=xulrunner],
+  [build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=libxul-embedding],
   [
 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)
   ])
   ])
@@ -209,13 +209,13 @@
 else
 
 case $mozpackage in
-     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
-     firefox) mozpackage_required_version=firefox_required_version ;;
-     seamonkey) mozpackage_required_version=mozilla_required_version ;;
+     xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=libxul-embedding ;;
+     firefox) mozpackage_required_version=firefox_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
+     seamonkey) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
      *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])
 esac
 
-PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
+PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpkgconfig >= $mozpackage_required_version,
                                 gtk+-2.0                >= gtk_required_version],
   build_gtkmozembed=true,
   build_gtkmozembed=false)
@@ -228,9 +228,22 @@
 fi # if build_gtkmozembed
 
 AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
+if test $mozpackage = xulrunner; then
+GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
+GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS $(pkg-config --libs libxul-embedding)"
+
+else
+
 if test -n "$export_dynamic"; then
   GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
 fi
+fi
+
+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
 
 dnl should we build the gtkspell module?
 AC_ARG_BINDING([gtkspell], [ON])
--- gnome-python-extras-2.19.1/gtkmozembed/Makefile.am	2008-11-19 13:14:49.265883430 +0200
+++ gnome-python-extras-2.19.1/gtkmozembed/Makefile.am	2008-11-19 13:11:53.354640076 +0200
@@ -12,8 +12,13 @@
 # gtkmozembed module
 pkgpyexec_LTLIBRARIES = gtkmozembed.la
 gtkmozembed_la_LDFLAGS = -module -avoid-version	\
-	-export-symbols-regex initgtkmozembed	\
-	-R$(MOZILLA_HOME)
+	-export-symbols-regex initgtkmozembed
+
+# only use rpath for non-glue builds
+if !HAVE_XPCOM_GLUE
+	gtkmozembed_la_LDFLAGS + = -R$(MOZILLA_HOME)
+endif
+
 gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
 gtkmozembed_la_SOURCES = gtkmozembedmodule.c
 nodist_gtkmozembed_la_SOURCES = gtkmozembed.c