From 96d5e684078f89d510705df576462770c28551fa Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Mon, 24 Sep 2012 19:34:22 +0200 Subject: audio/rhytmbox: Updated for version 2.97, several changes. Signed-off-by: Matteo Bernardini --- audio/rhythmbox/README | 3 +- audio/rhythmbox/doinst.sh | 12 +---- audio/rhythmbox/rhythmbox.SlackBuild | 17 ++++--- audio/rhythmbox/rhythmbox.info | 8 ++-- audio/rhythmbox/we_have_tdb_in_samba.patch | 75 ++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 21 deletions(-) create mode 100644 audio/rhythmbox/we_have_tdb_in_samba.patch (limited to 'audio/rhythmbox') diff --git a/audio/rhythmbox/README b/audio/rhythmbox/README index 4c6b5eee44..3ef5ee76d8 100644 --- a/audio/rhythmbox/README +++ b/audio/rhythmbox/README @@ -2,4 +2,5 @@ Rhythmbox is an integrated music management application originally inspired by Apple's iTunes. It is designed to work with the GNOME desktop and based on the powerful GStreamer media framework. -vala, avahi, libdmapsharing, and libmusicbrainz are optional dependencies. +Optional dependencies are vala, avahi, libdmapsharing, brasero, +libiconv and libmusicbrainz3. diff --git a/audio/rhythmbox/doinst.sh b/audio/rhythmbox/doinst.sh index a1f04f1d63..bc51ecfad7 100644 --- a/audio/rhythmbox/doinst.sh +++ b/audio/rhythmbox/doinst.sh @@ -1,13 +1,3 @@ -schema_install() { - SCHEMA="$1" - GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ - chroot . /usr/bin/gconftool-2 --makefile-install-rule \ - /etc/gconf/schemas/$SCHEMA \ - 1>/dev/null -} - -schema_install rhythmbox.schemas - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q /usr/share/applications >/dev/null 2>&1 fi @@ -18,3 +8,5 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi +chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ > /dev/null 2>&1 +chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ > /dev/null 2>&1 diff --git a/audio/rhythmbox/rhythmbox.SlackBuild b/audio/rhythmbox/rhythmbox.SlackBuild index 411dfb8cce..40dffb99c9 100644 --- a/audio/rhythmbox/rhythmbox.SlackBuild +++ b/audio/rhythmbox/rhythmbox.SlackBuild @@ -5,7 +5,7 @@ # Written by crocket (crockabiscuit@yahoo.com) PRGNAM=rhythmbox -VERSION=${VERSION:-0.13.1} +VERSION=${VERSION:-2.97} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -36,13 +36,15 @@ else LIBDIRSUFFIX="" fi +if pkg-config --exists libbrasero-media; then BRAS=""; else BRAS="out"; fi + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -51,6 +53,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# configure looks for a pkg-config entry for tdb... +patch -p1 < $CWD/we_have_tdb_in_samba.patch + +LDFLAGS="-ltdb" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -66,12 +72,11 @@ CXXFLAGS="$SLKCFLAGS" \ --with-mtp \ --with-gudev \ --without-hal \ - --with-libbrasero-media \ - --enable-python \ + --with${BRAS}-brasero \ --enable-browser-plugin \ --enable-vala=auto \ + --with-mdns=auto \ --disable-scrollkeeper \ - --disable-schemas-install \ --with-x \ --build=$ARCH-slackware-linux @@ -92,7 +97,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh +sed "s|@LIBDIR@|/usr/lib${LIBDIRSUFFIX}|" $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/rhythmbox/rhythmbox.info b/audio/rhythmbox/rhythmbox.info index 2f42f1277d..8cd4c57ba8 100644 --- a/audio/rhythmbox/rhythmbox.info +++ b/audio/rhythmbox/rhythmbox.info @@ -1,10 +1,10 @@ PRGNAM="rhythmbox" -VERSION="0.13.1" +VERSION="2.97" HOMEPAGE="http://projects.gnome.org/rhythmbox/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.13/rhythmbox-0.13.1.tar.bz2" -MD5SUM="274e1105e1c26e553731886dec5d05bd" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/rhythmbox/2.97/rhythmbox-2.97.tar.xz" +MD5SUM="26ed78c9c4695c5f28adb34ca9d4d943" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="brasero gnome-media gnome-python-desktop gst-python pywebkitgtk totem-pl-parser" +REQUIRES="libpeas json-glib totem-pl-parser" MAINTAINER="crocket" EMAIL="crockabiscuit@yahoo.com" diff --git a/audio/rhythmbox/we_have_tdb_in_samba.patch b/audio/rhythmbox/we_have_tdb_in_samba.patch new file mode 100644 index 0000000000..2035887282 --- /dev/null +++ b/audio/rhythmbox/we_have_tdb_in_samba.patch @@ -0,0 +1,75 @@ +diff -Naur rhythmbox-2.97.orig/configure rhythmbox-2.97/configure +--- rhythmbox-2.97.orig/configure 2012-06-03 11:07:09.000000000 +0200 ++++ rhythmbox-2.97/configure 2012-09-24 19:13:42.643306600 +0200 +@@ -15592,7 +15592,6 @@ + libpeas-1.0 >= \$LIBPEAS_REQS \\ + libpeas-gtk-1.0 >= \$LIBPEAS_REQS \\ + libxml-2.0 >= \$LIBXML2_REQS \\ +- tdb >= 1.2.6 \\ + json-glib-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ + gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \ +@@ -15606,7 +15605,6 @@ + libpeas-1.0 >= $LIBPEAS_REQS \ + libpeas-gtk-1.0 >= $LIBPEAS_REQS \ + libxml-2.0 >= $LIBXML2_REQS \ +- tdb >= 1.2.6 \ + json-glib-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +@@ -15623,7 +15621,6 @@ + libpeas-1.0 >= $LIBPEAS_REQS \ + libpeas-gtk-1.0 >= $LIBPEAS_REQS \ + libxml-2.0 >= $LIBXML2_REQS \ +- tdb >= 1.2.6 \ + json-glib-1.0" 2>/dev/null` + else + pkg_failed=yes +@@ -15647,7 +15644,6 @@ + libpeas-1.0 >= \$LIBPEAS_REQS \\ + libpeas-gtk-1.0 >= \$LIBPEAS_REQS \\ + libxml-2.0 >= \$LIBXML2_REQS \\ +- tdb >= 1.2.6 \\ + json-glib-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ + gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \ +@@ -15661,7 +15657,6 @@ + libpeas-1.0 >= $LIBPEAS_REQS \ + libpeas-gtk-1.0 >= $LIBPEAS_REQS \ + libxml-2.0 >= $LIBXML2_REQS \ +- tdb >= 1.2.6 \ + json-glib-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +@@ -15678,7 +15673,6 @@ + libpeas-1.0 >= $LIBPEAS_REQS \ + libpeas-gtk-1.0 >= $LIBPEAS_REQS \ + libxml-2.0 >= $LIBXML2_REQS \ +- tdb >= 1.2.6 \ + json-glib-1.0" 2>/dev/null` + else + pkg_failed=yes +@@ -15711,7 +15705,6 @@ + libpeas-1.0 >= $LIBPEAS_REQS \ + libpeas-gtk-1.0 >= $LIBPEAS_REQS \ + libxml-2.0 >= $LIBXML2_REQS \ +- tdb >= 1.2.6 \ + json-glib-1.0" 2>&1` + else + RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ +@@ -15726,7 +15719,6 @@ + libpeas-1.0 >= $LIBPEAS_REQS \ + libpeas-gtk-1.0 >= $LIBPEAS_REQS \ + libxml-2.0 >= $LIBXML2_REQS \ +- tdb >= 1.2.6 \ + json-glib-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs +@@ -15744,7 +15736,6 @@ + libpeas-1.0 >= $LIBPEAS_REQS \ + libpeas-gtk-1.0 >= $LIBPEAS_REQS \ + libxml-2.0 >= $LIBXML2_REQS \ +- tdb >= 1.2.6 \ + json-glib-1.0) were not met: + + $RHYTHMBOX_PKG_ERRORS -- cgit v1.2.3