Update to rhythmbox-0.12.6.

Lots of bugfixes.
Rework dependencies.
This commit is contained in:
ajacoutot 2009-11-22 11:18:34 +00:00
parent 63d733ded2
commit ebf7ff6fc7
7 changed files with 77 additions and 44 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.45 2009/10/16 00:59:37 jasper Exp $
# $OpenBSD: Makefile,v 1.46 2009/11/22 11:18:34 ajacoutot Exp $
COMMENT= music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 0.12.5
PKGNAME= ${DISTNAME}p1
GNOME_VERSION= 0.12.6
SHARED_LIBS += rhythmbox-core 0.0 # .0.0
@ -15,7 +14,7 @@ HOMEPAGE= http://www.rhythmbox.org/
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
# GPLv2 with exception clause
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -23,18 +22,16 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender art_lgpl_2 asn1 atk-1.0 avahi-client avahi-common
WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 c
WANTLIB += cairo com_err crypto dbus-1 dbus-glib-1 expat fontconfig
WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2
WANTLIB += gnome-keyring gnomecanvas-2 gnomevfs-2 gnutls gobject-2.0
WANTLIB += gpg-error gssapi gstbase-0.10 gstcontroller-0.10 gstinterfaces-0.10
WANTLIB += gstpbutils-0.10 gstreamer-0.10 gthread-2.0 gtk-x11-2.0
WANTLIB += krb5 m neon nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png popt pthread proxy smime3 softokn3
WANTLIB += soup-2.4 sqlite3 ssl ssl3 tasn1 util xml2
WANTLIB += pthread-stubs xcb z
WANTLIB += Xrender asn1 atk-1.0 bonobo-2 bonobo-activation c cairo
WANTLIB += com_err crypto dbus-1 dbus-glib-1 expat fontconfig
WANTLIB += freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-keyring
WANTLIB += gnutls gobject-2.0 gpg-error gssapi gstbase-0.10 gstcontroller-0.10
WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gthread-2.0
WANTLIB += gtk-x11-2.0 krb5 m neon nspr4 nss3 pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png proxy pthread
WANTLIB += pthread-stubs smime3 softokn3 soup-2.4 sqlite3 ssl
WANTLIB += ssl3 tasn1 util xcb xml2 z
MODULES= devel/gettext \
x11/gnome \
@ -46,12 +43,13 @@ BUILD_DEPENDS= :gstreamer-gnome->=0.10.19:multimedia/gstreamer-0.10/plugins-bas
LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
musicbrainz3::audio/libmusicbrainz \
notify::devel/libnotify \
gnomeui-2::x11/gnome/libgnomeui \
gnome-media-profiles::x11/gnome/media \
totem-plparser::x11/gnome/totem-pl-parser \
camel-1.2.>=10,edataserver-1.2::databases/evolution-data-server \
gstcdda-0.10,gsttag-0.10::multimedia/gstreamer-0.10/plugins-base,-cdda \
soup-gnome-2.4.>=1::devel/libsoup,-gnome
soup-gnome-2.4.>=1::devel/libsoup,-gnome \
avahi-client,avahi-common,avahi-glib::net/avahi \
ffi::devel/libffi
RUN_DEPENDS= :gstreamer-plugins-base->=0.10.19:multimedia/gstreamer-0.10/plugins-base,-gnome \
::x11/gnome/icon-theme \
::multimedia/gstreamer-0.10/py-gstreamer

View File

