diff options
| -rw-r--r-- | libre/hplip/PKGBUILD | 24 | ||||
| -rw-r--r-- | libre/hplip/fix_tabs.patch | 17 |
2 files changed, 10 insertions, 31 deletions
diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD index 9a65a1339..80902d2a6 100644 --- a/libre/hplip/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -8,8 +8,8 @@ # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=hplip -pkgver=3.16.11 -pkgrel=2.parabola1 +pkgver=3.17.4 +pkgrel=1.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" @@ -31,12 +31,10 @@ conflicts=(${pkgname}-libre) 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' '4ef1b506ff5930ab841945ae9178f28fca1997ad' - 'bd18428ff1e378aa0a299331607eaed82021e34b' '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com> @@ -47,7 +45,7 @@ prepare() { # based on https://devel.trisquel.info/trisquel/package-helpers/raw/master/helpers/make-hplip # keep header license - sed '/\[/,99999d' data/models/models.dat > mktemp + sed '/\[/,99999d' data/models/models.dat > mktemp for model in $(grep '\[' data/models/models.dat | sed 's/\[//; s/\]//'); do sed -n "/\[$model\]/,/^$/p;" data/models/models.dat > mktemp1 @@ -67,12 +65,10 @@ prepare() { sed -i 's/\, requires proprietary plugin//' $(grep -rlI '[,] requires proprietary plugin') echo "Preparing source" - + # 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 @@ -86,7 +82,7 @@ prepare() { gzip > ${i}.temp || return 1 mv ${i}.temp ${i} done - + export AUTOMAKE='automake --foreign' autoreconf --force --install } @@ -111,15 +107,15 @@ build() { package() { cd $pkgname-$pkgver make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install - + # remove config provided by sane and autostart of hp-daemon rm -rf "$pkgdir"/etc/{sane.d,xdg} install -dm755 ${pkgdir}/etc/sane.d/dll.d echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio - + # remove HAL .fdi file because HAL is no longer used rm -vrf "$pkgdir"/usr/share/hal - + # remove rc script rm -vrf "$pkgdir"/etc/init.d } diff --git a/libre/hplip/fix_tabs.patch b/libre/hplip/fix_tabs.patch deleted file mode 100644 index 1552933df..000000000 --- a/libre/hplip/fix_tabs.patch +++ /dev/null @@ -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)) - |