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

[Andreas Radke]

    Date: Thursday, February 1, 2018 @ 17:21:14
  Author: andyrtr
Revision: 315729

upgpkg: system-config-printer 1.5.11-1

upstream update 1.5.11

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

------------------------------------+
 PKGBUILD                           |   28 ++++++----------------------
 pass_libgnome_keyring_missing.diff |   11 -----------
 2 files changed, 6 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-01 17:12:41 UTC (rev 315728)
+++ PKGBUILD	2018-02-01 17:21:14 UTC (rev 315729)
@@ -3,8 +3,8 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=system-config-printer
-pkgver=1.5.9
-pkgrel=3
+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')
@@ -11,29 +11,13 @@
 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')
-optdepends=(#'libgnome-keyring: password management'
+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=(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
-		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>
+source=(https://github.com/zdohnal/system-config-printer/releases/download/$pkgver/system-config-printer-${pkgver}.tar.xz)
+sha256sums=('38ad78d117c30ddb8c6c008a91d1bc0fa2e854ec04ee2de5cdd12ab842c100d3')
 
-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
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \

Deleted: pass_libgnome_keyring_missing.diff
===================================================================
--- pass_libgnome_keyring_missing.diff	2018-02-01 17:12:41 UTC (rev 315728)
+++ pass_libgnome_keyring_missing.diff	2018-02-01 17:21:14 UTC (rev 315729)
@@ -1,11 +0,0 @@
---- 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)