[arch-commits] Commit in system-config-printer/trunk (PKGBUILD no-packagekit.patch)

[Andrea Scarpino]

    Date: Wednesday, August 3, 2011 @ 10:53:04
  Author: andrea
Revision: 134387

upgpkg: system-config-printer 1.3.5-2
remove packagekit support (FS#25363)

Added:
  system-config-printer/trunk/no-packagekit.patch
Modified:
  system-config-printer/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 no-packagekit.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-03 14:41:00 UTC (rev 134386)
+++ PKGBUILD	2011-08-03 14:53:04 UTC (rev 134387)
@@ -5,17 +5,21 @@
 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|" \

Added: no-packagekit.patch
===================================================================
--- no-packagekit.patch	                        (rev 0)
+++ no-packagekit.patch	2011-08-03 14:53:04 UTC (rev 134387)
@@ -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()