Fri Apr 18 03:21:55 UTC 2014

2 files changed, 15 insertions, 27 deletions

diff --git a/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch b/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch
deleted file mode 100644
index 0d08a3da8..000000000
--- a/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' system-config-printer-1.4.2+20130920/scp-dbus-service.py system-config-printer-1.4.2+20130920.new/scp-dbus-service.py
---- system-config-printer-1.4.2+20130920/scp-dbus-service.py	2013-09-20 22:26:27.000000000 +0200
-+++ system-config-printer-1.4.2+20130920.new/scp-dbus-service.py	2013-10-24 13:12:44.998717234 +0200
-@@ -367,7 +367,7 @@
-         pass
- 
-     @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE,
--                         signature='a{s}')
-+                         signature='a(s)')
-     def DriverDownloadChecked(self, installed_files):
-         pass
- 
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 75a9f6bd0..a47347134 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,30 +1,25 @@
-# $Id: PKGBUILD 200771 2013-12-04 20:14:29Z jgc $
+# $Id: PKGBUILD 211153 2014-04-17 19:53:20Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=system-config-printer
-pkgver=1.4.3
-pkgrel=2
+pkgver=1.4.4
+pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib'
-         'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3')
+depends=('pycups' 'python2-dbus' 'python2-pycurl' 'python2-gobject2' 'libnotify'
+         'gnome-icon-theme'  'python2-gobject' 'gtk3')
 makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
-optdepends=('gnome-keyring: password management')
-replaces=('system-config-printer-common' 'system-config-printer-gnome')
-conflicts=('system-config-printer-common' 'system-config-printer-gnome')
-source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        40_scp-dbus-service-fix-dbus-signature-typo.patch)
-md5sums=('99e251bfd281526fb6ea109b3e2bace3'
-         'SKIP'
-         'a616371aff9fae27b99d036c4143bf37')
+optdepends=('libgnome-keyring: password management'
+            'pysmbc: SMB browser support')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('229c6ea422748a0fd7e533bba25595fc'
+         'SKIP')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../40_scp-dbus-service-fix-dbus-signature-typo.patch
-
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
@@ -45,4 +40,9 @@ package() {
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \
     udevrulesdir=/usr/lib/udev/rules.d install
+
+  # Compile *.pyc
+  find "${pkgdir}" -name '*.py' -exec python2 -mpy_compile {} +
+  # Compile *.pyo
+  find "${pkgdir}" -name '*.py' -exec python2 -O -mpy_compile {} +
 }