commit python-gnome-extras for openSUSE:Factory
Hello community,
here is the log from the commit of package python-gnome-extras for openSUSE:Factory
checked in at Wed May 20 22:21:57 CEST 2009.
--------
--- python-gnome-extras/python-gnome-extras.changes 2009-04-03 11:25:37.000000000 +0200
+++ python-gnome-extras/python-gnome-extras.changes 2009-05-06 15:15:40.000000000 +0200
@@ -1,0 +2,17 @@
+Wed May 6 15:15:11 CEST 2009 - vuntz@novell.com
+
+- Build against mozilla-xulrunner190 on openSUSE <= 11.1.
+
+-------------------------------------------------------------------
+Wed May 6 05:03:10 CEST 2009 - vuntz@novell.com
+
+- Review changes.
+
+-------------------------------------------------------------------
+Mon May 4 16:09:38 CEST 2009 - wr@opensuse.org
+
+- Add xulrunner19.patch: make gtkembedmoz work with XULRunner 1.9's
+ XPCOM_GLUE (bnc#480992, bgo#532856)
+- Build against mozilla-xulrunner191
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xulrunner19.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-gnome-extras.spec ++++++
--- /var/tmp/diff_new_pack.dK2631/_old 2009-05-20 22:19:57.000000000 +0200
+++ /var/tmp/diff_new_pack.dK2631/_new 2009-05-20 22:19:57.000000000 +0200
@@ -20,29 +20,36 @@
Name: python-gnome-extras
%define _name gnome-python-extras
-%define geckoversion 190
-BuildRequires: libgnomeui-devel
+%if 0%{suse_version} > 1110
+%define xulrunner_version 191
+%else
+%define xulrunner_version 190
+%endif
+BuildRequires: gcc-c++
BuildRequires: gdl-devel
BuildRequires: gtk-doc
BuildRequires: gtk2-devel
BuildRequires: gtkspell-devel
BuildRequires: libgda-4_0-devel
+BuildRequires: libgnomeui-devel
BuildRequires: libgtkhtml-devel
+BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
BuildRequires: python-devel
BuildRequires: python-gnome-devel
# Needed for the documentation to build:
BuildRequires: python-gobject2-doc
-BuildRequires: mozilla-xulrunner%{geckoversion}-devel
Url: ftp://ftp.gnome.org/pub/gnome/sources/gnome-python-extras
Summary: Python bindings for GNOME
Version: 2.25.3
-Release: 3
+Release: 4
Source: %{_name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM xulrunner19.patch bgo532856 bnc480992 wr@opensuse.org -- Make gtkembedmoz work with xulrunner 1.9
+Patch0: xulrunner19.patch
License: GPL v2 or later; LGPL v2.1 or later
Group: Development/Libraries/Python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: python-gnome python-gtk python-orbit
-Requires: mozilla-xulrunner%{geckoversion}
+Requires: mozilla-xulrunner%{xulrunner_version}
Provides: %{name}-devel = %{version}-%{release}
%{py_requires}
@@ -97,8 +104,10 @@
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%build
+autoreconf -i -f
%configure --enable-docs
make %{?jobs:-j%jobs}
@@ -140,6 +149,14 @@
%{_datadir}/gtk-doc/html/pygtkspell
%changelog
+* Wed May 06 2009 vuntz@novell.com
+- Build against mozilla-xulrunner190 on openSUSE <= 11.1.
+* Wed May 06 2009 vuntz@novell.com
+- Review changes.
+* Mon May 04 2009 wr@opensuse.org
+- Add xulrunner19.patch: make gtkembedmoz work with XULRunner 1.9's
+ XPCOM_GLUE (bnc#480992, bgo#532856)
+- Build against mozilla-xulrunner191
* Fri Apr 03 2009 vuntz@novell.com
- Remove python-numeric Requires: there's no reference to it
anywhere in the code, so it wasn't needed.
++++++ xulrunner19.patch ++++++
diff -uprN gnome-python-extras-2.25.3.orig/configure.ac gnome-python-extras-2.25.3/configure.ac
--- gnome-python-extras-2.25.3.orig/configure.ac 2009-04-30 13:52:57.000000000 +0200
+++ gnome-python-extras-2.25.3/configure.ac 2009-04-30 13:53:05.000000000 +0200
@@ -18,7 +18,7 @@ m4_define(gnome_python_required_version,
m4_define(gtkhtml2_required_version, 2.3.1)
m4_define(mozilla_required_version, 1.2b)
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, 3.99.11)
m4_define(gksu_required_version, 1.2.5)
m4_define(gksu2_required_version, 2.0.4)
@@ -38,6 +38,8 @@ AC_DEFINE(GNOME_PYTHON_EXTRAS_MINOR_VERS
AC_DEFINE(GNOME_PYTHON_EXTRAS_MICRO_VERSION, gnome_python_extras_micro_version,
[Gnome-Python-Extras macro version])
+AC_PROG_CXX
+
dnl AC_ARG_BINDING(NAME, DEFAULT [, MODULENAME])
AC_DEFUN([AC_ARG_BINDING],
[AC_ARG_ENABLE([$1],
@@ -237,58 +239,81 @@ AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
if "$build_gtkmozembed"; then
if test $mozpackage = any ; then
-PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
- gtk+-2.0 >= gtk_required_version],
- [build_gtkmozembed=true; mozpackage=xulrunner],
+PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner_required_version
+ nspr >= 4.7
+ gtk+-2.0 >= gtk_required_version],
+ [build_gtkmozembed=true; mozpackage=xulrunner;
+ GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19"; 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)
])
])
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])
- ;;
+ xulrunner)
+ mozpackage_required_version=xulrunner_required_version
+ GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19"
+ mozpkgconfig=libxul-embedding
+ ;;
+ 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', 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; then
+ GTKMOZEMBED_CFLAGS="$(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding gtk+-2.0 nspr)"
+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
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 -uprN gnome-python-extras-2.25.3.orig/gtkmozembed/gtkmozembedmodule.c gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.c
--- gnome-python-extras-2.25.3.orig/gtkmozembed/gtkmozembedmodule.c 2009-04-30 13:52:57.000000000 +0200
+++ gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* include this first, before NO_IMPORT_PYGOBJECT is defined */
-#include
participants (1)
-
root@Hilbert.suse.de