[arch-commits] Commit in system-config-printer/repos (3 files)
Felix Yan
felixonmars at archlinux.org
Mon Jul 23 15:42:10 UTC 2018
Date: Monday, July 23, 2018 @ 15:42:10
Author: felixonmars
Revision: 329444
archrelease: copy trunk to staging-x86_64
Added:
system-config-printer/repos/staging-x86_64/
system-config-printer/repos/staging-x86_64/0001-Fix-constructing-the-auth-dialog.patch
(from rev 329443, system-config-printer/trunk/0001-Fix-constructing-the-auth-dialog.patch)
system-config-printer/repos/staging-x86_64/PKGBUILD
(from rev 329443, system-config-printer/trunk/PKGBUILD)
---------------------------------------------+
0001-Fix-constructing-the-auth-dialog.patch | 32 +++++++++++++++++
PKGBUILD | 48 ++++++++++++++++++++++++++
2 files changed, 80 insertions(+)
Copied: system-config-printer/repos/staging-x86_64/0001-Fix-constructing-the-auth-dialog.patch (from rev 329443, system-config-printer/trunk/0001-Fix-constructing-the-auth-dialog.patch)
===================================================================
--- staging-x86_64/0001-Fix-constructing-the-auth-dialog.patch (rev 0)
+++ staging-x86_64/0001-Fix-constructing-the-auth-dialog.patch 2018-07-23 15:42:10 UTC (rev 329444)
@@ -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
+
Copied: system-config-printer/repos/staging-x86_64/PKGBUILD (from rev 329443, system-config-printer/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-23 15:42:10 UTC (rev 329444)
@@ -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=3
+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
+}
More information about the arch-commits
mailing list