From 306517cf5ee87913d4493cb3de8b77a5ab84c3a0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sun, 19 May 2013 16:49:52 -0300
Subject: hplip-libre-3.13.5-2: fix script typo

---
 libre/hplip-libre/PKGBUILD         | 13 +++++++++----
 libre/hplip-libre/hplip_typo.patch | 11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 libre/hplip-libre/hplip_typo.patch

(limited to 'libre')

diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 0d0e04e21..2623328ac 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185761 2013-05-18 14:38:33Z andyrtr $
+# $Id: PKGBUILD 185808 2013-05-19 10:16:28Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -7,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.13.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -31,11 +31,13 @@ options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
         cups-1.6-buildfix.diff
-        hp-mkuri.patch)
+        hp-mkuri.patch
+        hplip_typo.patch)
 md5sums=('f0c406f06f191a120f7d283b69ff10e8'
          'SKIP'
          'ef64578c6cb3ce252dbdcb0f1c2f4a47'
-         '0bd7779fdbc4d7a9386df04dce2cb8d4')
+         '0bd7779fdbc4d7a9386df04dce2cb8d4'
+         'b3dd33a538ed8a3774f3c22f13e0a549')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
@@ -45,6 +47,9 @@ build() {
  
  # fix linking libnotify, FS#34283
  patch -Np0 -i ${srcdir}/hp-mkuri.patch
+
+ # fix typo preventing FW to load
+ patch -Np0 -i ${srcdir}/hplip_typo.patch
  
  export PYTHON=python2
  
diff --git a/libre/hplip-libre/hplip_typo.patch b/libre/hplip-libre/hplip_typo.patch
new file mode 100644
index 000000000..8d22f51ea
--- /dev/null
+++ b/libre/hplip-libre/hplip_typo.patch
@@ -0,0 +1,11 @@
+--- config_usb_printer.py	2013-05-19 02:23:17.506716304 +0300
++++ config_usb_printer.py.new	2013-05-19 02:23:30.140049848 +0300
+@@ -257,7 +257,7 @@
+        # ******************************* RUNNING FIRMWARE DOWNLOAD TO DEVICE FOR SUPPORTED PRINTER'S
+        fw_download_req = mq.get('fw-download', False)
+        if fw_download_req:
+-           fw_cmd = utlis.which('hp-firmware', True)
++           fw_cmd = utils.which('hp-firmware', True)
+            if fw_cmd:
+                 fw_cmd += " -y3 -s %s"%param
+                 log.debug(fw_cmd)
-- 
cgit v1.2.3