Hello community, here is the log from the commit of package rhythmbox for openSUSE:Factory checked in at 2012-11-12 07:05:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rhythmbox (Old) and /work/SRC/openSUSE:Factory/.rhythmbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rhythmbox", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/rhythmbox/rhythmbox.changes 2012-10-17 07:22:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rhythmbox.new/rhythmbox.changes 2012-11-12 07:05:57.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Oct 31 20:33:36 UTC 2012 - dimstar@opensuse.org + +- Disable webkit support (define with_webkit 0) (bnc#787216, + bnc#783923). + Based on the defines, we conditionally: + + Enable pkgconfig(webkitgtk-3.0) BuildRequires (with_webkit 1). + + Enable packaging of the context pane plugin (with_webkit 1). + + Pass --without-webkit to configure (with_webkit 0). +- Add rhythmbox-no-webkit-no-context-pane.patch: if webkit support + is disabled, the context pane plugin should not be built (as it + can't work without webkit). +- Add gnome-common BuildRequires and call to autogen.sh, as above + patch touches the build system. + +------------------------------------------------------------------- New: ---- rhythmbox-no-webkit-no-context-pane.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhythmbox.spec ++++++ --- /var/tmp/diff_new_pack.CFGp01/_old 2012-11-12 07:05:59.000000000 +0100 +++ /var/tmp/diff_new_pack.CFGp01/_new 2012-11-12 07:05:59.000000000 +0100 @@ -16,15 +16,22 @@ # +# Build without webkit support for now, as this results in gstreamer 1.0 and +# gstreamer 0.10 being linked together. +%define with_webkit 0 + Name: rhythmbox Version: 2.98 Release: 0 # FIXME: Re-enable clutter-gst BuildRequires and visualizer plugin. +# FIXME: Re-enable webkit support Summary: GNOME Music Management Application License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.gnome.org/projects/rhythmbox/ Source: http://download.gnome.org/sources/rhythmbox/2.98/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM rhythmbox-no-webkit-no-context-pane.patch bgo#685945 dimstar@opensuse.org -- Disable context pane plugin when building without webkit support. +Patch0: rhythmbox-no-webkit-no-context-pane.patch BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -32,6 +39,8 @@ %if 0%{?suse_version} >= 1140 BuildRequires: libdmapsharing-devel %endif +# Required for patch0 +BuildRequires: gnome-common BuildRequires: lirc-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -65,7 +74,9 @@ BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(tdb) BuildRequires: pkgconfig(totem-plparser) >= 3.2.0 +%if %{with_webkit} BuildRequires: pkgconfig(webkitgtk-3.0) +%endif Requires: gstreamer010-plugins-base Requires: gstreamer010-plugins-good # For python plugins @@ -96,15 +107,21 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build +# Needed for patch0 +NOCONFIGURE=1 ./autogen.sh export MOZILLA_PLUGINDIR=%{_libdir}/browser-plugins %configure\ --disable-static\ --disable-scrollkeeper\ --enable-lirc\ --enable-python\ +%if ! %{with_webkit} + --without-webkit \ +%endif --enable-vala %__make %{?_smp_mflags} V=1 @@ -165,7 +182,9 @@ %{_libdir}/rhythmbox/plugins/audiocd/ %{_libdir}/rhythmbox/plugins/audioscrobbler/ %{_libdir}/rhythmbox/plugins/cd-recorder/ +%if %{with_webkit} %{_libdir}/rhythmbox/plugins/context/ +%endif %{_libdir}/rhythmbox/plugins/daap/ %{_libdir}/rhythmbox/plugins/dbus-media-server/ %{_libdir}/rhythmbox/plugins/fmradio/ ++++++ rhythmbox-no-webkit-no-context-pane.patch ++++++

From 64c6837921f2a03cb49772d8ea2e130fd5b55088 Mon Sep 17 00:00:00 2001 From: Kalev Lember <kalevlember@gmail.com> Date: Thu, 11 Oct 2012 08:59:16 +0000 Subject: Disable the context pane plugin when webkit isn't available

https://bugzilla.gnome.org/show_bug.cgi?id=685945 --- diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e4f6e69..3a9ea03 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -14,7 +14,6 @@ SUBDIRS = \ if ENABLE_PYTHON SUBDIRS += \ artsearch \ - context \ im-status \ lyrics \ magnatune \ @@ -24,8 +23,12 @@ SUBDIRS += \ sendto \ rb +if WITH_WEBKIT +SUBDIRS += context endif +endif # ENABLE_PYTHON + if WITH_LIRC SUBDIRS += lirc endif -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org