From 7f4b45a320d9661881e9cd488507bee2cf84e859 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 17 May 2020 01:38:26 +0200
Subject: gnu: soundconverter: Update to 3.0.2.

* gnu/packages/gnome.scm (soundconverter): Update to 3.0.2.
[source]: Remove upstreamed patch.
* gnu/packages/patches/soundconverter-remove-gconf-dependency.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/packages/gnome.scm                             |  7 ++----
 .../soundconverter-remove-gconf-dependency.patch   | 29 ----------------------
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 gnu/packages/patches/soundconverter-remove-gconf-dependency.patch

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e4bb056e4c..fe874100b2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9198,7 +9198,7 @@ (define-public sound-juicer
 (define-public soundconverter
   (package
     (name "soundconverter")
-    (version "3.0.1")
+    (version "3.0.2")
     (source
      (origin
        (method url-fetch)
@@ -9207,10 +9207,7 @@ (define-public soundconverter
                            "soundconverter-" version ".tar.xz"))
 
        (sha256
-        (base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5"))
-       (patches
-        (search-patches
-         "soundconverter-remove-gconf-dependency.patch"))))
+        (base32 "1jv8m82hi23ilrgdznlc1jhp2jm8bw1yrw0chh3qw2l0sixvkl11"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:imported-modules ((guix build python-build-system)
diff --git a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch
deleted file mode 100644
index 29cdeb6e8d..0000000000
--- a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Tobias Geerinckx-Rice <me@tobias.gr>
-Date: Tue, 19 Feb 2019 07:46:28 +0100
-Subject: [PATCH] gnu: soundconverter: Catch (and ignore) the right error.
-
-Without this patch and GConf:
-
-  Traceback (most recent call last):
-    File "/gnu/…/bin/...soundconverter-real-real-real", line 164, in <module>
-      from soundconverter.batch import cli_convert_main
-    File "/gnu/…/lib/soundconverter/python/soundconverter/batch.py", line 31, in <module>
-      from soundconverter.gstreamer import TagReader
-    File "/gnu/…/lib/soundconverter/python/soundconverter/gstreamer.py", line 70, in <module>
-      gi.require_version('GConf', '2.0')
-    File "/gnu/…/lib/python3.7/site-packages/gi/__init__.py", line 130, in require_version
-      raise ValueError('Namespace %s not available' % namespace)
-  ValueError: Namespace GConf not available
----
-diff -Naur soundconverter-3.0.1/soundconverter/gstreamer.py soundconverter-3.0.1/soundconverter/gstreamer.py
---- soundconverter-3.0.1/soundconverter/gstreamer.py	2018-11-23 20:38:46.000000000 +0100
-+++ soundconverter-3.0.1/soundconverter/gstreamer.py	2019-02-19 07:42:15.767684388 +0100
-@@ -88,7 +88,7 @@
-             profile = description, extension, pipeline
-             audio_profiles_list.append(profile)
-             audio_profiles_dict[description] = profile
--except ImportError:
-+except ValueError:
-     pass
- 
- required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate')
-- 
cgit v1.2.3