From 80326a6a3e7fffa9a5a93f30758525934f64f39e Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Sat, 7 Oct 2017 14:46:31 +0100
Subject: [PATCH] system-config-printer: update to 1.5.9

---
 system-config-printer/PKGBUILD                | 23 ++++++++++++++-----
 .../pass_libgnome_keyring_missing.diff        | 11 +++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 system-config-printer/pass_libgnome_keyring_missing.diff

diff --git a/system-config-printer/PKGBUILD b/system-config-printer/PKGBUILD
index d992bb5..7cf5170 100644
--- a/system-config-printer/PKGBUILD
+++ b/system-config-printer/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=system-config-printer
-pkgver=1.5.8
+pkgver=1.5.9
 pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
@@ -8,15 +8,26 @@ license=('GPL')
 depends=('python3-pycups' 'python3-dbus' 'python3-pycurl' 'python3-requests' 'python3-gobject' 'gtk3'
          'python3-cairo' 'libnotify')
 makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
-optdepends=('libgnome-keyring: password management'
-            'pysmbc: SMB browser support')
-source=(https://github.com/zdohnal/${pkgname}/archive/${pkgver}.tar.gz)
-md5sums=('69b4f36478abcc0c745bdc23abb03246')
+optdepends=('python3-pysmbc: SMB browser support')
+source=(https://github.com/zdohnal/${pkgname}/archive/v${pkgver}.tar.gz
+        pass_libgnome_keyring_missing.diff)
+md5sums=('cdadf9343398f3dc8fa4d4f83ac5d8b8'
+         '1c219bf9e55e39b125daaa9f5eed5b84')
+
+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
 
-  ./bootstrap
   ./configure --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
diff --git a/system-config-printer/pass_libgnome_keyring_missing.diff b/system-config-printer/pass_libgnome_keyring_missing.diff
new file mode 100644
index 0000000..9f9a94c
--- /dev/null
+++ b/system-config-printer/pass_libgnome_keyring_missing.diff
@@ -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)