From a59246c8e17300915d51343dffe15108dd926b15 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 5 Jan 2021 14:37:51 +0100 Subject: [PATCH] 1750156 - hangs on selection of change PPD (Make and Model) --- ...nt-require-the-exact-Gdk-version-179.patch | 27 +++++++++++++++++++ system-config-printer.spec | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-asyncpk1.py-Dont-require-the-exact-Gdk-version-179.patch diff --git a/0001-asyncpk1.py-Dont-require-the-exact-Gdk-version-179.patch b/0001-asyncpk1.py-Dont-require-the-exact-Gdk-version-179.patch new file mode 100644 index 0000000..131100b --- /dev/null +++ b/0001-asyncpk1.py-Dont-require-the-exact-Gdk-version-179.patch @@ -0,0 +1,27 @@ +From aa6500531326c4895f70f238a75f4537fe3532db Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Tue, 5 Jan 2021 13:22:52 +0100 +Subject: [PATCH] asyncpk1.py: Dont require the exact Gdk version #179 + +It works around the freeze during changing printer driver, but it will generate a warning. +The proper fix is to refactor threading code in s-c-p to follow GTK 3 standards. +--- + NEWS | 1 + + asyncpk1.py | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/asyncpk1.py b/asyncpk1.py +index 849c995f..156b5f49 100644 +--- a/asyncpk1.py ++++ b/asyncpk1.py +@@ -22,7 +22,6 @@ import cups + import dbus + from functools import reduce + try: +- gi.require_version('Gdk', '3.0') + from gi.repository import Gdk + gi.require_version('Gtk', '3.0') + from gi.repository import Gtk +-- +2.26.2 + diff --git a/system-config-printer.spec b/system-config-printer.spec index 57f89ee..e35b626 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -9,13 +9,14 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.5.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/%{username}/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz # all upstream patches, remove with new release Patch1: scp-dymo400.patch +Patch2: 0001-asyncpk1.py-Dont-require-the-exact-Gdk-version-179.patch # gcc is no longer in buildroot by default @@ -216,6 +217,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris exit 0 %changelog +* Tue Jan 05 2021 Zdenek Dohnal - 1.5.13-3 +- 1750156 - hangs on selection of change PPD (Make and Model) + * Fri Nov 27 2020 Zdenek Dohnal - 1.5.13-2 - set preferred driver for Dymo LabelWriter 400