[arch-commits] Commit in system-config-printer/trunk (2 files)

Andreas Radke andyrtr at archlinux.org
Fri Jan 27 07:23:10 UTC 2017


    Date: Friday, January 27, 2017 @ 07:23:10
  Author: andyrtr
Revision: 287573

upgpkg: system-config-printer 1.5.9-2

make it work againg without deprecated libgnome-keyring; FS#52607

Added:
  system-config-printer/trunk/pass_libgnome_keyring_missing.diff
Modified:
  system-config-printer/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   15 +++++++++++----
 pass_libgnome_keyring_missing.diff |   11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-27 06:59:48 UTC (rev 287572)
+++ PKGBUILD	2017-01-27 07:23:10 UTC (rev 287573)
@@ -4,7 +4,7 @@
 
 pkgname=system-config-printer
 pkgver=1.5.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="https://github.com/zdohnal/system-config-printer"
 arch=('i686' 'x86_64')
@@ -12,18 +12,25 @@
 depends=('python-pycups' 'python-dbus' 'python-pycurl' 'libnotify'
          'python-requests' 'python-gobject' 'gtk3' 'python-cairo')
 makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
-optdepends=('libgnome-keyring: password management'
+optdepends=(#'libgnome-keyring: password management'
             'python-pysmbc: SMB browser support'
             'python-packagekit: to install drivers with PackageKit'
             'cups-pk-helper: PolicyKit helper to configure cups with fine-grained privileges')
 #source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
-source=(https://github.com/zdohnal/system-config-printer/archive/v${pkgver}.tar.gz)
-sha256sums=('c8adf4468a465a2640ac365498f551e8a8645a09027e24004fd390e40b6262e3')
+source=(https://github.com/zdohnal/system-config-printer/archive/v${pkgver}.tar.gz
+		pass_libgnome_keyring_missing.diff)
+sha256sums=('c8adf4468a465a2640ac365498f551e8a8645a09027e24004fd390e40b6262e3'
+            '7d901711ca8fd0470342bc03bf4458fb2552cebdfa141acb435b99cfde4d2621')
 #validpgpkeys=('02EA6349CE58E1BCAA8514F57955128DA3A1ABD3' #Tim Waugh <twaugh at redhat.com> <tim at cyberelk.net>
 #              '4629AFE960EC20BEC12E3104B7C20D079491EA63') #Tim Waugh <tim at cyberelk.net>
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  
+  # make it actually work without libgnome-keyring
+  # https://bugs.archlinux.org/task/52607, https://github.com/zdohnal/system-config-printer/issues/51
+  patch -Np1 -i ../pass_libgnome_keyring_missing.diff
+  
   touch README ChangeLog
   autoreconf -fi
 }

Added: pass_libgnome_keyring_missing.diff
===================================================================
--- pass_libgnome_keyring_missing.diff	                        (rev 0)
+++ pass_libgnome_keyring_missing.diff	2017-01-27 07:23:10 UTC (rev 287573)
@@ -0,0 +1,11 @@
+--- system-config-printer-1.5.9/jobviewer.py	2017-01-09 12:38:09.000000000 +0100
++++ system-config-printer-1.5.9/jobviewer.py.new	2017-01-27 08:14:00.163315284 +0100
+@@ -59,6 +59,8 @@
+     USE_KEYRING=True
+ except ImportError:
+     USE_KEYRING=False
++except ValueError:
++    USE_KEYRING=False
+ 
+ import gettext
+ gettext.install(domain=config.PACKAGE, localedir=config.localedir)



More information about the arch-commits mailing list