Hello community, here is the log from the commit of package liferea checked in at Mon Sep 1 02:37:06 CEST 2008. -------- --- GNOME/liferea/liferea.changes 2008-08-29 19:34:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/liferea/liferea.changes 2008-08-31 15:48:13.002083000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 31 15:33:05 CEST 2008 - cthiel@suse.de + +- switch to xulrunner 190, thanks to Wolfgang Rosenauer! + +------------------------------------------------------------------- New: ---- liferea-1.4.18-xulrunner-1.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.Pj8526/_old 2008-09-01 02:36:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Pj8526/_new 2008-09-01 02:36:56.000000000 +0200 @@ -19,16 +19,17 @@ Name: liferea -%define xulrunner_version 181 -BuildRequires: NetworkManager-devel dbus-1-devel fdupes gcc-c++ gconf2-devel gnutls-devel gtk2-devel hicolor-icon-theme intltool libglade2-devel libgtkhtml-devel libnotify-devel libstdc++-devel libxslt-devel lua-devel mozilla-xulrunner181-devel sqlite-devel update-desktop-files +%define xulrunner_version 190 +BuildRequires: NetworkManager-devel dbus-1-devel fdupes gcc-c++ gconf2-devel gnutls-devel gtk2-devel hicolor-icon-theme intltool libglade2-devel libnotify-devel libstdc++-devel libxslt-devel lua-devel sqlite-devel update-desktop-files # FIXME: for libgtkhtml-devel: checking for 64bit platform... yes -> disabling GtkHTML2 License: GPL v2 or later Group: Productivity/Other Version: 1.4.18 -Release: 1 +Release: 3 Summary: Linux Feed Reader Source: %{name}-%{version}.tar.bz2 Patch: %{name}-opensuse-feeds.patch +Patch1: %{name}-1.4.18-xulrunner-1.9.patch Url: http://liferea.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dbus-1 >= 0.30 @@ -36,13 +37,8 @@ BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel Requires: mozilla-xulrunner%{xulrunner_version} %else -%if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk Requires: mozilla-xulrunner -%else -BuildRequires: gecko-sdk -Requires: mozilla -%endif %endif Requires: hicolor-icon-theme Requires: %{name}-lang = %{version} @@ -70,6 +66,7 @@ %setup -q rm src/liferea %patch +%patch1 %build autoreconf -f -i @@ -82,6 +79,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -fPIC" %configure \ --disable-gtkhtml2 \ + --disable-gecko \ --disable-schemas-install make %{?jobs:-j %jobs} @@ -120,6 +118,8 @@ %files lang -f %{name}.lang %changelog +* Sun Aug 31 2008 cthiel@suse.de +- switch to xulrunner 190, thanks to Wolfgang Rosenauer! * Fri Aug 29 2008 cthiel@suse.de - update to version 1.4.18 * Fixes SF #1800030: Fix date format problem in non UTF-8 locale for date ++++++ liferea-1.4.18-xulrunner-1.9.patch ++++++ --- configure.ac +++ configure.ac @@ -163,35 +163,35 @@ dnl ********* dnl XulRunner dnl ********* if test "x$enable_xulrunner" = "xyes" ; then AC_MSG_CHECKING([for XulRunner 1.9+ support]) - PKG_CHECK_MODULES(XULRUNNER, libxul-embedding, XULRUNNER_PROVIDER=libxul-embedding, XULRUNNER_PROVIDER=) + PKG_CHECK_MODULES(XULRUNNER, [libxul-embedding-unstable nspr], XULRUNNER_PROVIDER=libxul-embedding-unstable, XULRUNNER_PROVIDER=) if test "x$XULRUNNER_PROVIDER" = "x" ; then AC_MSG_CHECKING([for XulRunner 1.8 support]) PKG_CHECK_MODULES(XULRUNNER, xulrunner-gtkmozembed, XULRUNNER_PROVIDER=xulrunner-gtkmozembed, XULRUNNER_PROVIDER=) fi if test "x$XULRUNNER_PROVIDER" = "x" ; then enable_xulrunner=no else enable_xulrunner=yes XULRUNNER_HOME="`$PKG_CONFIG --variable=libdir $XULRUNNER_PROVIDER`" AC_SUBST([XULRUNNER_HOME]) AC_SUBST(XULRUNNER_CFLAGS) AC_SUBST(XULRUNNER_LIBS) - if test "x$XULRUNNER_HOME" = "x" ; then - AC_MSG_RESULT([Fatal: XulRunner enabled, but XULRUNNER_HOME is empty!]) + if test "x`echo $XULRUNNER_CFLAGS | grep -e '-DXPCOM_GLUE'`" = "x" && test "x$XULRUNNER_HOME" = "x" ; then + AC_MSG_RESULT([Fatal: XulRunner enabled without XPCOM_GLUE, but XULRUNNER_HOME is empty!]) exit 1 fi MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' | cut -c 3-` dnl the Mozilla XPCOM access means C++ AC_PROG_CXX fi --- src/mozilla/xulrunner.c +++ src/mozilla/xulrunner.c @@ -25,20 +25,22 @@ #include <gtkmozembed.h> #include "ui/ui_htmlview.h" #include "mozembed.h" #include "plugin.h" static void xulrunner_init(void) { +#ifndef XPCOM_GLUE /* gtk_moz_embed_set_comp_path() must not be called without a component path for XulRunner. Passing NULL will crash Liferea. */ gtk_moz_embed_set_comp_path(XULRUNNER_HOME); +#endif mozembed_init(); } static struct htmlviewPlugin xulrunnerInfo = { .api_version = HTMLVIEW_PLUGIN_API_VERSION, .name = "XulRunner", .priority = 11, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org