[arch-commits] Commit in hplip/trunk (PKGBUILD python.patch)

[Andreas Radke]

    Date: Wednesday, August 8, 2018 @ 19:58:47
  Author: andyrtr
Revision: 331262

upgpkg: hplip 3.18.7-3

fix python error - FS#59548; add custom license file to cover all various licenses

Added:
  hplip/trunk/python.patch
Modified:
  hplip/trunk/PKGBUILD

--------------+
 PKGBUILD     |   15 +++++++++++----
 python.patch |   11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-08 19:38:50 UTC (rev 331261)
+++ PKGBUILD	2018-08-08 19:58:47 UTC (rev 331262)
@@ -6,11 +6,11 @@
 
 pkgname=hplip
 pkgver=3.18.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
 url="http://hplipopensource.com"
-license=('GPL')
+license=('GPL2' 'custom')
 depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
 makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
 optdepends=('cups: for printing support'
@@ -29,13 +29,15 @@
         disable_upgrade.patch
         0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
         0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
-        fix_install.patch)
+        fix_install.patch
+        python.patch)
 sha1sums=('bb40807ac77fb9b1f6d80a53d5409a22f5d2d197'
           'SKIP'
           '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
           '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5'
           '0e36f31b98faf2f14137431bc8f82b74de22705b'
-          '759de18bfef699ac2f605962dafee1431e7b5e3b')
+          '759de18bfef699ac2f605962dafee1431e7b5e3b'
+          '72db2c60f63c9be2a98a46ec4bcccd3a8a5b935b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
 prepare() {
@@ -50,6 +52,8 @@
  patch -Np1 -i ${srcdir}/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
  # fix installation of missing library - FS#59548
  patch -Np1 -i ${srcdir}/fix_install.patch
+ # fix python issue - FS#59548
+ patch -Np1 -i ${srcdir}/python.patch
 
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
@@ -80,4 +84,7 @@
  
  # remove rc script
  rm -vrf "$pkgdir"/etc/init.d
+
+ # add mixed license file
+ install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 COPYING
 }

Added: python.patch
===================================================================
--- python.patch	                        (rev 0)
+++ python.patch	2018-08-08 19:58:47 UTC (rev 331262)
@@ -0,0 +1,11 @@
+--- hplip-3.18.7/base/utils.py	2018-07-15 22:08:37.000000000 +0200
++++ hplip-3.18.7/base/utils.py.new	2018-08-08 21:46:48.721947940 +0200
+@@ -265,7 +265,7 @@
+     try:
+         names = os.listdir(root)
+     except os.error:
+-        raise StopIteration
++        return
+ 
+     pattern = pattern or '*'
+     pat_list = pattern.split(';')