From 0f7721d03208800c625155cd5f51440b5050d988 Mon Sep 17 00:00:00 2001 From: liyuan Date: Sun, 8 Jan 2023 13:18:24 +0800 Subject: [PATCH] backport Fix constructing the auth dialog --- 0001-Fix-constructing-the-auth-dialog.patch | 31 +++++++++++++++++++++ system-config-printer.spec | 8 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-constructing-the-auth-dialog.patch diff --git a/0001-Fix-constructing-the-auth-dialog.patch b/0001-Fix-constructing-the-auth-dialog.patch new file mode 100644 index 0000000..61d4644 --- /dev/null +++ b/0001-Fix-constructing-the-auth-dialog.patch @@ -0,0 +1,31 @@ +From 2766d74a98e44693f5e966d541a6303b966c088b Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Thu, 8 Feb 2018 17:01:01 +0100 +Subject: [PATCH] Fix constructing the auth dialog + +47973c80 (Remove deprecated Gtk objects) broke the auth dialog. + +Fixes https://bugs.archlinux.org/task/57364. +--- + authconn.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/authconn.py b/authconn.py +index 2a645dcc..0f3021cb 100644 +--- a/authconn.py ++++ b/authconn.py +@@ -78,11 +78,9 @@ class AuthDialog(Gtk.Dialog): + field = auth_info_required[i] + label = Gtk.Label (label=_(self.AUTH_FIELD.get (field, field))) + label.set_alignment (0, 0.5) +- grid.attach (label, 0, 1, i, i + 1) + grid.attach (label, 0, i, 1, 1) + entry = Gtk.Entry () + entry.set_visibility (field != 'password') +- grid.attach (entry, 1, 2, i, i + 1, 0, 0) + grid.attach (entry, 1, i, 1, 1) + self.field_entry.append (entry) + +-- +2.33.0 + diff --git a/system-config-printer.spec b/system-config-printer.spec index f16caae..b3f9a79 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -3,10 +3,13 @@ Name: system-config-printer Summary: a graphical tool for CUPS administration Version: 1.5.11 -Release: 15 +Release: 16 License: GPLv2+ URL: https://github.com/zdohnal/system-config-printer Source0: https://github.com/zdohnal/system-config-printer/archive/%{version}.tar.gz + +Patch0001: 0001-Fix-constructing-the-auth-dialog.patch + BuildRequires: libusb1-devel gcc gettext-devel systemd xmlto systemd-devel python3-devel BuildRequires: intltool cups-devel >= 1.2 desktop-file-utils >= 0.2.92 pkgconfig(glib-2.0) Requires: desktop-file-utils >= 0.2.92 python3-dbus%{?_isa} gtk3%{?_isa} python3-gobject%{?_isa} @@ -81,6 +84,9 @@ rm -rf /var/cache/foomatic/foomatic.pickle exit 0 %changelog +* Thu Oct 12 2023 liyuanyuan - 1.5.11-16 +- Fix constructing the auth dialog + * Wed Nov 25 2020 Ge Wang - 1.5.11-15 - Resolve installation failure. Set usb-uris file as a parameter of operation %ghost, - so that usb-uris can be packed into RPM correctly -- Gitee