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

[Andreas Radke]

    Date: Thursday, April 20, 2017 @ 14:57:56
  Author: andyrtr
Revision: 293534

upgpkg: hplip 3.17.4-1

upstream update 3.17.4

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-20 14:45:59 UTC (rev 293533)
+++ PKGBUILD	2017-04-20 14:57:56 UTC (rev 293534)
@@ -5,8 +5,8 @@
 # Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.16.11
-pkgrel=3
+pkgver=3.17.4
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -27,12 +27,10 @@
 backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
 source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
         disable_upgrade.patch
-        fix_tabs.patch
         0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
-sha1sums=('177252a6c3e508b6d4f9d02663fe3556f37de71e'
+sha1sums=('c8ab39e616964c7342320a0d45f729fe7d7dd402'
           'SKIP'
           '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
-          'bd18428ff1e378aa0a299331607eaed82021e34b'
           '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
@@ -42,8 +40,6 @@
  # 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
  # add missing 'include <cups/ppd.h>' at various places
  patch -Np1 -i ${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 

Deleted: fix_tabs.patch
===================================================================
--- fix_tabs.patch	2017-04-20 14:45:59 UTC (rev 293533)
+++ fix_tabs.patch	2017-04-20 14:57:56 UTC (rev 293534)
@@ -1,17 +0,0 @@
---- 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))
-