From c6051941c12b0b0d95ff78b731041bd25aecb0b3 Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 21 Aug 2022 20:56:46 +0000 Subject: [PATCH] remove the hacky patch which allowed quodlibet to run by avoiding the libsoup 2.4/3.0 conflict but broke some functionality (i.e. anything using libsoup functions in quodlibet) --- audio/quodlibet/Makefile | 3 ++- .../quodlibet/patches/patch-quodlibet__init_py | 18 ------------------ 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 audio/quodlibet/patches/patch-quodlibet__init_py diff --git a/audio/quodlibet/Makefile b/audio/quodlibet/Makefile index 7c5f41414af..539464ea8f8 100644 --- a/audio/quodlibet/Makefile +++ b/audio/quodlibet/Makefile @@ -1,6 +1,7 @@ COMMENT= audio player and tagger for GTK+ with regex support MODPY_EGG_VERSION= 4.5.0 +REVISION= 0 DISTNAME= quodlibet-${MODPY_EGG_VERSION} PORTROACH= skipv:release-${MODPY_EGG_VERSION} @@ -25,7 +26,7 @@ RUN_DEPENDS= audio/py-musicbrainzngs${MODPY_FLAVOR} \ # others RUN_DEPENDS+= devel/desktop-file-utils \ devel/libsoup3 \ - multimedia/gstreamer1/plugins-good \ + multimedia/gstreamer1/plugins-good>=1.20.3p0 \ multimedia/gstreamer1/plugins-libav \ multimedia/xine-lib \ x11/gtk+3,-guic diff --git a/audio/quodlibet/patches/patch-quodlibet__init_py b/audio/quodlibet/patches/patch-quodlibet__init_py deleted file mode 100644 index 25bd070949f..00000000000 --- a/audio/quodlibet/patches/patch-quodlibet__init_py +++ /dev/null @@ -1,18 +0,0 @@ -Avoid conflict between soup-2.4 (which was pulled in here) and soup-3.0 -(pulled in via Gst). - -Possibly not squeaky clean but seems to work. Without this quodlibet-4.4.0 -was failing intermittently and quodlibet-4.5.0 failing every time. - -Index: quodlibet/_init.py ---- quodlibet/_init.py.orig -+++ quodlibet/_init.py -@@ -243,7 +243,7 @@ def _init_gtk(): - gi.require_version("Gtk", "3.0") - gi.require_version("Gdk", "3.0") - gi.require_version("Pango", "1.0") -- gi.require_version('Soup', '2.4') -+ gi.require_version('Soup', '3.0') - gi.require_version('PangoCairo', "1.0") - - from gi.repository import Gtk