[arch-commits] Commit in rhythmbox/trunk (3 files)
Jan Steffens
heftig at nymeria.archlinux.org
Sun Apr 7 11:47:08 UTC 2013
Date: Sunday, April 7, 2013 @ 13:47:08
Author: heftig
Revision: 182112
2.99
Modified:
rhythmbox/trunk/PKGBUILD
Deleted:
rhythmbox/trunk/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
rhythmbox/trunk/rhythmbox-2.98-xinitthreads.patch
-------------------------------------------------------------------+
Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch | 37 ----
PKGBUILD | 37 +---
rhythmbox-2.98-xinitthreads.patch | 76 ----------
3 files changed, 12 insertions(+), 138 deletions(-)
Deleted: Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
===================================================================
--- Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch 2013-04-07 11:00:40 UTC (rev 182111)
+++ Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch 2013-04-07 11:47:08 UTC (rev 182112)
@@ -1,37 +0,0 @@
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-07 11:00:40 UTC (rev 182111)
+++ PKGBUILD 2013-04-07 11:47:08 UTC (rev 182112)
@@ -3,22 +3,17 @@
# Contributor: Giovanni Scafora <giovanni at archlinux.org>
pkgname=rhythmbox
-pkgver=2.98
-pkgrel=4
+pkgver=2.99
+pkgrel=1
pkgdesc="An iTunes-like music playback and management application"
-arch=('i686' 'x86_64')
-license=('GPL')
+arch=(i686 x86_64)
+license=(GPL)
url="http://www.rhythmbox.org"
-depends=('dconf' 'desktop-file-utils' 'gstreamer0.10-base-plugins'
- 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
- 'libnotify' 'libpeas' 'media-player-info' 'python2-gobject'
- 'totem-plparser' 'tdb')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection'
- 'vala' 'gnome-common' 'gtk-doc' 'grilo' 'libdmapsharing' 'lirc-utils'
- 'libgpod' 'libmtp')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
- 'gstreamer0.10-bad-plugins: Extra media codecs'
- 'gstreamer0.10-ffmpeg: Extra media codecs'
+depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info python2-gobject totem-plparser tdb webkitgtk3)
+makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp)
+optdepends=('gst-plugins-ugly: Extra media codecs'
+ 'gst-plugins-bad: Extra media codecs'
+ 'gst-libav: Extra media codecs'
'brasero: Audio CD Recorder plugin'
'libdmapsharing: DAAP Music Sharing plugin'
'grilo-plugins: Grilo media browser plugin'
@@ -28,23 +23,15 @@
'zeitgeist: Zeitgeist plugin')
options=('!libtool' '!emptydirs')
install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
- Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
- rhythmbox-2.98-xinitthreads.patch)
-sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5'
- '6510214e7fe0a18d17d8c599ae065bd48c2e1f82931fe82e3d1cc684a0801cd6'
- 'cd9af451a411e5a621c385d43f5ddd3664b3d085fc12dc7d5e5cd1f5db9e73b0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('5a888f6c9607c4364784469e56c245338f96da654c60a12fad3c9726388ad60a')
build() {
cd "$pkgname-$pkgver"
- patch -Np1 -i "${srcdir}/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch"
- patch -Np1 -i "${srcdir}/rhythmbox-2.98-xinitthreads.patch"
- autoreconf -fi
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/rhythmbox \
--localstatedir=/var --disable-static \
- --enable-daap --enable-python --enable-vala \
- --with-mdns=avahi --disable-scrollkeeper --without-webkit
+ --enable-daap --enable-python --enable-vala
make
}
Deleted: rhythmbox-2.98-xinitthreads.patch
===================================================================
--- rhythmbox-2.98-xinitthreads.patch 2013-04-07 11:00:40 UTC (rev 182111)
+++ rhythmbox-2.98-xinitthreads.patch 2013-04-07 11:47:08 UTC (rev 182112)
@@ -1,76 +0,0 @@
-From 1780aab638aa39704be34fc214de39b4847a87b2 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at hadess.net>
-Date: Wed, 17 Oct 2012 19:02:50 +0200
-Subject: [PATCH] shell: Call XInitThreads() on X11 systems
-
-Otherwise bad things can happen with some plugins that expect
-mutexes to work, like the visualiser plugin and Clutter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686320
----
- configure.ac | 15 +++++++++++++++
- shell/main.c | 12 ++++++++++++
- 2 files changed, 27 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 009c838..8a88d72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,10 +86,25 @@ PKG_PROG_PKG_CONFIG
-
- PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-unix-2.0 >= $GLIB_REQS)
-
-+dnl Always require libX11 for XInitThreads() on X11 systems
-+X11_PKG=""
-+gdk_targets=`$PKG_CONFIG --variable targets gdk-3.0`
-+for target in $gdk_targets; do
-+ case "$target" in
-+ x11)
-+ X11_PKG=x11
-+ break
-+ ;;
-+ *)
-+ ;;
-+ esac
-+done
-+
- dnl note: gio-unix-2.0 is here for libmediaplayerid
- PKG_CHECK_MODULES(RHYTHMBOX, \
- gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \
- gtk+-3.0 >= $GTK_REQS \
-+ $X11_PKG \
- gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS \
- glib-2.0 >= $GLIB_REQS \
- gio-2.0 >= $GLIB_REQS \
-diff --git a/shell/main.c b/shell/main.c
-index 3c0346d..696f3e9 100644
---- a/shell/main.c
-+++ b/shell/main.c
-@@ -34,6 +34,11 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-
-+#ifdef GDK_WINDOWING_X11
-+/* X11 headers */
-+#include <X11/Xlib.h>
-+#endif
-+
- #include <girepository.h>
-
- #include "rb-shell.h"
-@@ -51,6 +56,13 @@ main (int argc, char **argv)
- int new_argc;
- char **new_argv;
-
-+#ifdef GDK_WINDOWING_X11
-+ if (XInitThreads () == 0) {
-+ g_critical ("Initialising threading support failed.");
-+ return 1;
-+ }
-+#endif
-+
- /* disable multidevice so clutter-gtk events work.
- * this needs to be done before gtk_open, so the visualizer
- * plugin can't do it.
---
-1.7.12.1
\ No newline at end of file
More information about the arch-commits
mailing list