Hello community, here is the log from the commit of package soundconverter for openSUSE:Factory checked in at 2018-06-19 11:57:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/soundconverter (Old) and /work/SRC/openSUSE:Factory/.soundconverter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "soundconverter" Tue Jun 19 11:57:45 2018 rev:4 rq:616446 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/soundconverter/soundconverter.changes 2018-05-23 16:08:51.682510450 +0200 +++ /work/SRC/openSUSE:Factory/.soundconverter.new/soundconverter.changes 2018-06-19 11:57:54.390857204 +0200 @@ -1,0 +2,7 @@ +Thu Jun 7 23:22:59 UTC 2018 - [email protected] + +- Add Only-fetch-profiles-if-GConf-is-still-available.patch: No + longer mandate gconf2, also add typelib(GConf) to global requires + exclude, prevent the gir scanner to add typelib. + +------------------------------------------------------------------- New: ---- Only-fetch-profiles-if-GConf-is-still-available.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soundconverter.spec ++++++ --- /var/tmp/diff_new_pack.Tq5No2/_old 2018-06-19 11:57:56.142792154 +0200 +++ /var/tmp/diff_new_pack.Tq5No2/_new 2018-06-19 11:57:56.162791411 +0200 @@ -16,7 +16,7 @@ # -%global __requires_exclude typelib\\(Unity\\) +%global __requires_exclude typelib\\(GConf\\)|typelib\\(Unity\\) Name: soundconverter Version: 3.0.0 @@ -26,6 +26,8 @@ Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://soundconverter.org/ Source0: https://launchpad.net/soundconverter/trunk/%{version}/+download/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM Only-fetch-profiles-if-GConf-is-still-available.patch -- No longer mandate gconf2 +Patch0: Only-fetch-profiles-if-GConf-is-still-available.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel @@ -60,7 +62,7 @@ %lang_package %prep -%autosetup +%autosetup -p1 %build %configure ++++++ Only-fetch-profiles-if-GConf-is-still-available.patch ++++++ From: Sebastian Ramacher <[email protected]> Date: Fri, 6 Apr 2018 13:25:35 +0200 Subject: Only fetch profiles if GConf is still available --- bin/soundconverter.py | 1 - soundconverter/gstreamer.py | 44 ++++++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 21 deletions(-) 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 required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate') for element in required_elements:
