diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
| commit | cebf33d7109e0157a80f34d6136e212f0a28d274 (patch) | |
| tree | a6464302c970f72581105b50ff0896e1f56def3d /libre/hplip-libre | |
| parent | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (diff) | |
| parent | 5cb95ceee39e4691f768ea2fef60b8a106e92209 (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'libre/hplip-libre')
| -rw-r--r-- | libre/hplip-libre/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/hplip-libre/hplip_typo.patch | 11 |
2 files changed, 22 insertions, 9 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index b51d1c6d8..2503fe028 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182674 2013-04-12 14:26:14Z 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> @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.4 -pkgrel=1 +pkgver=3.13.5 +pkgrel=2 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64' 'mips64el') 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) -md5sums=('e5c247161e2fd7685e0520e968393d19' + 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 @@ -99,7 +104,4 @@ package() { chmod 775 "$pkgdir"/var/log/hp{,/tmp} # remove rc script rm -rf "$pkgdir"/etc/init.d - - # fix broken udev rule - FS#34282 - sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules } 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) |