From 363243fe9c9a87d9647ed395dfb10f5f5509c1a2 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 2 Sep 2016 03:14:48 -0300
Subject: hplip-3.16.8-2.parabola1: fix tabs breaking python - FS#50588 ->
 https://bugs.archlinux.org/task/50588

---
 libre/hplip/PKGBUILD       | 13 +++++++++----
 libre/hplip/fix_tabs.patch | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 libre/hplip/fix_tabs.patch

(limited to 'libre/hplip')

diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD
index 4fa49ab5e..80e49a6cf 100644
--- a/libre/hplip/PKGBUILD
+++ b/libre/hplip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 274825 2016-08-29 19:22:46Z andyrtr $
+# $Id: PKGBUILD 275630 2016-08-31 19:27:03Z andyrtr $
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org>
@@ -9,7 +9,7 @@
 
 pkgname=hplip
 pkgver=3.16.8
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://hplipopensource.com"
@@ -29,10 +29,12 @@ replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
 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'
-          '4ef1b506ff5930ab841945ae9178f28fca1997ad')
+          '4ef1b506ff5930ab841945ae9178f28fca1997ad'
+          'bd18428ff1e378aa0a299331607eaed82021e34b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com>
 
 prepare() {
@@ -66,6 +68,9 @@ prepare() {
  # 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
diff --git a/libre/hplip/fix_tabs.patch b/libre/hplip/fix_tabs.patch
new file mode 100644
index 000000000..1552933df
--- /dev/null
+++ b/libre/hplip/fix_tabs.patch
@@ -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))
+ 
-- 
cgit v1.2.3