Merge pull request #4887 from Rmys/master

system-config-printer-1.5.11:ver.bump
This commit is contained in:
Rmys
2018-05-22 13:47:31 +03:00
committed by GitHub
2 changed files with 43 additions and 2 deletions
@@ -0,0 +1,32 @@
From 2766d74a98e44693f5e966d541a6303b966c088b Mon Sep 17 00:00:00 2001
Message-Id: <2766d74a98e44693f5e966d541a6303b966c088b.1518105780.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
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.16.1
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A printer administration tool</Summary>
<Description>system-config-printer is a graphical user interface that allows the user to configure a CUPS print server.</Description>
<Archive sha1sum="d6233bfb6bec095cff4caf9516ed9c3fd358bdbd" type="targz">https://github.com/zdohnal/system-config-printer/archive/v1.5.9.tar.gz</Archive>
<Archive sha1sum="2375c76f695165b7b976390abd55aaf721285df8" type="targz">https://github.com/zdohnal/system-config-printer/archive/1.5.11.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
</AdditionalFiles>
@@ -35,7 +35,8 @@
<!-- Replace emblem-default by dialog-ok -->
<Patch level="1">fix-icon.patch</Patch>
<!--make it actually work without libgnome-keyring -->
<Patch>pass_libgnome_keyring_missing.diff</Patch>
<!-- <Patch>pass_libgnome_keyring_missing.diff</Patch> -->
<Patch>0001-Fix-constructing-the-auth-dialog.patch</Patch>
</Patches>
</Source>
@@ -70,6 +71,7 @@
<Path fileType="executable">/lib/udev</Path>
<Path fileType="executable">/usr/libexec</Path>
<Path fileType="config">/usr/lib/tmpfiles.d/system-config-printer.conf</Path>
<Path fileType="data">/usr/share/metainfo/system-config-printer.appdata.xml</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/tmpfiles.d/system-config-printer.conf">tmpfiles.conf</AdditionalFile>
@@ -96,6 +98,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-05-21</Date>
<Version>1.5.11</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-03-03</Date>
<Version>1.5.9</Version>