[arch-commits] CVS update of extra/gnome/rhythmbox (PKGBUILD rb-shell.patch)

[Jan de Groot]

    Date: Tuesday, March 25, 2008 @ 19:44:42
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/rhythmbox

   Added: rb-shell.patch (1.1)
Modified: PKGBUILD (1.42 -> 1.43)

upgpkg: rhythmbox 0.11.5-2
    Add patch to fix crasher when inserting storage devices (you should not do this anyways), do not install GCONF schemas during make install command


----------------+
 PKGBUILD       |   12 +++++++-----
 rb-shell.patch |   10 ++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)


Index: extra/gnome/rhythmbox/PKGBUILD
diff -u extra/gnome/rhythmbox/PKGBUILD:1.42 extra/gnome/rhythmbox/PKGBUILD:1.43
--- extra/gnome/rhythmbox/PKGBUILD:1.42	Fri Mar 21 17:13:43 2008
+++ extra/gnome/rhythmbox/PKGBUILD	Tue Mar 25 19:44:42 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.42 2008/03/21 21:13:43 jgc Exp $
+# $Id: PKGBUILD,v 1.43 2008/03/25 23:44:42 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
  
 pkgname=rhythmbox
 pkgver=0.11.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An iTunes-like music player/libary"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,11 +17,13 @@
 makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'xulrunner>=1.8.1.12') 
 options=('!libtool' '!emptydirs')
 install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.11/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('967440dd984ec724e7e7992d5bd57bbd')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.11/${pkgname}-${pkgver}.tar.bz2
+	rb-shell.patch)
+md5sums=('967440dd984ec724e7e7992d5bd57bbd' '9ff9492fe5a6580620ed4a177abc6296')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/rb-shell.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/rhythmbox \
               --localstatedir=/var --disable-static \
@@ -31,7 +33,7 @@
               --enable-python
   
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
   
   install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
   gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
Index: extra/gnome/rhythmbox/rb-shell.patch
diff -u /dev/null extra/gnome/rhythmbox/rb-shell.patch:1.1
--- /dev/null	Tue Mar 25 19:44:42 2008
+++ extra/gnome/rhythmbox/rb-shell.patch	Tue Mar 25 19:44:42 2008
@@ -0,0 +1,10 @@
+--- trunk/shell/rb-shell.c	2008/03/14 17:03:37	5616
++++ trunk/shell/rb-shell.c	2008/03/17 10:51:13	5623
+@@ -3351,7 +3351,6 @@
+ 	if (play) {
+ 		if (playlist_source != NULL) {
+ 			rb_shell_activate_source (shell, playlist_source);
+-			g_object_unref (playlist_source);
+ 			return TRUE;
+ 		}
+