Hello community, here is the log from the commit of package google-gadgets for openSUSE:Factory checked in at Fri Sep 4 01:29:33 CEST 2009. -------- --- google-gadgets/google-gadgets.changes 2009-06-03 16:45:14.000000000 +0200 +++ google-gadgets/google-gadgets.changes 2009-09-03 12:14:02.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 3 12:13:15 CEST 2009 - dimstar@opensuse.org + +- Add google-gadget-xul191.patch from upstream. Fixes issues with + xulrunner 1.9.1 at runtime. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- google-gadget-xul191.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-gadgets.spec ++++++ --- /var/tmp/diff_new_pack.a8IoYg/_old 2009-09-04 01:28:44.000000000 +0200 +++ /var/tmp/diff_new_pack.a8IoYg/_new 2009-09-04 01:28:44.000000000 +0200 @@ -20,8 +20,8 @@ Name: google-gadgets Version: 0.11.0 -Release: 1 -License: The Apache Software License +Release: 2 +License: Apache Software License .. BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf gcc-c++ update-desktop-files zip BuildRequires: flex @@ -32,12 +32,16 @@ BuildRequires: libwebkit-devel BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: zlib-devel >= 1.2.0 +%if 0%{suse_version} > 1110 +BuildRequires: mozilla-xulrunner191-devel >= 1.9.1 +%else %if %suse_version > 1100 # require final release, otherwise it does not build. BuildRequires: mozilla-xulrunner190-devel >= 1.9.0 %else BuildRequires: mozilla-xulrunner181-devel %endif +%endif %if %suse_version > 1030 BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: libQtWebKit-devel @@ -49,6 +53,8 @@ BuildRequires: NetworkManager-devel startup-notification-devel Group: Productivity/Networking/Web/Utilities Source0: %{name}-for-linux-%{version}.tar.bz2 +# PATCH-FIX=UPSTREAM google-gadget-xul191.patch bnc#501397 dimstar@opensuse.org -- Fix runtime against xul 1.9.1 +Patch0: google-gadget-xul191.patch Summary: Google Gadgets for Linux %description @@ -56,14 +62,8 @@ compatible with the gadgets written for Google Desktop for Windows as well as the Universal Gadgets on iGoogle. - - -Authors: --------- - Google Inc. - %package gtk -License: The Apache Software License +License: Apache Software License .. Summary: Google Gadgets for Linux and Gtk Group: Productivity/Networking/Web/Utilities Requires: %{name} = %{version} @@ -74,14 +74,8 @@ well as the Universal Gadgets on iGoogle. This package provides Gtk+ support. - - -Authors: --------- - Google Inc. - %package qt -License: The Apache Software License +License: Apache Software License .. Summary: Google Gadgets for Linux and Qt Group: Productivity/Networking/Web/Utilities Requires: %{name} = %{version} @@ -92,25 +86,23 @@ well as the Universal Gadgets on iGoogle. This package provides Qt support. - - -Authors: --------- - Google Inc. - %package devel -License: The Apache Software License +License: Apache Software License .. Summary: Google Gadgets for Linux - Development files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-qt = %{version} Requires: %{name}-gtk = %{version} Requires: dbus-1-devel gtk2-devel libqt4-devel libtool zlib-devel libuuid-devel +%if 0%{suse_version} > 1110 +Requires: mozilla-xulrunner191-devel +%else %if %suse_version > 1100 Requires: mozilla-xulrunner190-devel %else Requires: mozilla-xulrunner181-devel %endif +%endif %description devel Google Gadgets provides a platform for running desktop gadgets. It's @@ -118,14 +110,9 @@ well as the Universal Gadgets on iGoogle. This package provides the development files. - - -Authors: --------- - Google Inc. - %prep %setup -q -n %{name}-for-linux-%{version} +%patch0 -p0 %build %{suse_update_config -f} ++++++ google-gadget-xul191.patch ++++++ === extensions/gtkmoz_browser_element/browser_child.cc ================================================================== --- extensions/gtkmoz_browser_element/browser_child.cc (revision 1559) +++ extensions/gtkmoz_browser_element/browser_child.cc (local) @@ -1214,7 +1214,7 @@ static const GREVersionRange kGREVersion = { "1.9a", PR_TRUE, - "1.9.1", PR_TRUE + "1.9.2", PR_FALSE, }; char xpcom_location[4096]; === extensions/smjs_script_runtime/libmozjs_glue.cc ================================================================== --- extensions/smjs_script_runtime/libmozjs_glue.cc (revision 1559) +++ extensions/smjs_script_runtime/libmozjs_glue.cc (local) @@ -199,7 +199,7 @@ static const GREVersionRange kGREVersion = { "1.9a", PR_TRUE, - "1.9.1", PR_TRUE + "1.9.2", PR_FALSE, }; rv = GRE_GetGREPathWithProperties(&kGREVersion, 1, nsnull, 0, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org