[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/20: gnu: soundconverter: Update to 3.0.1.
From: |
guix-commits |
Subject: |
15/20: gnu: soundconverter: Update to 3.0.1. |
Date: |
Tue, 19 Feb 2019 04:03:13 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit fa75a21363d6dd07c1dbc990b88cd75f19454324
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Feb 19 07:19:53 2019 +0100
gnu: soundconverter: Update to 3.0.1.
* gnu/packages/gnome.scm (soundconverter): Update to 3.0.1.
[arguments]: Remove ‘fix-POTFILES.in’ phase.
* gnu/packages/patches/soundconverter-remove-gconf-dependency.patch:
Update.
---
gnu/packages/gnome.scm | 13 +--
.../soundconverter-remove-gconf-dependency.patch | 104 +++++----------------
2 files changed, 28 insertions(+), 89 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e371a60..a5ca245 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -21,7 +21,7 @@
;;; Copyright © 2016 Alex Griffin <address@hidden>
;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
;;; Copyright © 2016 David Craven <address@hidden>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Thomas Danckaert <address@hidden>
;;; Copyright © 2017 Hartmut Goebel <address@hidden>
;;; Copyright © 2017, 2018 nee <address@hidden>
@@ -7371,7 +7371,7 @@ mp3, Ogg Vorbis and FLAC")
(define-public soundconverter
(package
(name "soundconverter")
- (version "3.0.0")
+ (version "3.0.1")
(source
(origin
(method url-fetch)
@@ -7380,8 +7380,7 @@ mp3, Ogg Vorbis and FLAC")
"soundconverter-" version ".tar.xz"))
(sha256
- (base32
- "1wrxf5py54xplrf97qp24pzbis0cvax5c6k0c7vr3z3ry8r7gd7c"))
+ (base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5"))
(patches
(search-patches
"soundconverter-remove-gconf-dependency.patch"))))
@@ -7398,12 +7397,6 @@ mp3, Ogg Vorbis and FLAC")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-POTFILES.in
- (lambda _
- (substitute* "po/POTFILES.in"
- ;; This file doesn't exist, so without removing it, the 'check
- ;; phase fails for the po directory
- (("soundconverter/gconfstore\\.py") ""))))
(add-after 'install 'wrap-soundconverter-for-python
(assoc-ref python:%standard-phases 'wrap))
(add-after 'install 'wrap-soundconverter
diff --git a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch
b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch
index f065b9a..29cdeb6 100644
--- a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch
+++ b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch
@@ -1,83 +1,29 @@
-From: Sebastian Ramacher <address@hidden>
-Date: Fri, 6 Apr 2018 13:25:35 +0200
-Subject: Only fetch profiles if GConf is still available
+From: Tobias Geerinckx-Rice <address@hidden>
+Date: Tue, 19 Feb 2019 07:46:28 +0100
+Subject: [PATCH] gnu: soundconverter: Catch (and ignore) the right error.
----
- bin/soundconverter.py | 1 -
- soundconverter/gstreamer.py | 44 ++++++++++++++++++++++++--------------------
- 2 files changed, 24 insertions(+), 21 deletions(-)
+Without this patch and GConf:
-diff --git a/bin/soundconverter.py b/bin/soundconverter.py
-index 39055ce..5198443 100644
---- a/bin/soundconverter.py
-+++ b/bin/soundconverter.py
-@@ -66,7 +66,6 @@ def _check_libs():
- import gi
- gi.require_version('Gst', '1.0')
- gi.require_version('Gtk', '3.0')
-- gi.require_version('GConf', '2.0')
- from gi.repository import GObject
- # force GIL creation - see
https://bugzilla.gnome.org/show_bug.cgi?id=710447
- import threading
-diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py
-index 23aaa9b..211b052 100644
---- a/soundconverter/gstreamer.py
-+++ b/soundconverter/gstreamer.py
-@@ -25,7 +25,7 @@ from urllib.parse import urlparse
- from gettext import gettext as _
-
- import gi
--from gi.repository import Gst, Gtk, GObject, GConf, Gio
-+from gi.repository import Gst, Gtk, GObject, Gio
-
- from soundconverter.fileoperations import vfs_encode_filename,
file_encode_filename
- from soundconverter.fileoperations import unquote_filename, vfs_makedirs,
vfs_unlink
-@@ -66,25 +66,29 @@ _GCONF_PROFILE_LIST_PATH =
"/system/gstreamer/1.0/audio/global/profile_list"
- audio_profiles_list = []
- audio_profiles_dict = {}
-
--_GCONF = GConf.Client.get_default()
--profiles = _GCONF.all_dirs(_GCONF_PROFILE_LIST_PATH)
--for name in profiles:
-- if _GCONF.get_bool(_GCONF_PROFILE_PATH + name + "/active"):
-- # get profile
-- description = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/name")
-- extension = _GCONF.get_string(_GCONF_PROFILE_PATH + name +
"/extension")
-- pipeline = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/pipeline")
-- # check profile validity
-- if not extension or not pipeline:
-- continue
-- if not description:
-- description = extension
-- if description in audio_profiles_dict:
-- continue
-- # store
-- profile = description, extension, pipeline
-- audio_profiles_list.append(profile)
-- audio_profiles_dict[description] = profile
-+try:
-+ from gi.repository import GConf
-+ _GCONF = GConf.Client.get_default()
-+ profiles = _GCONF.all_dirs(_GCONF_PROFILE_LIST_PATH)
-+ for name in profiles:
-+ if _GCONF.get_bool(_GCONF_PROFILE_PATH + name + "/active"):
-+ # get profile
-+ description = _GCONF.get_string(_GCONF_PROFILE_PATH + name +
"/name")
-+ extension = _GCONF.get_string(_GCONF_PROFILE_PATH + name +
"/extension")
-+ pipeline = _GCONF.get_string(_GCONF_PROFILE_PATH + name +
"/pipeline")
-+ # check profile validity
-+ if not extension or not pipeline:
-+ continue
-+ if not description:
-+ description = extension
-+ if description in audio_profiles_dict:
-+ continue
-+ # store
-+ profile = description, extension, pipeline
-+ audio_profiles_list.append(profile)
-+ audio_profiles_dict[description] = profile
-+except ImportError:
-+ pass
+ 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')
- for element in required_elements:
- 18/20: gnu: libdazzle: Don't use NAME in source URI., (continued)
- 18/20: gnu: libdazzle: Don't use NAME in source URI., guix-commits, 2019/02/19
- 16/20: gnu: workrave: Compute source COMMIT from VERSION., guix-commits, 2019/02/19
- 19/20: gnu: unbound: Update to 1.9.0., guix-commits, 2019/02/19
- 05/20: gnu: gerbv: Update to 2.7.0., guix-commits, 2019/02/19
- 09/20: gnu: protozero: Fix typo in description., guix-commits, 2019/02/19
- 17/20: gnu: ghex: Don't use NAME in source URI., guix-commits, 2019/02/19
- 20/20: gnu: stgit: Don't use unstable tarball., guix-commits, 2019/02/19
- 10/20: gnu: hiawatha: Update to 10.9., guix-commits, 2019/02/19
- 14/20: gnu: gimp: Update to 2.10.8., guix-commits, 2019/02/19
- 08/20: gnu: protozero: Don't use unstable tarball., guix-commits, 2019/02/19
- 15/20: gnu: soundconverter: Update to 3.0.1.,
guix-commits <=