diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-04 23:14:34 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-04 23:14:34 +0000 |
| commit | 7e5cd77730015792e26338edcc137acf3f1bd2ae (patch) | |
| tree | 7e8d59d2d1f570618635d8136647e0903f03bc0b /extra/system-config-printer | |
| parent | 8c2359e2541f9d1b11443b49d8ea502b3ffea39c (diff) | |
Thu Aug 4 23:14:34 UTC 2011
Diffstat (limited to 'extra/system-config-printer')
| -rw-r--r-- | extra/system-config-printer/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/system-config-printer/no-packagekit.patch | 36 |
2 files changed, 44 insertions, 4 deletions
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index c36f18834..2976a0be4 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 134084 2011-08-01 10:53:11Z andrea $ +# $Id: PKGBUILD 134387 2011-08-03 14:53:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.5 -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') license=('GPL') makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') -source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz") -md5sums=('9d806643f17dc65a492a1d4e8a60f2ec') +source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz" + 'no-packagekit.patch') +md5sums=('9d806643f17dc65a492a1d4e8a60f2ec' + 'e70a274c3cced39db1668e2a748e068f') build() { cd "${srcdir}"/${pkgbase}-${pkgver} + + patch -p1 -i "${srcdir}"/no-packagekit.patch sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ diff --git a/extra/system-config-printer/no-packagekit.patch b/extra/system-config-printer/no-packagekit.patch new file mode 100644 index 000000000..8482ad823 --- /dev/null +++ b/extra/system-config-printer/no-packagekit.patch @@ -0,0 +1,36 @@ +--- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01 10:47:11.614519332 +0100 ++++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02 15:45:33.807623959 +0100 +@@ -21,7 +21,6 @@ + + import cups, pprint, os, tempfile, re, string + import locale +-import packagekit.client, packagekit.enums + from . import _debugprint + + class Printer: +@@ -829,24 +828,7 @@ + missing executables + """ + executables = missingExecutables(ppd) +- packages = [] +- if executables: +- unresolved_executables = [] +- client = packagekit.client.PackageKitClient () +- for executable in executables: +- if not executable.startswith ("/"): +- executable = "/usr/bin/" + executable +- +- result = client.search_file ([executable], +- packagekit.enums.FILTER_NOT_INSTALLED) +- if result: +- packages.extend (set (map (lambda x: x.name, result))) +- else: +- unresolved_executables.append (executable) +- +- executables = unresolved_executables +- +- return (packages, executables) ++ return ([], executables) + + def _main(): + c = cups.Connection() |