diff --git a/Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch b/Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch new file mode 100644 index 0000000000000000000000000000000000000000..b7fecf243faf3c178a066a04f16e0210cd556b1d --- /dev/null +++ b/Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch @@ -0,0 +1,35 @@ +From 3fee7c63c3aba395a3d8cf0bf4ea0fd2fae695ae Mon Sep 17 00:00:00 2001 +From: Laurent Bigonville +Date: Mon, 26 Feb 2018 11:54:10 +0100 +Subject: [PATCH] Require proper version of GDK and GTK in + scp-dbus-service as well + +scp-dbus-service can be D-Bus activated, that means that +gi.require_version() is not called before. + +That needs to be kept in sync with the required version in the main +program file. +--- + scp-dbus-service.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/scp-dbus-service.py b/scp-dbus-service.py +index f0f51efc..3aefc6c6 100644 +--- a/scp-dbus-service.py ++++ b/scp-dbus-service.py +@@ -21,9 +21,12 @@ + ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + import dbus.service ++import gi + from gi.repository import GObject + from gi.repository import GLib ++gi.require_version('Gdk', '3.0') + from gi.repository import Gdk ++gi.require_version('Gtk', '3.0') + from gi.repository import Gtk + import sys + +-- +2.25.1 + diff --git a/system-config-printer.spec b/system-config-printer.spec index 9a9da7f63996f0947bea98255b2112ad60d807a8..577a9b2c8c383ced464d65dddce841106b147ab2 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -3,7 +3,7 @@ Name: system-config-printer Summary: a graphical tool for CUPS administration Version: 1.5.11 -Release: 17 +Release: 18 License: GPLv2+ URL: https://github.com/zdohnal/system-config-printer Source0: https://github.com/zdohnal/system-config-printer/archive/%{version}.tar.gz @@ -23,6 +23,7 @@ Provides: %{name}-udev = %{version}-%{release} hal-cups-utils = 0.6.20 Patch1: Fix-constructing-the-auth-dialog.patch Patch2: Use-ValueError-instead-of-ImportError-to-catch-excep.patch +Patch3: Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch %description %{name} is a graphical tool for CUPS administration. It @@ -84,6 +85,9 @@ rm -rf /var/cache/foomatic/foomatic.pickle exit 0 %changelog +* Mon Jan 09 2023 xuxinyu - 1.5.11-18 +- Require proper version of GDK and GTK in scp-dbus-service as well + * Mon Jan 09 2023 xuxinyu - 1.5.11-17 - Use ValueError instead of ImportError to catch exception - when importing GIR bindings