* [gentoo-commits] repo/gentoo:master commit in: media-sound/rhythmbox/, media-sound/rhythmbox/files/
@ 2018-06-24 12:20 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2018-06-24 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 4cef9b669be9e01435b050309826b1c6af2f4e6b
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 11:53:24 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 12:19:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cef9b66
media-sound/rhythmbox: Fix building with latest gstreamer (#658750)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/rhythmbox-3.4.2-gstreamer-1.14.patch | 455 +++++++++++++++++++++
media-sound/rhythmbox/rhythmbox-3.4.2.ebuild | 4 +
2 files changed, 459 insertions(+)
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch
new file mode 100644
index 00000000000..86ed17ba98e
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch
@@ -0,0 +1,455 @@
+From 36a648db0af05be579190d98c96cfb6b7bcc6ebd Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 9 Oct 2017 13:11:47 +0200
+Subject: [PATCH 01/12] fmradio: Fix build with GStreamer master
+
+The plugin description is not supposed to be a string constant, but an
+unescaped string, to be concatenated with function names.
+
+This used to be acceptable (though would have warned), but breaks with
+the GStreamer 1.13 development branch.
+
+rb-fm-radio-gst-src.c:181:6: error: pasting ""rbsilencesrc"" and "_get_desc" does not give a valid preprocessing token
+ "rbsilencesrc",
+ ^
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788706
+---
+ plugins/fmradio/rb-fm-radio-gst-src.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/fmradio/rb-fm-radio-gst-src.c b/plugins/fmradio/rb-fm-radio-gst-src.c
+index 09d709c28..88abdaf35 100644
+--- a/plugins/fmradio/rb-fm-radio-gst-src.c
++++ b/plugins/fmradio/rb-fm-radio-gst-src.c
+@@ -178,7 +178,7 @@ plugin_init (GstPlugin *plugin)
+
+ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+- "rbsilencesrc",
++ rbsilencesrc,
+ "element to output silence",
+ plugin_init,
+ VERSION,
+--
+2.17.0
+
+
+From 355e3c40efe47f6f90d12afb6590caf85db62487 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 24 Apr 2017 16:21:41 +0200
+Subject: [PATCH 02/12] mmkeys: media-player-keys: Fix usage to match API
+ documentation
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=781326
+
+https://bugzilla.gnome.org/show_bug.cgi?id=781664
+---
+ plugins/mmkeys/rb-mmkeys-plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/mmkeys/rb-mmkeys-plugin.c b/plugins/mmkeys/rb-mmkeys-plugin.c
+index 46431584f..058b82f0e 100644
+--- a/plugins/mmkeys/rb-mmkeys-plugin.c
++++ b/plugins/mmkeys/rb-mmkeys-plugin.c
+@@ -385,7 +385,7 @@ impl_activate (PeasActivatable *pplugin)
+ plugin->proxy = g_dbus_proxy_new_sync (bus,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+- "org.gnome.SettingsDaemon",
++ "org.gnome.SettingsDaemon.MediaKeys",
+ "/org/gnome/SettingsDaemon/MediaKeys",
+ "org.gnome.SettingsDaemon.MediaKeys",
+ NULL,
+--
+2.17.0
+
+
+From 19d604093667139c6660d9452b4037a761bf75e0 Mon Sep 17 00:00:00 2001
+From: gkrithi8 <gkrithi8@gmail.com>
+Date: Thu, 26 Oct 2017 02:27:38 +0530
+Subject: [PATCH 03/12] brasero-disc-recorder: Fix invalid object reference
+ warnings
+
+https://bugzilla.gnome.org/show_bug.cgi?id=789494
+---
+ plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
+index 8608e84fd..a89d87a70 100644
+--- a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
++++ b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
+@@ -558,7 +558,7 @@ update_source (RBDiscRecorderPlugin *pi,
+ RBDisplayPage *selected_page;
+ const char *page_type;
+
+- if (pi->selected_page != NULL && RB_IS_SOURCE (pi->selected_page)) {
++ if (pi->selected_page != NULL && RB_IS_PLAYLIST_SOURCE (pi->selected_page)) {
+ RhythmDBQueryModel *model;
+
+ g_object_get (pi->selected_page, "query-model", &model, NULL);
+--
+2.17.0
+
+
+From 00970203e760f9ae43c31087706bd31b2b395dcb Mon Sep 17 00:00:00 2001
+From: gkrithi8 <gkrithi8@gmail.com>
+Date: Mon, 30 Oct 2017 02:25:09 +0530
+Subject: [PATCH 04/12] song-info: fix the signal name used for entry deletion
+
+https://bugzilla.gnome.org/show_bug.cgi?id=789632
+---
+ widgets/rb-song-info.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/widgets/rb-song-info.c b/widgets/rb-song-info.c
+index 54810e0b7..202f3d36e 100644
+--- a/widgets/rb-song-info.c
++++ b/widgets/rb-song-info.c
+@@ -733,6 +733,7 @@ rb_song_info_set_source_internal (RBSongInfo *song_info,
+
+ g_object_get (G_OBJECT (song_info->priv->query_model), "db", &song_info->priv->db, NULL);
+
++ rb_song_info_query_model_changed_cb (G_OBJECT (song_info->priv->source), NULL, song_info);
+ rb_song_info_base_query_model_changed_cb (G_OBJECT (song_info->priv->source), NULL, song_info);
+ }
+
+@@ -1514,7 +1515,7 @@ rb_song_info_query_model_changed_cb (GObject *source,
+ "row-changed", G_CALLBACK (rb_song_info_query_model_inserted_cb),
+ song_info, 0);
+ g_signal_connect_object (G_OBJECT (song_info->priv->query_model),
+- "entry-deleted", G_CALLBACK (rb_song_info_query_model_deleted_cb),
++ "post-entry-delete", G_CALLBACK (rb_song_info_query_model_deleted_cb),
+ song_info, 0);
+ g_signal_connect_object (G_OBJECT (song_info->priv->query_model),
+ "rows-reordered", G_CALLBACK (rb_song_info_query_model_reordered_cb),
+--
+2.17.0
+
+
+From 223bafcc98a33262d70adc325f3393ac8f4b3ecc Mon Sep 17 00:00:00 2001
+From: gkrithi8 <gkrithi8@gmail.com>
+Date: Tue, 31 Oct 2017 17:06:58 +0530
+Subject: [PATCH 05/12] shell: remove extra pixbuf unref
+
+https://bugzilla.gnome.org/show_bug.cgi?id=789706
+---
+ shell/rb-shell.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/shell/rb-shell.c b/shell/rb-shell.c
+index 7ae022795..734b90dcb 100644
+--- a/shell/rb-shell.c
++++ b/shell/rb-shell.c
+@@ -375,7 +375,6 @@ load_external_art_cb (RBExtDB *store, GValue *value, RBShell *shell)
+
+ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ if (accept_art_pixbuf (pixbuf) == FALSE) {
+- g_object_unref (pixbuf);
+ g_object_unref (loader);
+ return NULL;
+ }
+--
+2.17.0
+
+
+From 2604eeb2338a4da7a95f9b6d46223323c864ddf2 Mon Sep 17 00:00:00 2001
+From: gkrithi8 <gkrithi8@gmail.com>
+Date: Mon, 27 Nov 2017 13:31:39 +0530
+Subject: [PATCH 06/12] ext-db: fix crash when store request processing fails
+
+https://bugzilla.gnome.org/show_bug.cgi?id=727670
+---
+ metadata/rb-ext-db.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/metadata/rb-ext-db.c b/metadata/rb-ext-db.c
+index 3e241e609..7d8e01573 100644
+--- a/metadata/rb-ext-db.c
++++ b/metadata/rb-ext-db.c
+@@ -954,7 +954,11 @@ do_store_request (GSimpleAsyncResult *result, GObject *object, GCancellable *can
+ */
+ g_signal_emit (store, signals[STORE], 0, req->value, &req->data);
+
+- rb_debug ("stored value into encoded data of type %s", G_VALUE_TYPE_NAME (req->data));
++ if (req->data != NULL) {
++ rb_debug ("stored value into encoded data of type %s", G_VALUE_TYPE_NAME (req->data));
++ } else {
++ rb_debug ("failed to store value");
++ }
+ } else {
+ /* indicates we actually didn't get anything, as opposed to communication errors etc.
+ * providers just shouldn't call rb_ext_db_store_* in that case.
+--
+2.17.0
+
+
+From a6f696f195b3c0aba63267c250ee15ccb058a8a9 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Tue, 30 Jan 2018 08:20:31 +1000
+Subject: [PATCH 07/12] xfade: schedule stream reap after EOS
+
+This stops streams hanging around in pending-remove state until
+the stream after the following stream starts,
+---
+ backends/gstreamer/rb-player-gst-xfade.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
+index d553397ce..420cf7f65 100644
+--- a/backends/gstreamer/rb-player-gst-xfade.c
++++ b/backends/gstreamer/rb-player-gst-xfade.c
+@@ -1831,6 +1831,7 @@ rb_player_gst_xfade_bus_cb (GstBus *bus, GstMessage *message, RBPlayerGstXFade *
+ * message on the stream thread and now.
+ */
+ start_waiting_eos_streams (player);
++ schedule_stream_reap (player);
+ } else {
+ /* no need to emit EOS here, we already know what to do next */
+ rb_debug ("got EOS message for stream %s in REUSING state", stream->uri);
+--
+2.17.0
+
+
+From f984934cfcbda9253bf26460163a546d8da69a01 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 6 Jun 2018 10:48:52 +0200
+Subject: [PATCH 08/12] daap: Fix build warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace strncpy with memcpy to avoid adding a NUL-byte in the string.
+
+rhythmbox/plugins/daap/rb-daap-src.c: In function ‘rb_daap_src_change_state’:
+rhythmbox/plugins/daap/rb-daap-src.c:286:4: error: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Werror=stringop-truncation]
+ strncpy (httpuri, http, 4);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+ plugins/daap/rb-daap-src.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/daap/rb-daap-src.c b/plugins/daap/rb-daap-src.c
+index 99a55caf4..002ac6a00 100644
+--- a/plugins/daap/rb-daap-src.c
++++ b/plugins/daap/rb-daap-src.c
+@@ -283,7 +283,7 @@ rb_daap_src_change_state (GstElement *element, GstStateChange transition)
+
+ /* Set daap://... URI as http:// on souphttpsrc to ready connection. */
+ httpuri = g_strdup (src->daap_uri);
+- strncpy (httpuri, http, 4);
++ memcpy (httpuri, http, 4);
+
+ g_object_set (src->souphttpsrc, "location", httpuri, NULL);
+ g_free (httpuri);
+--
+2.17.0
+
+
+From a73dbae82e3b3a782d36261fa2676cce1f589e45 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 6 Jun 2018 11:34:52 +0200
+Subject: [PATCH 09/12] build: Remove -Wcast-align warning
+
+It generates a false positive error message when trying to compile on
+ARM:
+/usr/include/gstreamer-1.0/gst/gstbuffer.h: In function 'gst_buffer_ref':
+/usr/include/gstreamer-1.0/gst/gstbuffer.h:429:10: error: cast increases required alignment of target type [-Werror=cast-align]
+ return (GstBuffer *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (buf));
+ ^
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=767255
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 746dfb49e..7124db904 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -469,7 +469,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+ -Wunused-label -Wunused-value \
+ -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+ -Wnested-externs -Wpointer-arith \
+- -Wcast-align -Wformat-security -Wall \
++ -Wformat-security -Wall \
+ -Werror -Wno-deprecated-declarations -std=gnu89"
+
+ if echo "$CFLAGS" | grep -q -- '-O' && echo "$CFLAGS" | grep -q -v -- '-O0'; then
+--
+2.17.0
+
+
+From 9871ddcce16cae60535523ab8c229319927f6d75 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 8 Jun 2018 16:09:05 +0200
+Subject: [PATCH 10/12] artsearch: Fix TypeError when returning results
+
+eg. Traceback (most recent call last):
+ File "/usr/lib64/rhythmbox/plugins/artsearch/local.py", line 136, in _enum_children_cb
+ self.callback(self.callback_args)
+TypeError: Argument 1 does not allow None as a value
+---
+ plugins/artsearch/embedded.py | 2 +-
+ plugins/artsearch/lastfm.py | 2 +-
+ plugins/artsearch/local.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/artsearch/embedded.py b/plugins/artsearch/embedded.py
+index 206df547f..646da0a24 100644
+--- a/plugins/artsearch/embedded.py
++++ b/plugins/artsearch/embedded.py
+@@ -56,7 +56,7 @@ class EmbeddedSearch(object):
+ return
+
+
+- def search (self, key, last_time, store, callback, args):
++ def search (self, key, last_time, store, callback, *args):
+ location = key.get_info("location")
+ if location is None:
+ print("not searching, we don't have a location")
+diff --git a/plugins/artsearch/lastfm.py b/plugins/artsearch/lastfm.py
+index ff1966eae..2169ebab2 100644
+--- a/plugins/artsearch/lastfm.py
++++ b/plugins/artsearch/lastfm.py
+@@ -145,7 +145,7 @@ class LastFMSearch (object):
+ l.get_url(url, self.album_info_cb)
+
+
+- def search(self, key, last_time, store, callback, args):
++ def search(self, key, last_time, store, callback, *args):
+ if last_time > (time.time() - REPEAT_SEARCH_PERIOD):
+ print("we already tried this one")
+ callback (args)
+diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
+index 58214037e..4d28bf0e8 100644
+--- a/plugins/artsearch/local.py
++++ b/plugins/artsearch/local.py
+@@ -136,7 +136,7 @@ class LocalSearch:
+ self.callback(self.callback_args)
+
+
+- def search (self, key, last_time, store, callback, args):
++ def search (self, key, last_time, store, callback, *args):
+ # ignore last_time
+
+ location = key.get_info("location")
+--
+2.17.0
+
+
+From 68fb588544a094a27127fe50c95e18019065b793 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 8 Jun 2018 16:10:00 +0200
+Subject: [PATCH 11/12] artsearch: Ignore unsupported scheme
+
+When trying to play an HTTP stream, the local artsearch backend would
+throw an error. We can safely ignore it though.
+
+Traceback (most recent call last):
+ File "/usr/lib64/rhythmbox/plugins/artsearch/local.py", line 129, in _enum_children_cb
+ enumfiles = parent.enumerate_children_finish(result)
+GLib.Error: g-io-error-quark: Operation not supported by backend (15)
+---
+ plugins/artsearch/local.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
+index 4d28bf0e8..074795a76 100644
+--- a/plugins/artsearch/local.py
++++ b/plugins/artsearch/local.py
+@@ -130,10 +130,12 @@ class LocalSearch:
+ enumfiles.next_files_async(ITEMS_PER_NOTIFICATION, GLib.PRIORITY_DEFAULT, None, self._enum_dir_cb, [])
+ except Exception as e:
+ print("okay, probably done: %s" % e)
+- if not isinstance(e, GLib.GError):
++ if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED):
++ self.callback(self.callback_args)
++ elif not isinstance(e, GLib.GError):
+ import sys
+ sys.excepthook(*sys.exc_info())
+- self.callback(self.callback_args)
++ self.callback(self.callback_args)
+
+
+ def search (self, key, last_time, store, callback, *args):
+--
+2.17.0
+
+
+From 0994e76b65d0533bd148cab5631362202602b28f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 12 Jun 2018 15:16:29 +0200
+Subject: [PATCH 12/12] sources: Fix state of initial import not reflecting
+ reality
+
+When rhythmbox is started with an empty "locations" setting, it will
+rewrite the setting with the user's music folder as the only location.
+This will start an import job from the setting's "changed" signal. But
+we already start another import job from the "load-complete" signal of
+the database.
+
+Make sure only the load-complete signal triggers an import when setting
+the "locations" setting is empty on startup.
+---
+ sources/rb-library-source.c | 29 +++++++++++++----------------
+ 1 file changed, 13 insertions(+), 16 deletions(-)
+
+diff --git a/sources/rb-library-source.c b/sources/rb-library-source.c
+index 15ba523d2..378a3e006 100644
+--- a/sources/rb-library-source.c
++++ b/sources/rb-library-source.c
+@@ -284,6 +284,10 @@ db_load_complete_cb (RhythmDB *db, RBLibrarySource *source)
+ if (source->priv->do_initial_import) {
+ const char *music_dir;
+ char *music_dir_uri;
++ const char *set_locations[2];
++
++ g_signal_handlers_block_by_func (source->priv->db_settings,
++ G_CALLBACK (db_settings_changed_cb), source);
+
+ music_dir = rb_music_dir ();
+ music_dir_uri = g_filename_to_uri (music_dir, NULL, NULL);
+@@ -293,6 +297,13 @@ db_load_complete_cb (RhythmDB *db, RBLibrarySource *source)
+ g_mkdir_with_parents (music_dir, 0700);
+ }
+
++ set_locations[0] = music_dir_uri;
++ set_locations[1] = NULL;
++ g_settings_set_strv (source->priv->db_settings, "locations", set_locations);
++
++ g_signal_handlers_unblock_by_func (source->priv->db_settings,
++ G_CALLBACK (db_settings_changed_cb), source);
++
+ /* import anything that's already in there */
+ job = maybe_create_import_job (source);
+ rhythmdb_import_job_add_uri (job, music_dir_uri);
+@@ -344,22 +355,8 @@ rb_library_source_constructed (GObject *object)
+
+ /* Set up the default library location if there's no library location set */
+ locations = g_settings_get_strv (source->priv->db_settings, "locations");
+- if (g_strv_length (locations) == 0) {
+- char *music_dir_uri;
+-
+- music_dir_uri = g_filename_to_uri (rb_music_dir (), NULL, NULL);
+- if (music_dir_uri != NULL) {
+- const char *set_locations[2];
+-
+- set_locations[0] = music_dir_uri;
+- set_locations[1] = NULL;
+- g_settings_set_strv (source->priv->db_settings, "locations", set_locations);
+-
+- source->priv->do_initial_import = TRUE;
+-
+- g_free (music_dir_uri);
+- }
+- }
++ if (g_strv_length (locations) == 0)
++ source->priv->do_initial_import = TRUE;
+ g_strfreev (locations);
+
+ songs = rb_source_get_entry_view (RB_SOURCE (source));
+--
+2.17.0
+
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
index a22f0e68af9..258f1866380 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
@@ -84,6 +84,10 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-libs/check )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-gstreamer-1.14.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/rhythmbox/, media-sound/rhythmbox/files/
@ 2019-05-18 23:05 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2019-05-18 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 45e90c5e293270dacecef2aa2d95d0fcd2d1c9ea
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 22:20:35 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 22:20:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e90c5e
media-sound/rhythmbox: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-sound/rhythmbox/Manifest | 1 -
.../files/rhythmbox-3.4.2-gstreamer-1.14.patch | 455 ---------------------
media-sound/rhythmbox/rhythmbox-3.4.2.ebuild | 131 ------
3 files changed, 587 deletions(-)
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 43a8124a64c..45703ae57a1 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,2 +1 @@
-DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch
deleted file mode 100644
index 86ed17ba98e..00000000000
--- a/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch
+++ /dev/null
@@ -1,455 +0,0 @@
-From 36a648db0af05be579190d98c96cfb6b7bcc6ebd Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 9 Oct 2017 13:11:47 +0200
-Subject: [PATCH 01/12] fmradio: Fix build with GStreamer master
-
-The plugin description is not supposed to be a string constant, but an
-unescaped string, to be concatenated with function names.
-
-This used to be acceptable (though would have warned), but breaks with
-the GStreamer 1.13 development branch.
-
-rb-fm-radio-gst-src.c:181:6: error: pasting ""rbsilencesrc"" and "_get_desc" does not give a valid preprocessing token
- "rbsilencesrc",
- ^
-
-https://bugzilla.gnome.org/show_bug.cgi?id=788706
----
- plugins/fmradio/rb-fm-radio-gst-src.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/fmradio/rb-fm-radio-gst-src.c b/plugins/fmradio/rb-fm-radio-gst-src.c
-index 09d709c28..88abdaf35 100644
---- a/plugins/fmradio/rb-fm-radio-gst-src.c
-+++ b/plugins/fmradio/rb-fm-radio-gst-src.c
-@@ -178,7 +178,7 @@ plugin_init (GstPlugin *plugin)
-
- GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
-- "rbsilencesrc",
-+ rbsilencesrc,
- "element to output silence",
- plugin_init,
- VERSION,
---
-2.17.0
-
-
-From 355e3c40efe47f6f90d12afb6590caf85db62487 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 24 Apr 2017 16:21:41 +0200
-Subject: [PATCH 02/12] mmkeys: media-player-keys: Fix usage to match API
- documentation
-
-See https://bugzilla.gnome.org/show_bug.cgi?id=781326
-
-https://bugzilla.gnome.org/show_bug.cgi?id=781664
----
- plugins/mmkeys/rb-mmkeys-plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/mmkeys/rb-mmkeys-plugin.c b/plugins/mmkeys/rb-mmkeys-plugin.c
-index 46431584f..058b82f0e 100644
---- a/plugins/mmkeys/rb-mmkeys-plugin.c
-+++ b/plugins/mmkeys/rb-mmkeys-plugin.c
-@@ -385,7 +385,7 @@ impl_activate (PeasActivatable *pplugin)
- plugin->proxy = g_dbus_proxy_new_sync (bus,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
-- "org.gnome.SettingsDaemon",
-+ "org.gnome.SettingsDaemon.MediaKeys",
- "/org/gnome/SettingsDaemon/MediaKeys",
- "org.gnome.SettingsDaemon.MediaKeys",
- NULL,
---
-2.17.0
-
-
-From 19d604093667139c6660d9452b4037a761bf75e0 Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Thu, 26 Oct 2017 02:27:38 +0530
-Subject: [PATCH 03/12] brasero-disc-recorder: Fix invalid object reference
- warnings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789494
----
- plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
-index 8608e84fd..a89d87a70 100644
---- a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
-+++ b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
-@@ -558,7 +558,7 @@ update_source (RBDiscRecorderPlugin *pi,
- RBDisplayPage *selected_page;
- const char *page_type;
-
-- if (pi->selected_page != NULL && RB_IS_SOURCE (pi->selected_page)) {
-+ if (pi->selected_page != NULL && RB_IS_PLAYLIST_SOURCE (pi->selected_page)) {
- RhythmDBQueryModel *model;
-
- g_object_get (pi->selected_page, "query-model", &model, NULL);
---
-2.17.0
-
-
-From 00970203e760f9ae43c31087706bd31b2b395dcb Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Mon, 30 Oct 2017 02:25:09 +0530
-Subject: [PATCH 04/12] song-info: fix the signal name used for entry deletion
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789632
----
- widgets/rb-song-info.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/widgets/rb-song-info.c b/widgets/rb-song-info.c
-index 54810e0b7..202f3d36e 100644
---- a/widgets/rb-song-info.c
-+++ b/widgets/rb-song-info.c
-@@ -733,6 +733,7 @@ rb_song_info_set_source_internal (RBSongInfo *song_info,
-
- g_object_get (G_OBJECT (song_info->priv->query_model), "db", &song_info->priv->db, NULL);
-
-+ rb_song_info_query_model_changed_cb (G_OBJECT (song_info->priv->source), NULL, song_info);
- rb_song_info_base_query_model_changed_cb (G_OBJECT (song_info->priv->source), NULL, song_info);
- }
-
-@@ -1514,7 +1515,7 @@ rb_song_info_query_model_changed_cb (GObject *source,
- "row-changed", G_CALLBACK (rb_song_info_query_model_inserted_cb),
- song_info, 0);
- g_signal_connect_object (G_OBJECT (song_info->priv->query_model),
-- "entry-deleted", G_CALLBACK (rb_song_info_query_model_deleted_cb),
-+ "post-entry-delete", G_CALLBACK (rb_song_info_query_model_deleted_cb),
- song_info, 0);
- g_signal_connect_object (G_OBJECT (song_info->priv->query_model),
- "rows-reordered", G_CALLBACK (rb_song_info_query_model_reordered_cb),
---
-2.17.0
-
-
-From 223bafcc98a33262d70adc325f3393ac8f4b3ecc Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Tue, 31 Oct 2017 17:06:58 +0530
-Subject: [PATCH 05/12] shell: remove extra pixbuf unref
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789706
----
- shell/rb-shell.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/shell/rb-shell.c b/shell/rb-shell.c
-index 7ae022795..734b90dcb 100644
---- a/shell/rb-shell.c
-+++ b/shell/rb-shell.c
-@@ -375,7 +375,6 @@ load_external_art_cb (RBExtDB *store, GValue *value, RBShell *shell)
-
- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- if (accept_art_pixbuf (pixbuf) == FALSE) {
-- g_object_unref (pixbuf);
- g_object_unref (loader);
- return NULL;
- }
---
-2.17.0
-
-
-From 2604eeb2338a4da7a95f9b6d46223323c864ddf2 Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Mon, 27 Nov 2017 13:31:39 +0530
-Subject: [PATCH 06/12] ext-db: fix crash when store request processing fails
-
-https://bugzilla.gnome.org/show_bug.cgi?id=727670
----
- metadata/rb-ext-db.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/metadata/rb-ext-db.c b/metadata/rb-ext-db.c
-index 3e241e609..7d8e01573 100644
---- a/metadata/rb-ext-db.c
-+++ b/metadata/rb-ext-db.c
-@@ -954,7 +954,11 @@ do_store_request (GSimpleAsyncResult *result, GObject *object, GCancellable *can
- */
- g_signal_emit (store, signals[STORE], 0, req->value, &req->data);
-
-- rb_debug ("stored value into encoded data of type %s", G_VALUE_TYPE_NAME (req->data));
-+ if (req->data != NULL) {
-+ rb_debug ("stored value into encoded data of type %s", G_VALUE_TYPE_NAME (req->data));
-+ } else {
-+ rb_debug ("failed to store value");
-+ }
- } else {
- /* indicates we actually didn't get anything, as opposed to communication errors etc.
- * providers just shouldn't call rb_ext_db_store_* in that case.
---
-2.17.0
-
-
-From a6f696f195b3c0aba63267c250ee15ccb058a8a9 Mon Sep 17 00:00:00 2001
-From: Jonathan Matthew <jonathan@d14n.org>
-Date: Tue, 30 Jan 2018 08:20:31 +1000
-Subject: [PATCH 07/12] xfade: schedule stream reap after EOS
-
-This stops streams hanging around in pending-remove state until
-the stream after the following stream starts,
----
- backends/gstreamer/rb-player-gst-xfade.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
-index d553397ce..420cf7f65 100644
---- a/backends/gstreamer/rb-player-gst-xfade.c
-+++ b/backends/gstreamer/rb-player-gst-xfade.c
-@@ -1831,6 +1831,7 @@ rb_player_gst_xfade_bus_cb (GstBus *bus, GstMessage *message, RBPlayerGstXFade *
- * message on the stream thread and now.
- */
- start_waiting_eos_streams (player);
-+ schedule_stream_reap (player);
- } else {
- /* no need to emit EOS here, we already know what to do next */
- rb_debug ("got EOS message for stream %s in REUSING state", stream->uri);
---
-2.17.0
-
-
-From f984934cfcbda9253bf26460163a546d8da69a01 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 6 Jun 2018 10:48:52 +0200
-Subject: [PATCH 08/12] daap: Fix build warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Replace strncpy with memcpy to avoid adding a NUL-byte in the string.
-
-rhythmbox/plugins/daap/rb-daap-src.c: In function ‘rb_daap_src_change_state’:
-rhythmbox/plugins/daap/rb-daap-src.c:286:4: error: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Werror=stringop-truncation]
- strncpy (httpuri, http, 4);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~
----
- plugins/daap/rb-daap-src.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/daap/rb-daap-src.c b/plugins/daap/rb-daap-src.c
-index 99a55caf4..002ac6a00 100644
---- a/plugins/daap/rb-daap-src.c
-+++ b/plugins/daap/rb-daap-src.c
-@@ -283,7 +283,7 @@ rb_daap_src_change_state (GstElement *element, GstStateChange transition)
-
- /* Set daap://... URI as http:// on souphttpsrc to ready connection. */
- httpuri = g_strdup (src->daap_uri);
-- strncpy (httpuri, http, 4);
-+ memcpy (httpuri, http, 4);
-
- g_object_set (src->souphttpsrc, "location", httpuri, NULL);
- g_free (httpuri);
---
-2.17.0
-
-
-From a73dbae82e3b3a782d36261fa2676cce1f589e45 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 6 Jun 2018 11:34:52 +0200
-Subject: [PATCH 09/12] build: Remove -Wcast-align warning
-
-It generates a false positive error message when trying to compile on
-ARM:
-/usr/include/gstreamer-1.0/gst/gstbuffer.h: In function 'gst_buffer_ref':
-/usr/include/gstreamer-1.0/gst/gstbuffer.h:429:10: error: cast increases required alignment of target type [-Werror=cast-align]
- return (GstBuffer *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (buf));
- ^
-
-See https://bugzilla.gnome.org/show_bug.cgi?id=767255
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 746dfb49e..7124db904 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -469,7 +469,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- -Wunused-label -Wunused-value \
- -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
- -Wnested-externs -Wpointer-arith \
-- -Wcast-align -Wformat-security -Wall \
-+ -Wformat-security -Wall \
- -Werror -Wno-deprecated-declarations -std=gnu89"
-
- if echo "$CFLAGS" | grep -q -- '-O' && echo "$CFLAGS" | grep -q -v -- '-O0'; then
---
-2.17.0
-
-
-From 9871ddcce16cae60535523ab8c229319927f6d75 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 8 Jun 2018 16:09:05 +0200
-Subject: [PATCH 10/12] artsearch: Fix TypeError when returning results
-
-eg. Traceback (most recent call last):
- File "/usr/lib64/rhythmbox/plugins/artsearch/local.py", line 136, in _enum_children_cb
- self.callback(self.callback_args)
-TypeError: Argument 1 does not allow None as a value
----
- plugins/artsearch/embedded.py | 2 +-
- plugins/artsearch/lastfm.py | 2 +-
- plugins/artsearch/local.py | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/artsearch/embedded.py b/plugins/artsearch/embedded.py
-index 206df547f..646da0a24 100644
---- a/plugins/artsearch/embedded.py
-+++ b/plugins/artsearch/embedded.py
-@@ -56,7 +56,7 @@ class EmbeddedSearch(object):
- return
-
-
-- def search (self, key, last_time, store, callback, args):
-+ def search (self, key, last_time, store, callback, *args):
- location = key.get_info("location")
- if location is None:
- print("not searching, we don't have a location")
-diff --git a/plugins/artsearch/lastfm.py b/plugins/artsearch/lastfm.py
-index ff1966eae..2169ebab2 100644
---- a/plugins/artsearch/lastfm.py
-+++ b/plugins/artsearch/lastfm.py
-@@ -145,7 +145,7 @@ class LastFMSearch (object):
- l.get_url(url, self.album_info_cb)
-
-
-- def search(self, key, last_time, store, callback, args):
-+ def search(self, key, last_time, store, callback, *args):
- if last_time > (time.time() - REPEAT_SEARCH_PERIOD):
- print("we already tried this one")
- callback (args)
-diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
-index 58214037e..4d28bf0e8 100644
---- a/plugins/artsearch/local.py
-+++ b/plugins/artsearch/local.py
-@@ -136,7 +136,7 @@ class LocalSearch:
- self.callback(self.callback_args)
-
-
-- def search (self, key, last_time, store, callback, args):
-+ def search (self, key, last_time, store, callback, *args):
- # ignore last_time
-
- location = key.get_info("location")
---
-2.17.0
-
-
-From 68fb588544a094a27127fe50c95e18019065b793 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 8 Jun 2018 16:10:00 +0200
-Subject: [PATCH 11/12] artsearch: Ignore unsupported scheme
-
-When trying to play an HTTP stream, the local artsearch backend would
-throw an error. We can safely ignore it though.
-
-Traceback (most recent call last):
- File "/usr/lib64/rhythmbox/plugins/artsearch/local.py", line 129, in _enum_children_cb
- enumfiles = parent.enumerate_children_finish(result)
-GLib.Error: g-io-error-quark: Operation not supported by backend (15)
----
- plugins/artsearch/local.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
-index 4d28bf0e8..074795a76 100644
---- a/plugins/artsearch/local.py
-+++ b/plugins/artsearch/local.py
-@@ -130,10 +130,12 @@ class LocalSearch:
- enumfiles.next_files_async(ITEMS_PER_NOTIFICATION, GLib.PRIORITY_DEFAULT, None, self._enum_dir_cb, [])
- except Exception as e:
- print("okay, probably done: %s" % e)
-- if not isinstance(e, GLib.GError):
-+ if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED):
-+ self.callback(self.callback_args)
-+ elif not isinstance(e, GLib.GError):
- import sys
- sys.excepthook(*sys.exc_info())
-- self.callback(self.callback_args)
-+ self.callback(self.callback_args)
-
-
- def search (self, key, last_time, store, callback, *args):
---
-2.17.0
-
-
-From 0994e76b65d0533bd148cab5631362202602b28f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 12 Jun 2018 15:16:29 +0200
-Subject: [PATCH 12/12] sources: Fix state of initial import not reflecting
- reality
-
-When rhythmbox is started with an empty "locations" setting, it will
-rewrite the setting with the user's music folder as the only location.
-This will start an import job from the setting's "changed" signal. But
-we already start another import job from the "load-complete" signal of
-the database.
-
-Make sure only the load-complete signal triggers an import when setting
-the "locations" setting is empty on startup.
----
- sources/rb-library-source.c | 29 +++++++++++++----------------
- 1 file changed, 13 insertions(+), 16 deletions(-)
-
-diff --git a/sources/rb-library-source.c b/sources/rb-library-source.c
-index 15ba523d2..378a3e006 100644
---- a/sources/rb-library-source.c
-+++ b/sources/rb-library-source.c
-@@ -284,6 +284,10 @@ db_load_complete_cb (RhythmDB *db, RBLibrarySource *source)
- if (source->priv->do_initial_import) {
- const char *music_dir;
- char *music_dir_uri;
-+ const char *set_locations[2];
-+
-+ g_signal_handlers_block_by_func (source->priv->db_settings,
-+ G_CALLBACK (db_settings_changed_cb), source);
-
- music_dir = rb_music_dir ();
- music_dir_uri = g_filename_to_uri (music_dir, NULL, NULL);
-@@ -293,6 +297,13 @@ db_load_complete_cb (RhythmDB *db, RBLibrarySource *source)
- g_mkdir_with_parents (music_dir, 0700);
- }
-
-+ set_locations[0] = music_dir_uri;
-+ set_locations[1] = NULL;
-+ g_settings_set_strv (source->priv->db_settings, "locations", set_locations);
-+
-+ g_signal_handlers_unblock_by_func (source->priv->db_settings,
-+ G_CALLBACK (db_settings_changed_cb), source);
-+
- /* import anything that's already in there */
- job = maybe_create_import_job (source);
- rhythmdb_import_job_add_uri (job, music_dir_uri);
-@@ -344,22 +355,8 @@ rb_library_source_constructed (GObject *object)
-
- /* Set up the default library location if there's no library location set */
- locations = g_settings_get_strv (source->priv->db_settings, "locations");
-- if (g_strv_length (locations) == 0) {
-- char *music_dir_uri;
--
-- music_dir_uri = g_filename_to_uri (rb_music_dir (), NULL, NULL);
-- if (music_dir_uri != NULL) {
-- const char *set_locations[2];
--
-- set_locations[0] = music_dir_uri;
-- set_locations[1] = NULL;
-- g_settings_set_strv (source->priv->db_settings, "locations", set_locations);
--
-- source->priv->do_initial_import = TRUE;
--
-- g_free (music_dir_uri);
-- }
-- }
-+ if (g_strv_length (locations) == 0)
-+ source->priv->do_initial_import = TRUE;
- g_strfreev (locations);
-
- songs = rb_source_get_entry_view (RB_SOURCE (source));
---
-2.17.0
-
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
deleted file mode 100644
index 17ce213bbca..00000000000
--- a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
-REQUIRED_USE="
- ipod? ( udev )
- mtp? ( udev )
- dbus? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.38:2
- >=dev-libs/libxml2-2.7.8:2
- >=x11-libs/gtk+-3.16:3[X,introspection]
- >=x11-libs/gdk-pixbuf-2.18:2
- >=dev-libs/gobject-introspection-0.10:=
- >=dev-libs/libpeas-0.7.3[gtk]
- >=dev-libs/totem-pl-parser-3.2
- >=net-libs/libsoup-2.42:2.4
- >=media-libs/gst-plugins-base-1.4:1.0[introspection]
- >=media-libs/gstreamer-1.4:1.0[introspection]
- >=sys-libs/tdb-1.2.6
- dev-libs/json-glib
-
- cdr? ( >=app-cdr/brasero-2.91.90 )
- daap? (
- >=net-libs/libdmapsharing-2.9.19:3.0
- >=media-plugins/gst-plugins-soup-1.4:1.0 )
- gnome-keyring? ( >=app-crypt/libsecret-0.18 )
- libnotify? ( >=x11-libs/libnotify-0.7.0 )
- lirc? ( app-misc/lirc )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
- )
- udev? (
- virtual/libgudev:=
- ipod? ( >=media-libs/libgpod-0.7.92[udev] )
- mtp? ( >=media-libs/libmtp-0.3 ) )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-libmms:1.0
- || (
- media-plugins/gst-plugins-cdparanoia:1.0
- media-plugins/gst-plugins-cdio:1.0 )
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-taglib:1.0
- x11-themes/adwaita-icon-theme
- python? (
- >=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
- net-libs/libsoup:2.4[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
-
- dbus? ( sys-apps/dbus )
- gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
- upnp-av? (
- >=media-libs/grilo-0.3:0.3
- >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35
- dev-util/itstool
- virtual/pkgconfig
- test? ( dev-libs/check )
-"
-# eautoreconf needs yelp-tools
-
-PATCHES=(
- "${FILESDIR}"/${P}-gstreamer-1.14.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- # --enable-vala just installs the sample vala plugin, and the configure
- # checks are broken, so don't enable it
- gnome2_src_configure \
- MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
- VALAC=$(type -P true) \
- --enable-mmkeys \
- --disable-more-warnings \
- --disable-static \
- --disable-vala \
- --without-hal \
- $(use_enable daap) \
- $(use_enable libnotify) \
- $(use_enable lirc) \
- $(use_enable nsplugin browser-plugin) \
- $(use_enable python) \
- $(use_enable upnp-av grilo) \
- $(use_with cdr brasero) \
- $(use_with gnome-keyring libsecret) \
- $(use_with ipod) \
- $(use_with mtp) \
- $(use_with udev gudev)
-}
-
-src_test() {
- unset SESSION_MANAGER
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
- GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
- MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
- gnome2_src_install
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/rhythmbox/, media-sound/rhythmbox/files/
@ 2022-05-16 16:30 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-05-16 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 0606f6709ccba07270b28820e5eee96ff98aee7d
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Mon May 16 14:48:14 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 16:29:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0606f670
media-sound/rhythmbox: drop strict meson version check
Closes: https://bugs.gentoo.org/845006
Closes: https://github.com/gentoo/gentoo/pull/25526
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/3.4.5-relax-meson-version-check.patch | 42 ++++++++++++++++++++++
media-sound/rhythmbox/rhythmbox-3.4.5.ebuild | 2 ++
2 files changed, 44 insertions(+)
diff --git a/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch b/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch
new file mode 100644
index 000000000000..2843a4c0cabc
--- /dev/null
+++ b/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch
@@ -0,0 +1,42 @@
+https://github.com/GNOME/rhythmbox/commit/29a1627f1683aac358103710ffc1a51791951edd
+https://bugs.gentoo.org/845006
+--- a/meson.build
++++ b/meson.build
+@@ -3,10 +3,6 @@ project('rhythmbox', 'c',
+ meson_version: '>= 0.59.0',
+ default_options: ['c_std=gnu89'])
+
+-if meson.version().version_compare('> 0.62.0')
+- error('unsupported version of meson, please use 0.62')
+-endif
+-
+ gnome = import('gnome')
+ i18n = import('i18n')
+ pkg = import('pkgconfig')
+GitLab
+From 0fe3a388fac73a5d4217aed510d65976850734c4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 4 May 2022 10:23:16 +0200
+Subject: [PATCH 2/2] ci: Install latest meson
+
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -4,8 +4,6 @@ stages:
+ - test
+
+ variables:
+- MESON_VER: 0.62.0
+-
+ UBUNTU_DEPS:
+ build-essential
+ desktop-file-utils
+@@ -64,7 +62,7 @@ before_script:
+ - export DEBIAN_FRONTEND=noninteractive
+ - apt-get update
+ - apt-get install -y $UBUNTU_DEPS
+- - pip3 install meson==$MESON_VER
++ - pip3 install meson
+
+ test:
+ stage: test
+GitLab
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
index 2e7dc2b30fd4..c4b440ad855b 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
@@ -93,6 +93,8 @@ BDEPEND="
test? ( dev-libs/check )
"
+PATCHES=( "${FILESDIR}/${PV}"-relax-meson-version-check.patch )
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/rhythmbox/, media-sound/rhythmbox/files/
@ 2022-05-31 0:32 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-05-31 0:32 UTC (permalink / raw
To: gentoo-commits
commit: 967a6ee349d91a4d33552646fe9efefd432555a6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 00:31:35 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 31 00:32:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967a6ee3
media-sound/rhythmbox: Add patch to fix build with USE=-libnotify
Closes: https://bugs.gentoo.org/842291
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...-use-feature.allowed-around-dependency-ch.patch | 169 +++++++++++++++++++++
media-sound/rhythmbox/rhythmbox-3.4.5.ebuild | 5 +-
2 files changed, 173 insertions(+), 1 deletion(-)
diff --git a/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
new file mode 100644
index 000000000000..294d2d2ef66f
--- /dev/null
+++ b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
@@ -0,0 +1,169 @@
+From c9dfc5a5899d2628ba1dd6f93f46cf589669bd45 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Tue, 17 May 2022 08:18:21 +1000
+Subject: [PATCH] build: don't use feature.allowed() around dependency checks
+
+When the feature specified as the 'required' parameter to dependency()
+is disabled, it returns an empty dependency object, which is much easier
+to deal with than a dependency variable that's only conditionally
+defined.
+
+Fixes: #1972
+---
+ meson.build | 94 +++++++++++++++++++++--------------------------------
+ 1 file changed, 37 insertions(+), 57 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5792b0e49..de265901b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,71 +70,52 @@ tdb = dependency('tdb', version: '>= 1.2.6', required: true)
+ totem_plparser = dependency('totem-plparser', version: '>= 3.2.0', required: true)
+
+ use_gudev = false
+-if get_option('gudev').allowed()
+- gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
+- if gudev.found()
+- use_gudev = true
+- cdata.set('HAVE_GUDEV', 1)
+- endif
++gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
++if gudev.found()
++ use_gudev = true
++ cdata.set('HAVE_GUDEV', 1)
+ endif
+
+ use_ipod = false
+-if get_option('ipod').allowed()
+- libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
+- if libgpod.found()
+- use_ipod = true
+- endif
++libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
++if libgpod.found()
++ use_ipod = true
+ endif
+
+ use_mtp = false
+-if get_option('mtp').allowed()
+- libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
+-
+- if libmtp.found()
+- if use_gudev
+- use_mtp = true
+- elif get_option('mtp').enabled()
+- error('MTP explicitly requested but GUdev is not available')
+- endif
++libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
++if libmtp.found()
++ if use_gudev
++ use_mtp = true
++ elif get_option('mtp').enabled()
++ error('MTP explicitly requested but GUdev is not available')
+ endif
+ endif
+
+ use_notify = false
+-if get_option('libnotify').allowed()
+- libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
+-
+- if libnotify.found()
+- use_notify = true
+- endif
++libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
++if libnotify.found()
++ use_notify = true
+ endif
+
+ use_libsecret = false
+-if get_option('libsecret').allowed()
+- libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
+-
+- if libsecret.found()
+- use_libsecret = true
+- endif
++libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
++if libsecret.found()
++ use_libsecret = true
+ endif
+ cdata.set('PY_LIBSECRET_ENABLED', use_libsecret)
+ cdata.set('WITH_LIBSECRET', use_libsecret)
+
+ use_lirc = false
+-if get_option('lirc').allowed()
+- lirc = dependency('lirc', required: get_option('lirc'))
+-
+- if lirc.found()
+- use_lirc = true
+- endif
++lirc = dependency('lirc', required: get_option('lirc'))
++if lirc.found()
++ use_lirc = true
+ endif
+
+ have_libbrasero_media = false
+-if get_option('brasero').allowed()
+- brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
+-
+- if brasero_media.found()
+- have_libbrasero_media = true
+- endif
++brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
++if brasero_media.found()
++ have_libbrasero_media = true
+ endif
+
+ have_gnu_fwrite_unlocked = false
+@@ -189,16 +170,16 @@ cdata.set('PLUGINDATADIR', plugindatadir)
+ cdata.set('SAMPLEPLUGINDIR', libdir / 'rhythmbox' / 'sample-plugins')
+
+ enable_python = false
+-if get_option('plugins_python').allowed()
+- python = find_program('python3', required: get_option('plugins_python'))
+- pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
+- pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
++python = find_program('python3', required: get_option('plugins_python'))
++pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
++pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
++if python.found() and pygobject.found()
+ enable_python = true
+ endif
+
+ enable_vala = false
+-if get_option('plugins_vala').allowed()
+- vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
++vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
++if vala_found
+ enable_vala = true
+ vapi_dir = meson.current_source_dir() / 'bindings' / 'vala'
+ add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
+@@ -231,12 +212,9 @@ if get_option('daap').allowed()
+ endif
+
+ enable_grilo = false
+-if get_option('grilo').allowed()
+- grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
+-
+- if grilo.found()
+- enable_grilo = true
+- endif
++grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
++if grilo.found()
++ enable_grilo = true
+ endif
+
+ enable_check = false
+@@ -279,7 +257,9 @@ summary({'iPod integration': use_ipod,
+ 'Python plugin support': enable_python,
+ 'Vala plugin support': enable_vala,
+ 'Libsecret keyring support': use_libsecret,
+- 'FM radio support': enable_fm_radio,},
++ 'FM radio support': enable_fm_radio,
++ 'Grilo support': enable_grilo,
++ },
+ section: 'Plugins')
+
+ configinc = include_directories('.')
+--
+2.35.1
+
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
index c4b440ad855b..d9e9ffb13091 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
@@ -93,7 +93,10 @@ BDEPEND="
test? ( dev-libs/check )
"
-PATCHES=( "${FILESDIR}/${PV}"-relax-meson-version-check.patch )
+PATCHES=(
+ "${FILESDIR}/${PV}"-relax-meson-version-check.patch
+ "${FILESDIR}/${PV}"-build-don-t-use-feature.allowed-around-dependency-ch.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-31 0:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-24 12:20 [gentoo-commits] repo/gentoo:master commit in: media-sound/rhythmbox/, media-sound/rhythmbox/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2019-05-18 23:05 Mart Raudsepp
2022-05-16 16:30 Matt Turner
2022-05-31 0:32 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox