cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply patch from RH, via upstream bugzilla to unbreak with rygel 0.3

Browse Source
This commit is contained in:
jasper 2016-04-25 15:52:14 +00:00
parent e5f4a08e3f
commit 5eb9bf6211
4 changed files with 130 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/rhythmbox/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.152 2016/04/03 09:39:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.153 2016/04/25 15:52:14 jasper Exp $
COMMENT= integrated music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 3.3.1
REVISION= 0
SHARED_LIBS += rhythmbox-core 0.0 # 7.0
@ -21,7 +22,7 @@ WANTLIB += atk-1.0 atk-bridge-2.0 atspi bz2 c cairo cairo-gobject
WANTLIB += dbus-1 drm enchant epoxy estdc++ expat ffi fontconfig
WANTLIB += freetype gbm gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0
WANTLIB += glapi 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 += gpod graphite2 grilo-0.3 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 hyphen icudata icui18n icuuc javascriptcoregtk-4.0
@ -49,14 +50,14 @@ LIB_DEPENDS= audio/libgpod \
devel/libnotify \
devel/libpeas \
www/webkitgtk4 \
x11/gnome/grilo \
x11/gnome/grilo>=0.3.0 \
x11/gnome/totem-pl-parser
# context plugin
RUN_DEPENDS += www/py-mako${MODPY_FLAVOR}
# calls grl_registry_load...plugin
RUN_DEPENDS += x11/gnome/grilo-plugins
RUN_DEPENDS += x11/gnome/grilo-plugins>=0.3.0
# rbzeitgeist plugin
RUN_DEPENDS += productivity/zeitgeist

59
audio/rhythmbox/patches/patch-configure Normal file
View File

@ -0,0 +1,59 @@
$OpenBSD: patch-configure,v 1.17 2016/04/25 15:52:14 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=759589
--- configure.orig Mon Apr 25 17:41:27 2016
+++ configure Mon Apr 25 17:41:30 2016
@@ -15858,7 +15858,7 @@ LIBSOUP_REQS=2.34.0
GUDEV_REQS=143
LIBMTP_REQS=0.3.0
LIBPEAS_REQS=0.7.3
-GRILO_REQS=0.2.0
+GRILO_REQS=0.3.0
LIBXML2_REQS=2.7.8
LIBSECRET_REQS=0.18
@@ -22403,12 +22403,12 @@ if test -n "$GRILO_CFLAGS"; then
pkg_cv_GRILO_CFLAGS="$GRILO_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.3 >= \$GRILO_REQS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "grilo-0.3 >= $GRILO_REQS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.2 >= $GRILO_REQS" 2>/dev/null`
+ pkg_cv_GRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.3 >= $GRILO_REQS" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22420,12 +22420,12 @@ if test -n "$GRILO_LIBS"; then
pkg_cv_GRILO_LIBS="$GRILO_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.3 >= \$GRILO_REQS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "grilo-0.3 >= $GRILO_REQS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.2 >= $GRILO_REQS" 2>/dev/null`
+ pkg_cv_GRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.3 >= $GRILO_REQS" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22446,9 +22446,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "grilo-0.2 >= $GRILO_REQS" 2>&1`
+ GRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "grilo-0.3 >= $GRILO_REQS" 2>&1`
else
- GRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "grilo-0.2 >= $GRILO_REQS" 2>&1`
+ GRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "grilo-0.3 >= $GRILO_REQS" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GRILO_PKG_ERRORS" >&5

15
audio/rhythmbox/patches/patch-plugins_grilo_rb-grilo-plugin_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-plugins_grilo_rb-grilo-plugin_c,v 1.3 2016/04/25 15:52:14 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=759589
--- plugins/grilo/rb-grilo-plugin.c.orig Fri Aug 7 12:20:22 2015
+++ plugins/grilo/rb-grilo-plugin.c Mon Apr 25 17:38:57 2016
@@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
pi->registry = grl_registry_get_default ();
g_signal_connect (pi->registry, "source-added", G_CALLBACK (grilo_source_added_cb), pi);
g_signal_connect (pi->registry, "source-removed", G_CALLBACK (grilo_source_removed_cb), pi);
- if (grl_registry_load_all_plugins (pi->registry, &error) == FALSE) {
+ if (grl_registry_load_all_plugins (pi->registry, TRUE, &error) == FALSE) {
g_warning ("Failed to load Grilo plugins: %s", error->message);
g_clear_error (&error);
}

51
audio/rhythmbox/patches/patch-plugins_grilo_rb-grilo-source_c Normal file
View File

@ -0,0 +1,51 @@
$OpenBSD: patch-plugins_grilo_rb-grilo-source_c,v 1.3 2016/04/25 15:52:14 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=759589
--- plugins/grilo/rb-grilo-source.c.orig Sun Apr 3 09:32:02 2016
+++ plugins/grilo/rb-grilo-source.c Mon Apr 25 17:38:57 2016
@@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source, GrlSupp
grl_operation_options_set_count (options,
CONTAINER_FETCH_SIZE);
grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
- grl_operation_options_set_flags (options, GRL_RESOLVE_NORMAL);
+ grl_operation_options_set_resolution_flags (options, GRL_RESOLVE_NORMAL);
return options;
}
@@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operat
source->priv->browse_position++;
}
- if (media && GRL_IS_MEDIA_BOX (media)) {
+ if (media && grl_media_is_container (media)) {
GtkTreeIter new_row;
if (source->priv->browse_container == NULL) {
@@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operat
2, CONTAINER_MARKER,
3, 0,
-1);
- } else if (media && GRL_IS_MEDIA_AUDIO (media)) {
+ } else if (media && grl_media_is_audio (media)) {
source->priv->browse_got_media = TRUE;
}
@@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
source->priv->media_browse_got_results = TRUE;
source->priv->media_browse_position++;
- if (GRL_IS_MEDIA_AUDIO (media)) {
+ if (grl_media_is_audio (media)) {
RhythmDBEntry *entry;
entry = create_entry_for_media (source->priv->db,
source->priv->entry_type,
@@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
if (entry != NULL) {
rhythmdb_query_model_add_entry (source->priv->query_model, entry, -1);
}
- } else if (GRL_IS_MEDIA_BOX (media)) {
+ } else if (grl_media_is_container (media)) {
source->priv->media_browse_got_containers = TRUE;
}
}