[arch-commits] Commit in system-config-printer/trunk (2 files)
Date: Monday, October 7, 2019 @ 19:27:59 Author: andyrtr Revision: 364049 upgpkg: system-config-printer 1.5.12-1 upstream update 1.5.12; use openprinting.org url - FS#64052 Modified: system-config-printer/trunk/PKGBUILD Deleted: system-config-printer/trunk/0001-Fix-constructing-the-auth-dialog.patch -+ 0001-Fix-constructing-the-auth-dialog.patch | 32 -- PKGBUILD| 17 - 2 files changed, 5 insertions(+), 44 deletions(-) Deleted: 0001-Fix-constructing-the-auth-dialog.patch === --- 0001-Fix-constructing-the-auth-dialog.patch 2019-10-07 19:12:21 UTC (rev 364048) +++ 0001-Fix-constructing-the-auth-dialog.patch 2019-10-07 19:27:59 UTC (rev 364049) @@ -1,32 +0,0 @@ -From 2766d74a98e44693f5e966d541a6303b966c088b Mon Sep 17 00:00:00 2001 -Message-Id: <2766d74a98e44693f5e966d541a6303b966c088b.1518105780.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" -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 - Modified: PKGBUILD === --- PKGBUILD2019-10-07 19:12:21 UTC (rev 364048) +++ PKGBUILD2019-10-07 19:27:59 UTC (rev 364049) @@ -2,10 +2,10 @@ # Contributor: Andrea Scarpino pkgname=system-config-printer -pkgver=1.5.11 -pkgrel=4 +pkgver=1.5.12 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" -url="https://github.com/zdohnal/system-config-printer"; +url="https://github.com/OpenPrinting/system-config-printer"; arch=('x86_64') license=('GPL') depends=('python-pycups' 'python-dbus' 'python-pycurl' 'libnotify' @@ -14,16 +14,9 @@ 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') +source=(https://github.com/OpenPrinting/system-config-printer/releases/download/$pkgver/system-config-printer-${pkgver}.tar.xz) +sha256sums=('6b16717dfe1f64ada6ef9398dcab07b8b7c864f006588d03002e41b743cf1e14') -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../0001-Fix-constructing-the-auth-dialog.patch -} - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr \
[arch-commits] Commit in system-config-printer/trunk (2 files)
Date: Thursday, February 8, 2018 @ 16:05:00 Author: heftig Revision: 316244 1.5.11-2 Added: system-config-printer/trunk/0001-Fix-constructing-the-auth-dialog.patch Modified: system-config-printer/trunk/PKGBUILD -+ 0001-Fix-constructing-the-auth-dialog.patch | 32 ++ PKGBUILD| 13 -- 2 files changed, 42 insertions(+), 3 deletions(-) Added: 0001-Fix-constructing-the-auth-dialog.patch === --- 0001-Fix-constructing-the-auth-dialog.patch (rev 0) +++ 0001-Fix-constructing-the-auth-dialog.patch 2018-02-08 16:05:00 UTC (rev 316244) @@ -0,0 +1,32 @@ +From 2766d74a98e44693f5e966d541a6303b966c088b Mon Sep 17 00:00:00 2001 +Message-Id: <2766d74a98e44693f5e966d541a6303b966c088b.1518105780.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" +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 + Modified: PKGBUILD === --- PKGBUILD2018-02-08 15:11:19 UTC (rev 316243) +++ PKGBUILD2018-02-08 16:05:00 UTC (rev 316244) @@ -4,7 +4,7 @@ pkgname=system-config-printer pkgver=1.5.11 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="https://github.com/zdohnal/system-config-printer"; arch=('x86_64') @@ -15,9 +15,16 @@ 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) -sha256sums=('38ad78d117c30ddb8c6c008a91d1bc0fa2e854ec04ee2de5cdd12ab842c100d3') +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 \
[arch-commits] Commit in system-config-printer/trunk (2 files)
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 === --- PKGBUILD2018-02-01 17:12:41 UTC (rev 315728) +++ PKGBUILD2018-02-01 17:21:14 UTC (rev 315729) @@ -3,8 +3,8 @@ # Contributor: Andrea Scarpino 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 -# '4629AFE960EC20BEC12E3104B7C20D079491EA63') #Tim Waugh +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.0 +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)
[arch-commits] Commit in system-config-printer/trunk (2 files)
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 === --- PKGBUILD2017-01-27 06:59:48 UTC (rev 287572) +++ PKGBUILD2017-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 # '4629AFE960EC20BEC12E3104B7C20D079491EA63') #Tim Waugh 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.0 +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)
[arch-commits] Commit in system-config-printer/trunk (2 files)
Date: Monday, April 14, 2014 @ 19:50:08 Author: eric Revision: 210367 upgpkg: system-config-printer 1.4.4-1 Upstream update, Optimize python files (close FS#38762), Clean up depends (close FS#38612), Remove old replaces/conflicts arrays, Remove old patch Modified: system-config-printer/trunk/PKGBUILD Deleted: system-config-printer/trunk/40_scp-dbus-service-fix-dbus-signature-typo.patch ---+ 40_scp-dbus-service-fix-dbus-signature-typo.patch | 12 PKGBUILD | 28 ++-- 2 files changed, 14 insertions(+), 26 deletions(-) Deleted: 40_scp-dbus-service-fix-dbus-signature-typo.patch === --- 40_scp-dbus-service-fix-dbus-signature-typo.patch 2014-04-14 17:46:23 UTC (rev 210366) +++ 40_scp-dbus-service-fix-dbus-signature-typo.patch 2014-04-14 17:50:08 UTC (rev 210367) @@ -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.0 +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 - Modified: PKGBUILD === --- PKGBUILD2014-04-14 17:46:23 UTC (rev 210366) +++ PKGBUILD2014-04-14 17:50:08 UTC (rev 210367) @@ -3,28 +3,23 @@ # Contributor: Andrea Scarpino 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 @@ 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 {} + }
[arch-commits] Commit in system-config-printer/trunk (2 files)
Date: Wednesday, December 4, 2013 @ 21:14:23 Author: jgc Revision: 200770 upgpkg: system-config-printer 1.4.3-2 Fix type signature in scp-dbus-service.py (FS#38006) Added: system-config-printer/trunk/40_scp-dbus-service-fix-dbus-signature-typo.patch Modified: system-config-printer/trunk/PKGBUILD ---+ 40_scp-dbus-service-fix-dbus-signature-typo.patch | 12 PKGBUILD | 10 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) Added: 40_scp-dbus-service-fix-dbus-signature-typo.patch === --- 40_scp-dbus-service-fix-dbus-signature-typo.patch (rev 0) +++ 40_scp-dbus-service-fix-dbus-signature-typo.patch 2013-12-04 20:14:23 UTC (rev 200770) @@ -0,0 +1,12 @@ +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.0 +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 + Modified: PKGBUILD === --- PKGBUILD2013-12-04 20:10:59 UTC (rev 200769) +++ PKGBUILD2013-12-04 20:14:23 UTC (rev 200770) @@ -4,7 +4,7 @@ pkgname=system-config-printer pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/"; arch=('i686' 'x86_64') @@ -15,12 +15,16 @@ 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}) +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') + 'SKIP' + 'a616371aff9fae27b99d036c4143bf37') 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')
[arch-commits] Commit in system-config-printer/trunk (2 files)
Date: Friday, May 3, 2013 @ 08:08:21 Author: eric Revision: 184174 upgpkg: system-config-printer 1.4.0-1 Upstream update, Update depends, Remove old patch Modified: system-config-printer/trunk/PKGBUILD Deleted: system-config-printer/trunk/fix-typo-in-service.patch ---+ PKGBUILD | 25 +++-- fix-typo-in-service.patch | 18 -- 2 files changed, 11 insertions(+), 32 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-05-03 04:42:56 UTC (rev 184173) +++ PKGBUILD2013-05-03 06:08:21 UTC (rev 184174) @@ -3,35 +3,32 @@ # Contributor: Andrea Scarpino pkgname=system-config-printer -pkgver=1.3.12 -pkgrel=2 +pkgver=1.4.0 +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=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' - 'gnome-icon-theme' 'python2-notify') +depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' + 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' '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}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig} -'fix-typo-in-service.patch') -md5sums=('0775647e1c34ef25364de3c178a4ed36' - '1aa2246047b424e2d23473749368b8c6' - 'd30d14aeb6d2bfeac0679d28704473ec') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('3267c2eac454f470c0659034196d2668' + 'SKIP') -build() { +prepare() { cd ${pkgname}-${pkgver} - - # Fixed upstream - patch -p1 -i "${srcdir}"/fix-typo-in-service.patch - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer +} +build() { + cd ${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ Deleted: fix-typo-in-service.patch === --- fix-typo-in-service.patch 2013-05-03 04:42:56 UTC (rev 184173) +++ fix-typo-in-service.patch 2013-05-03 06:08:21 UTC (rev 184174) @@ -1,18 +0,0 @@ -From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 -From: Tim Waugh -Date: Tue, 23 Oct 2012 13:55:12 + -Subject: Fixed typo in systemd config file. - -diff --git a/udev/configure-prin...@.service.in b/udev/configure-prin...@.service.in -index 8a20967..5898c79 100644 a/udev/configure-prin...@.service.in -+++ b/udev/configure-prin...@.service.in -@@ -4,4 +4,4 @@ Requires=cups.socket - After=cups.socket - - [Service] --ExecStart=@udevhelperdir@/configure-printer add "%i" -+ExecStart=@udevhelperdir@/udev-configure-printer add "%i" --- -cgit v0.9.1
[arch-commits] Commit in system-config-printer/trunk (2 files)
Date: Wednesday, February 13, 2013 @ 14:30:30 Author: andrea Revision: 178007 upgpkg: system-config-printer 1.3.12-2 Fix typo in the systemd unit (FS#33834) Added: system-config-printer/trunk/fix-typo-in-service.patch Modified: system-config-printer/trunk/PKGBUILD ---+ PKGBUILD | 11 --- fix-typo-in-service.patch | 18 ++ 2 files changed, 26 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-02-13 12:35:32 UTC (rev 178006) +++ PKGBUILD2013-02-13 13:30:30 UTC (rev 178007) @@ -4,7 +4,7 @@ pkgname=system-config-printer pkgver=1.3.12 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/"; arch=('i686' 'x86_64') @@ -15,13 +15,18 @@ 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}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig} +'fix-typo-in-service.patch') md5sums=('0775647e1c34ef25364de3c178a4ed36' - '1aa2246047b424e2d23473749368b8c6') + '1aa2246047b424e2d23473749368b8c6' + 'd30d14aeb6d2bfeac0679d28704473ec') build() { cd ${pkgname}-${pkgver} + # Fixed upstream + patch -p1 -i "${srcdir}"/fix-typo-in-service.patch + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') Added: fix-typo-in-service.patch === --- fix-typo-in-service.patch (rev 0) +++ fix-typo-in-service.patch 2013-02-13 13:30:30 UTC (rev 178007) @@ -0,0 +1,18 @@ +From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 +From: Tim Waugh +Date: Tue, 23 Oct 2012 13:55:12 + +Subject: Fixed typo in systemd config file. + +--- +diff --git a/udev/configure-prin...@.service.in b/udev/configure-prin...@.service.in +index 8a20967..5898c79 100644 +--- a/udev/configure-prin...@.service.in b/udev/configure-prin...@.service.in +@@ -4,4 +4,4 @@ Requires=cups.socket + After=cups.socket + + [Service] +-ExecStart=@udevhelperdir@/configure-printer add "%i" ++ExecStart=@udevhelperdir@/udev-configure-printer add "%i" +-- +cgit v0.9.1