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

[Andreas Radke]

    Date: Wednesday, August 31, 2016 @ 19:27:03
  Author: andyrtr
Revision: 275630

upgpkg: hplip 3.16.8-2

fix tabs breaking python - FS#50588

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

----------------+
 PKGBUILD       |   11 ++++++++---
 fix_tabs.patch |   17 +++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-31 19:26:56 UTC (rev 275629)
+++ PKGBUILD	2016-08-31 19:27:03 UTC (rev 275630)
@@ -6,7 +6,7 @@
 
 pkgname=hplip
 pkgver=3.16.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -25,10 +25,12 @@
             'libusb: for advanced usb support')
 backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
 source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-        disable_upgrade.patch)
+        disable_upgrade.patch
+        fix_tabs.patch)
 sha1sums=('0331d810702983e15c3a3b8cfe48d262fa23aac5'
           'SKIP'
-          '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+          '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
+          'bd18428ff1e378aa0a299331607eaed82021e34b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
 prepare() {
@@ -37,6 +39,9 @@
  # disable insecure update - https://bugs.archlinux.org/task/38083
  patch -Np0 -i ${srcdir}/disable_upgrade.patch
  
+ # fix tabs breaking printing; FS#50588
+ patch -Np0 -i ${srcdir}/fix_tabs.patch
+
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
  # The hpcups driver does not use foomatic-rip

Added: fix_tabs.patch
===================================================================
--- fix_tabs.patch	                        (rev 0)
+++ fix_tabs.patch	2016-08-31 19:27:03 UTC (rev 275630)
@@ -0,0 +1,17 @@
+--- prnt/filters/hpps	2016-08-26 12:04:29.000000000 +0200
++++ prnt/filters/hpps.new	2016-08-31 21:19:57.868640372 +0200
+@@ -191,11 +191,11 @@
+             msg("Setting Pin to default")
+     else:
+         szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']                                 
+-	for x in szKeyInitials:
++    for x in szKeyInitials:
+            try:
+-	        secpin += opts[x]
++            secpin += opts[x]
+            except KeyError:
+-	        secpin += '0'
++            secpin += '0'
+ 
+     os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
+