Update to rhythmbox-3.0.1.

This commit is contained in:
ajacoutot 2013-10-13 09:27:13 +00:00
parent f670bbe286
commit e902b8897f
4 changed files with 23 additions and 59 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.130 2013/10/06 09:08:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.131 2013/10/13 09:27:13 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= integrated music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 3.0
REVISION= 5
GNOME_VERSION= 3.0.1
SHARED_LIBS += rhythmbox-core 0.0 # 7.0
@ -21,18 +20,18 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += EGL GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xt archive atk-1.0 atk-bridge-2.0
WANTLIB += atspi bz2 c cairo cairo-gobject dbus-1 dbus-glib-1
WANTLIB += enchant expat ffi fontconfig freetype gailutil-3 gcrypt
WANTLIB += gdk-3 gdk_pixbuf-2.0 geoclue gio-2.0 girepository-1.0
WANTLIB += glib-2.0 gmime-2.6 gmodule-2.0 gobject-2.0 gpg-error
WANTLIB += gpod graphite2 grilo-0.2 gstapp-1.0 gstaudio-1.0 gstbase-1.0
WANTLIB += gstcontroller-1.0 gstfft-1.0 gstpbutils-1.0 gstreamer-1.0
WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz
WANTLIB += harfbuzz-icu icudata icui18n icuuc javascriptcoregtk-3.0
WANTLIB += jpeg json-glib-1.0 lzma m notify pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre peas-1.0 peas-gtk-1.0 pixman-1 plist
WANTLIB += png pthread pthread-stubs secret-1 soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 stdc++ tdb totem-plparser webkitgtk-3.0 webp
WANTLIB += xcb xcb-render xcb-shm xml2 xslt z orc-0.4
WANTLIB += enchant expat ffi fontconfig freetype gcrypt gdk-3
WANTLIB += gdk_pixbuf-2.0 geoclue gio-2.0 girepository-1.0 glib-2.0
WANTLIB += gmime-2.6 gmodule-2.0 gobject-2.0 gpg-error gpod graphite2
WANTLIB += grilo-0.2 gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstcontroller-1.0
WANTLIB += gstfft-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
WANTLIB += gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz harfbuzz-icu
WANTLIB += icudata icui18n icuuc javascriptcoregtk-3.0 jpeg json-glib-1.0
WANTLIB += lzma m notify orc-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre peas-1.0 peas-gtk-1.0 pixman-1 plist png pthread
WANTLIB += pthread-stubs secret-1 soup-2.4 soup-gnome-2.4 sqlite3
WANTLIB += stdc++ tdb totem-plparser webkitgtk-3.0 webp xcb xcb-render
WANTLIB += xcb-shm xml2 xslt z
MODULES= devel/dconf \
devel/gettext \

View File

@ -1,2 +1,2 @@
SHA256 (rhythmbox-3.0.tar.xz) = v281waRoZ9FuRZafl/AWMNk2v6krr5QMRC86GftoIOQ=
SIZE (rhythmbox-3.0.tar.xz) = 6383092
SHA256 (rhythmbox-3.0.1.tar.xz) = dQcrCTKE6fVpb7tZDXGanhY0ClqR1z48zYds4hMpvc8=
SIZE (rhythmbox-3.0.1.tar.xz) = 6382528

View File

@ -1,41 +0,0 @@
$OpenBSD: patch-metadata_rb-metadata-dbus-service_c,v 1.1 2013/09/16 08:24:18 ajacoutot Exp $
From 76540fdaa7baf56b01d8d269cbe482b1dbc58f09 Mon Sep 17 00:00:00 2001
From: Jonathan Matthew <jonathan@d14n.org>
Date: Fri, 13 Sep 2013 12:19:13 +0000
Subject: metadata: GDBusServer new-connection signal needs a return value
--- metadata/rb-metadata-dbus-service.c.orig Sun Nov 11 11:59:34 2012
+++ metadata/rb-metadata-dbus-service.c Mon Sep 16 10:13:38 2013
@@ -220,7 +220,7 @@ connection_closed_cb (GDBusConnection *connection,
svc->connection = NULL;
}
-static void
+static gboolean
new_connection_cb (GDBusServer *server,
GDBusConnection *connection,
ServiceData *svc)
@@ -231,7 +231,7 @@ new_connection_cb (GDBusServer *server,
/* don't allow more than one connection at a time */
if (svc->connection) {
rb_debug ("metadata service already has a client. go away.");
- return;
+ return FALSE;
}
g_dbus_connection_register_object (connection,
RB_METADATA_DBUS_OBJECT_PATH,
@@ -243,11 +243,13 @@ new_connection_cb (GDBusServer *server,
if (error != NULL) {
rb_debug ("unable to register metadata object: %s", error->message);
g_clear_error (&error);
+ return FALSE;
} else {
svc->connection = g_object_ref (connection);
g_signal_connect (connection, "closed", G_CALLBACK (connection_closed_cb), svc);
g_dbus_connection_set_exit_on_close (connection, (svc->external == FALSE));
+ return TRUE;
}
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.41 2013/09/05 08:25:27 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.42 2013/10/13 09:27:14 ajacoutot Exp $
@bin bin/rhythmbox
@bin bin/rhythmbox-client
include/rhythmbox/
@ -260,6 +260,9 @@ lib/rhythmbox/plugins/rb/rb.py
lib/rhythmbox/plugins/rb/rbconfig.py
lib/rhythmbox/plugins/rb/stringmatch.py
lib/rhythmbox/plugins/rbzeitgeist/
lib/rhythmbox/plugins/rbzeitgeist/${MODPY_PYCACHE}/
lib/rhythmbox/plugins/rbzeitgeist/${MODPY_PYCACHE}rbzeitgeist.${MODPY_PYC_MAGIC_TAG}pyc
lib/rhythmbox/plugins/rbzeitgeist/${MODPY_PYCACHE}rbzeitgeist.${MODPY_PYC_MAGIC_TAG}pyo
lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.plugin
lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.py
lib/rhythmbox/plugins/sendto/
@ -352,6 +355,7 @@ share/gtk-doc/html/rhythmbox/ch07.html
share/gtk-doc/html/rhythmbox/home.png
share/gtk-doc/html/rhythmbox/index.html
share/gtk-doc/html/rhythmbox/index.sgml
share/gtk-doc/html/rhythmbox/left-insensitive.png
share/gtk-doc/html/rhythmbox/left.png
share/gtk-doc/html/rhythmbox/rhythmbox-RBDeviceSource.html
share/gtk-doc/html/rhythmbox/rhythmbox-RBEncoder.html
@ -369,8 +373,10 @@ share/gtk-doc/html/rhythmbox/rhythmbox-rb-text-helpers.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-tree-dnd.html
share/gtk-doc/html/rhythmbox/rhythmbox-rb-util.html
share/gtk-doc/html/rhythmbox/rhythmbox.devhelp2
share/gtk-doc/html/rhythmbox/right-insensitive.png
share/gtk-doc/html/rhythmbox/right.png
share/gtk-doc/html/rhythmbox/style.css
share/gtk-doc/html/rhythmbox/up-insensitive.png
share/gtk-doc/html/rhythmbox/up.png
share/help/C/rhythmbox/
share/help/C/rhythmbox/fdl-appendix.xml