[rhythmbox/f18] Disable the context pane plugin when webkit isn't available
Kalev Lember
kalev at fedoraproject.org
Thu Oct 11 09:47:32 UTC 2012
commit 6e7b36c8bd19c65d341e39355021c381f71c552d
Author: Kalev Lember <kalevlember at gmail.com>
Date: Thu Oct 11 11:02:58 2012 +0200
Disable the context pane plugin when webkit isn't available
...t-pane-plugin-when-webkit-isn-t-available.patch | 37 ++++++++++++++++++++
rhythmbox.spec | 10 ++++-
2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch b/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
new file mode 100644
index 0000000..dc3f342
--- /dev/null
+++ b/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
@@ -0,0 +1,37 @@
+From a8f5d8cec87ef1586897e94e49bdf54db64bf97b Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Thu, 11 Oct 2012 10:59:16 +0200
+Subject: [PATCH] Disable the context pane plugin when webkit isn't available
+
+---
+ plugins/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+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
+--
+1.7.12.1
+
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 51f1616..cb30a71 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -3,12 +3,13 @@
Name: rhythmbox
Summary: Music Management Application
Version: 2.98
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ with exceptions and GFDL
Group: Applications/Multimedia
URL: http://projects.gnome.org/rhythmbox/
#VCS: git://git.gnome.org/rhythmbox
Source: http://download.gnome.org/sources/rhythmbox/2.98/%{name}-%{version}.tar.xz
+Patch0: Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
Requires: gtk3 >= 2.91.4
Requires: gnome-icon-theme-legacy
@@ -90,6 +91,8 @@ a Rhythmbox plugin.
%prep
%setup -q
+%patch0 -p1 -b .context_plugin_webkit
+autoreconf -fi
%build
@@ -167,7 +170,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_libdir}/rhythmbox/plugins/audiocd/
%{_libdir}/rhythmbox/plugins/audioscrobbler/
%{_libdir}/rhythmbox/plugins/cd-recorder/
-%{_libdir}/rhythmbox/plugins/context/
+#{_libdir}/rhythmbox/plugins/context/
%{_libdir}/rhythmbox/plugins/daap/
%{_libdir}/rhythmbox/plugins/dbus-media-server/
%{_libdir}/rhythmbox/plugins/fmradio/
@@ -202,6 +205,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_datadir}/gir-1.0/*.gir
%changelog
+* Thu Oct 11 2012 Kalev Lember <kalevlember at gmail.com> 2.98-3
+- Disable the context pane plugin when webkit isn't available
+
* Wed Oct 10 2012 Kalev Lember <kalevlember at gmail.com> 2.98-2
- Temporarly disable webkit support to prevent mixed gst 0.10 / 1.0 linkage
More information about the scm-commits
mailing list