[arch-commits] Commit in soundconverter/trunk (PKGBUILD drop-gconf.patch)

[Balló György]

    Date: Sunday, September 2, 2018 @ 21:46:54
  Author: bgyorgy
Revision: 376097

upgpkg: soundconverter 3.0.0-3

Remove deprecated GConf dependency

Added:
  soundconverter/trunk/drop-gconf.patch
Modified:
  soundconverter/trunk/PKGBUILD

------------------+
 PKGBUILD         |   14 +++++++---
 drop-gconf.patch |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-02 21:46:01 UTC (rev 376096)
+++ PKGBUILD	2018-09-02 21:46:54 UTC (rev 376097)
@@ -5,21 +5,27 @@
 
 pkgname=soundconverter
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple sound converter application for GNOME"
 arch=('any')
 license=('GPL3')
 url="http://soundconverter.org/"
-depends=('gconf' 'gst-plugins-base' 'gst-plugins-good' 'gtk3' 'libnotify' 'python-gobject')
+depends=('gst-plugins-base' 'gst-plugins-good' 'gtk3' 'libnotify' 'python-gobject')
 makedepends=('intltool')
 optdepends=('gst-plugins-ugly: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'
             'gst-libav: Extra media codecs')
-source=("https://launchpad.net/soundconverter/trunk/$pkgver/+download/soundconverter-$pkgver.tar.xz")
-sha512sums=('6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d')
+source=("https://launchpad.net/soundconverter/trunk/$pkgver/+download/soundconverter-$pkgver.tar.xz"
+        "drop-gconf.patch")
+sha512sums=('6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d'
+            '703954e9f5aac320bc3639ffc8f17cb5ae9e70b4344375cef8fb3be295519a8ef1d2631ca7f54ee2702e53a55c18fa674f56bda371048096c3a51877ff069e88')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Remove deprecated GConf dependency
+  patch -Np0 -i "${srcdir}/drop-gconf.patch"
+
   NOCONFIGURE=1 ./autogen.sh
 }
 

Added: drop-gconf.patch
===================================================================
--- drop-gconf.patch	                        (rev 0)
+++ drop-gconf.patch	2018-09-02 21:46:54 UTC (rev 376097)
@@ -0,0 +1,74 @@
+=== modified file 'bin/soundconverter.py'
+--- bin/soundconverter.py	2017-10-29 20:09:01 +0000
++++ bin/soundconverter.py	2018-04-06 11:25:35 +0000
+@@ -66,7 +66,6 @@
+         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
+
+=== modified file 'soundconverter/gstreamer.py'
+--- soundconverter/gstreamer.py	2018-03-26 18:14:18 +0000
++++ soundconverter/gstreamer.py	2018-04-06 11:25:35 +0000
+@@ -25,7 +25,7 @@
+ 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 @@
+ 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
+ 
+ required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate')
+ for element in required_elements:
+