Mercurial Mercurial > upstream > oracle > spec-files / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-python-extras-02-using-firefox3.diff
changeset 15169 60bccd3e8580
parent 12545 e55c7267218b 
--- a/patches/gnome-python-extras-02-using-firefox3.diff	Fri Feb 20 00:27:48 2009 +0000
+++ b/patches/gnome-python-extras-02-using-firefox3.diff	Fri Feb 20 02:38:18 2009 +0000
@@ -1,27 +1,28 @@
---- gnome-python-extras-2.19.1/configure.ac.old	2008-05-29 18:09:48.519591000 +0800
-+++ gnome-python-extras-2.19.1/configure.ac	2008-05-29 17:51:24.414368000 +0800
-@@ -19,6 +19,8 @@ m4_define(gtkhtml2_required_version,    
+--- gnome-python-extras-2.25.3/configure.ac.old	2009-02-19 17:56:50.929466507 +0800
++++ gnome-python-extras-2.25.3/configure.ac	2009-02-19 18:18:15.717488826 +0800
+@@ -19,6 +19,8 @@
  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(firefoxxpcom_required_version,      3.0)
- m4_define(libgda_required_version,            2.99.6)
+ m4_define(libgda_required_version,            3.99.11)
  m4_define(gksu_required_version,              1.2.5)
  m4_define(gksu2_required_version,             2.0.4)
-@@ -136,50 +138,94 @@ fi
+@@ -230,53 +232,68 @@
  dnl should we build the gtkmozembed module?
- build_gtkmozembed=false
+ AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])
  AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
 -                         [--with-gtkmozembed=mozilla|firefox|xulrunner],
 +                         [--with-gtkmozembed=mozilla|firefox|firefox-xpcom|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],
++                               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
@@ -30,30 +31,39 @@
 +  [build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=$mozpackage-gtkmozembed],
 +  [
 +PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-xpcom >= firefoxxpcom_required_version
-+				gtk+-2.0         >= gtk_required_version],
++                               gtk+-2.0         >= gtk_required_version],
 +  [build_gtkmozembed=true; mozpackage=firefox-xpcom; mozpkgconfig=firefox-xpcom],
    [
  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],
++  [build_gtkmozembed=true; mozpackage=mozilla; 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 ;;
+-     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 ;;
 +     xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
@@ -62,6 +72,7 @@
 +     mozilla) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
 +     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', 'firefox-xpcom', '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],
@@ -86,9 +97,10 @@
  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`"
+@@ -285,6 +302,29 @@
+    MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
+ fi
  AC_SUBST(MOZILLA_HOME)
- 
 +fi
 +AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
 +
@@ -113,30 +125,10 @@
 +    [Define to 1 if libxpcomglue is being used.])
 +fi
  
- dnl should we build the gtkspell module?
- build_gtkspell=false
---- gnome-python-extras-2.19.1/gtkmozembed/Makefile.am.old	2008-05-29 18:10:19.816117000 +0800
-+++ gnome-python-extras-2.19.1/gtkmozembed/Makefile.am	2008-05-29 15:12:40.063961000 +0800
-@@ -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)
-+	$(NULL)
-+
-+# 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
-+gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
- nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
- gtkmozembed.c: gtkmozembed.defs gtkmozembed.override
- CLEANFILES = gtkmozembed.c
---- /dev/null	2008-05-29 18:02:54.000000000 +0800
-+++ gnome-python-extras-2.19.1/gtkmozembed/gtkmozembedmodule.cpp	2008-05-29 15:12:40.064266000 +0800
+ fi # if build_gtkmozembed
+ 
+--- gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.cpp.old	2009-02-19 18:32:13.210652284 +0800
++++ gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.cpp	2009-02-19 18:00:39.543378297 +0800
 @@ -0,0 +1,73 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -211,3 +203,24 @@
 +        Py_FatalError ("can't initialise module gtkmozembed");
 +    }
 +}
+--- gnome-python-extras-2.25.3/gtkmozembed/Makefile.am.old	2009-02-19 17:57:15.793883019 +0800
++++ gnome-python-extras-2.25.3/gtkmozembed/Makefile.am	2009-02-19 18:12:13.902950193 +0800
+@@ -13,9 +13,16 @@
+ 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
upstream/oracle/spec-files