[arch-commits] Commit in system-config-printer/repos/testing-x86_64 (3 files)

[Jan Steffens]

    Date: Thursday, February 8, 2018 @ 16:05:49
  Author: heftig
Revision: 316245

archrelease: copy trunk to testing-x86_64

Added:
  system-config-printer/repos/testing-x86_64/0001-Fix-constructing-the-auth-dialog.patch
    (from rev 316244, system-config-printer/trunk/0001-Fix-constructing-the-auth-dialog.patch)
  system-config-printer/repos/testing-x86_64/PKGBUILD
    (from rev 316244, system-config-printer/trunk/PKGBUILD)
Deleted:
  system-config-printer/repos/testing-x86_64/PKGBUILD

---------------------------------------------+
 0001-Fix-constructing-the-auth-dialog.patch |   32 +++++++++
 PKGBUILD                                    |   89 ++++++++++++++------------
 2 files changed, 80 insertions(+), 41 deletions(-)

Copied: system-config-printer/repos/testing-x86_64/0001-Fix-constructing-the-auth-dialog.patch (from rev 316244, system-config-printer/trunk/0001-Fix-constructing-the-auth-dialog.patch)
===================================================================
--- 0001-Fix-constructing-the-auth-dialog.patch	                        (rev 0)
+++ 0001-Fix-constructing-the-auth-dialog.patch	2018-02-08 16:05:49 UTC (rev 316245)
@@ -0,0 +1,32 @@
+From 2766d74a98e44693f5e966d541a6303b966c088b Mon Sep 17 00:00:00 2001
+Message-Id: <2766d74a98e44693f5e966d541a6303b966c088b.1518105780.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-08 16:05:00 UTC (rev 316244)
+++ PKGBUILD	2018-02-08 16:05:49 UTC (rev 316245)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=system-config-printer
-pkgver=1.5.11
-pkgrel=1
-pkgdesc="A CUPS printer configuration tool and status applet"
-url="https://github.com/zdohnal/system-config-printer"
-arch=('x86_64')
-license=('GPL')
-depends=('python-pycups' 'python-dbus' 'python-pycurl' 'libnotify'
-         'python-requests' 'python-gobject' 'gtk3' 'python-cairo')
-makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libsecret')
-optdepends=('libsecret: password management'
-            'python-pysmbc: SMB browser support'
-            'cups-pk-helper: PolicyKit helper to configure cups with fine-grained privileges')
-source=(https://github.com/zdohnal/system-config-printer/releases/download/$pkgver/system-config-printer-${pkgver}.tar.xz)
-sha256sums=('38ad78d117c30ddb8c6c008a91d1bc0fa2e854ec04ee2de5cdd12ab842c100d3')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --with-udevdir=/usr/lib/udev --with-udev-rules 
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # Compile *.pyc
-  find "${pkgdir}" -name '*.py' -exec python -mpy_compile {} +
-  # Compile *.pyo
-  find "${pkgdir}" -name '*.py' -exec python -O -mpy_compile {} +
-  
-  # new cups 2.0.0 service naming
-  sed -i "s|cups.socket|org.cups.cupsd.socket|g" ${pkgdir}/usr/lib/systemd/system/configure-printer at .service
-}

Copied: system-config-printer/repos/testing-x86_64/PKGBUILD (from rev 316244, system-config-printer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-02-08 16:05:49 UTC (rev 316245)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=system-config-printer
+pkgver=1.5.11
+pkgrel=2
+pkgdesc="A CUPS printer configuration tool and status applet"
+url="https://github.com/zdohnal/system-config-printer"
+arch=('x86_64')
+license=('GPL')
+depends=('python-pycups' 'python-dbus' 'python-pycurl' 'libnotify'
+         'python-requests' 'python-gobject' 'gtk3' 'python-cairo')
+makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libsecret')
+optdepends=('libsecret: password management'
+            'python-pysmbc: SMB browser support'
+            'cups-pk-helper: PolicyKit helper to configure cups with fine-grained privileges')
+source=(https://github.com/zdohnal/system-config-printer/releases/download/$pkgver/system-config-printer-${pkgver}.tar.xz
+        0001-Fix-constructing-the-auth-dialog.patch)
+sha256sums=('38ad78d117c30ddb8c6c008a91d1bc0fa2e854ec04ee2de5cdd12ab842c100d3'
+            '2fd4daa433da0659b6a86962144545015d617c39c0e42ea04d7ede5fa6f9ceff')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../0001-Fix-constructing-the-auth-dialog.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-udevdir=/usr/lib/udev --with-udev-rules 
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # Compile *.pyc
+  find "${pkgdir}" -name '*.py' -exec python -mpy_compile {} +
+  # Compile *.pyo
+  find "${pkgdir}" -name '*.py' -exec python -O -mpy_compile {} +
+  
+  # new cups 2.0.0 service naming
+  sed -i "s|cups.socket|org.cups.cupsd.socket|g" ${pkgdir}/usr/lib/systemd/system/configure-printer at .service
+}