@ -1,5 +1,5 @@
MD5 (rhythmbox-0.12.5.tar.bz2) = 1wsm/IqGG/GSHlcJ+TUIkw==
RMD160 (rhythmbox-0.12.5.tar.bz2) = UobNouRX0hYnqP4jkshVBLzSVLc=
SHA1 (rhythmbox-0.12.5.tar.bz2) = tBu7Tn6PLcZBIv9qCzNEeKDO9Cs=
SHA256 (rhythmbox-0.12.5.tar.bz2) = smxFpxVQLTtNR79TIHi989vtaMHLaMYdiZWjSd1IjNE=
SIZE (rhythmbox-0.12.5.tar.bz2) = 5123204
MD5 (rhythmbox-0.12.6.tar.bz2) = wi/0dslWr+t/aU5dGlnPuQ==
RMD160 (rhythmbox-0.12.6.tar.bz2) = z4YLGkKXXU3+oJtcJlvaKX0Yp7k=
SHA1 (rhythmbox-0.12.6.tar.bz2) = 8bo3UylHHsR0daSwzj6LukMKU3s=
SHA256 (rhythmbox-0.12.6.tar.bz2) = 3f+lt+Dg/oEEQ1SZj9kaWNT/UmdGsXprY44OjqGsloQ=
SIZE (rhythmbox-0.12.6.tar.bz2) = 5202025

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.7 2009/08/23 19:30:21 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.8 2009/11/22 11:18:34 ajacoutot Exp $
XXX remove when the corresponding ports get updated.
--- configure.orig Sun Aug 23 12:39:01 2009
+++ configure Sun Aug 23 13:44:04 2009
@@ -18058,7 +18058,7 @@ _ACEOF
--- configure.orig Sun Nov 22 09:32:26 2009
+++ configure Sun Nov 22 11:32:42 2009
@@ -13902,7 +13902,7 @@ _ACEOF
DBUS_MIN_REQS=0.35
@ -13,7 +13,7 @@ XXX remove when the corresponding ports get updated.
GTK_REQS=2.12.0
GLIB_REQS=2.16.0
GNOME_MEDIA_PROFILES_REQS=2.8
@@ -18068,7 +18068,7 @@ MUSICBRAINZ_REQS=2.1.0
@@ -13912,7 +13912,7 @@ MUSICBRAINZ_REQS=2.1.0
MUSICBRAINZ3_REQS=3.0.2
NCB_MIN_REQS=2.21.6
BRASERO_MIN_REQS=0.9.1

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-plugins_audioscrobbler_rb-audioscrobbler_c,v 1.6 2009/07/12 20:05:23 ajacoutot Exp $
--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Tue Jun 30 01:38:57 2009
+++ plugins/audioscrobbler/rb-audioscrobbler.c Mon Jul 6 08:36:00 2009
@@ -747,7 +747,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler *
$OpenBSD: patch-plugins_audioscrobbler_rb-audioscrobbler_c,v 1.7 2009/11/22 11:18:34 ajacoutot Exp $
--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Sun Nov 15 01:54:44 2009
+++ plugins/audioscrobbler/rb-audioscrobbler.c Sun Nov 22 11:32:43 2009
@@ -731,7 +731,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler *
}
if (time (NULL) < audioscrobbler->priv->handshake_next) {

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-plugins_audioscrobbler_rb-lastfm-source_c,v 1.2 2009/07/12 20:05:23 ajacoutot Exp $
$OpenBSD: patch-plugins_audioscrobbler_rb-lastfm-source_c,v 1.3 2009/11/22 11:18:34 ajacoutot Exp $
Cope with our out-dated totem-pl-parser version.
--- plugins/audioscrobbler/rb-lastfm-source.c.orig Tue Jun 30 01:38:57 2009
+++ plugins/audioscrobbler/rb-lastfm-source.c Mon Jul 6 08:36:00 2009
@@ -2043,7 +2043,7 @@ xspf_entry_parsed (TotemPlParser *parser, const char *
--- plugins/audioscrobbler/rb-lastfm-source.c.orig Sun Nov 15 01:54:44 2009
+++ plugins/audioscrobbler/rb-lastfm-source.c Sun Nov 22 11:32:43 2009
@@ -2036,7 +2036,7 @@ xspf_entry_parsed (TotemPlParser *parser, const char *
}
/* image URL and track auth ID are stored in entry type specific data */
@ -13,7 +13,7 @@ Cope with our out-dated totem-pl-parser version.
if (value != NULL && (strcmp (value, LASTFM_NO_COVER_IMAGE) != 0)) {
track_data->image_url = g_strdup (value);
}
@@ -2053,7 +2053,7 @@ xspf_entry_parsed (TotemPlParser *parser, const char *
@@ -2046,7 +2046,7 @@ xspf_entry_parsed (TotemPlParser *parser, const char *
track_data->track_auth = g_strdup (value);
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-shell_rb-shell-player_c,v 1.7 2009/08/23 19:30:21 ajacoutot Exp $
--- shell/rb-shell-player.c.orig Sun Aug 23 12:38:43 2009
+++ shell/rb-shell-player.c Sun Aug 23 13:44:05 2009
@@ -740,10 +740,8 @@ rb_shell_player_open_playlist_url (RBShellPlayer *play
$OpenBSD: patch-shell_rb-shell-player_c,v 1.8 2009/11/22 11:18:34 ajacoutot Exp $
--- shell/rb-shell-player.c.orig Sat Nov 21 01:31:38 2009
+++ shell/rb-shell-player.c Sun Nov 22 11:32:43 2009
@@ -733,10 +733,8 @@ rb_shell_player_open_playlist_url (RBShellPlayer *play
rb_player_play (player->priv->mmplayer, play_type, player->priv->track_transition_time, &error);
if (error) {
@ -12,7 +12,7 @@ $OpenBSD: patch-shell_rb-shell-player_c,v 1.7 2009/08/23 19:30:21 ajacoutot Exp
}
}
@@ -815,7 +813,9 @@ rb_shell_player_handle_eos_unlocked (RBShellPlayer *pl
@@ -808,7 +806,9 @@ rb_shell_player_handle_eos_unlocked (RBShellPlayer *pl
/* we're handling an unexpected EOS here, so crossfading isn't
* really possible anyway -> specify FALSE.
*/
@ -22,7 +22,7 @@ $OpenBSD: patch-shell_rb-shell-player_c,v 1.7 2009/08/23 19:30:21 ajacoutot Exp
g_free (location);
break;
}
@@ -1504,7 +1504,9 @@ open_location_thread (OpenLocationThreadData *data)
@@ -1497,7 +1497,9 @@ open_location_thread (OpenLocationThreadData *data)
} else {
/* if we can't parse it as a playlist, just try playing it */
rb_debug ("playlist parser failed, playing %s directly", data->location);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2009/09/18 12:11:12 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.18 2009/11/22 11:18:34 ajacoutot Exp $
@bin bin/rhythmbox
@bin bin/rhythmbox-client
lib/librhythmbox-core.la
@ -46,6 +46,35 @@ lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-ui.xml
lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
lib/rhythmbox/plugins/context/
lib/rhythmbox/plugins/context/AlbumTab.py
lib/rhythmbox/plugins/context/AlbumTab.pyc
lib/rhythmbox/plugins/context/AlbumTab.pyo
lib/rhythmbox/plugins/context/ArtistTab.py
lib/rhythmbox/plugins/context/ArtistTab.pyc
lib/rhythmbox/plugins/context/ArtistTab.pyo
lib/rhythmbox/plugins/context/ContextView.py
lib/rhythmbox/plugins/context/ContextView.pyc
lib/rhythmbox/plugins/context/ContextView.pyo
lib/rhythmbox/plugins/context/LastFM.py
lib/rhythmbox/plugins/context/LastFM.pyc
lib/rhythmbox/plugins/context/LastFM.pyo
lib/rhythmbox/plugins/context/LyricsTab.py
lib/rhythmbox/plugins/context/LyricsTab.pyc
lib/rhythmbox/plugins/context/LyricsTab.pyo
lib/rhythmbox/plugins/context/__init__.py
lib/rhythmbox/plugins/context/__init__.pyc
lib/rhythmbox/plugins/context/__init__.pyo
lib/rhythmbox/plugins/context/context.rb-plugin
lib/rhythmbox/plugins/context/img/
lib/rhythmbox/plugins/context/img/lastfm.png
lib/rhythmbox/plugins/context/img/spinner.gif
lib/rhythmbox/plugins/context/tmpl/
lib/rhythmbox/plugins/context/tmpl/album-tmpl.html
lib/rhythmbox/plugins/context/tmpl/artist-tmpl.html
lib/rhythmbox/plugins/context/tmpl/loading.html
lib/rhythmbox/plugins/context/tmpl/lyrics-tmpl.html
lib/rhythmbox/plugins/context/tmpl/main.css
lib/rhythmbox/plugins/daap/
lib/rhythmbox/plugins/daap/daap-prefs.ui
lib/rhythmbox/plugins/daap/daap-ui.xml
@ -154,6 +183,9 @@ lib/rhythmbox/plugins/rb/Coroutine.pyo
lib/rhythmbox/plugins/rb/Loader.py
lib/rhythmbox/plugins/rb/Loader.pyc
lib/rhythmbox/plugins/rb/Loader.pyo
lib/rhythmbox/plugins/rb/URLCache.py
lib/rhythmbox/plugins/rb/URLCache.pyc
lib/rhythmbox/plugins/rb/URLCache.pyo
lib/rhythmbox/plugins/rb/__init__.py
lib/rhythmbox/plugins/rb/__init__.pyc
lib/rhythmbox/plugins/rb/__init__.pyo
@ -475,6 +507,7 @@ share/locale/az/LC_MESSAGES/rhythmbox.mo
share/locale/be/LC_MESSAGES/rhythmbox.mo
share/locale/be@latin/LC_MESSAGES/rhythmbox.mo
share/locale/bg/LC_MESSAGES/rhythmbox.mo
share/locale/bn_IN/LC_MESSAGES/rhythmbox.mo
share/locale/br/LC_MESSAGES/rhythmbox.mo
share/locale/ca/LC_MESSAGES/rhythmbox.mo
share/locale/cs/LC_MESSAGES/rhythmbox.mo
@ -511,6 +544,7 @@ share/locale/mn/LC_MESSAGES/rhythmbox.mo
share/locale/mr/LC_MESSAGES/rhythmbox.mo
share/locale/ms/LC_MESSAGES/rhythmbox.mo
share/locale/nb/LC_MESSAGES/rhythmbox.mo
share/locale/nds/LC_MESSAGES/rhythmbox.mo
share/locale/ne/LC_MESSAGES/rhythmbox.mo
share/locale/nl/LC_MESSAGES/rhythmbox.mo
share/locale/oc/LC_MESSAGES/rhythmbox.mo
@ -524,6 +558,7 @@ share/locale/ro/LC_MESSAGES/rhythmbox.mo
share/locale/ru/LC_MESSAGES/rhythmbox.mo
share/locale/rw/LC_MESSAGES/rhythmbox.mo
share/locale/sk/LC_MESSAGES/rhythmbox.mo
share/locale/sl/LC_MESSAGES/rhythmbox.mo
share/locale/sr/LC_MESSAGES/rhythmbox.mo
share/locale/sr@latin/LC_MESSAGES/rhythmbox.mo
share/locale/sv/LC_MESSAGES/rhythmbox.mo