diff options
Diffstat (limited to 'libre/hplip-libre')
| -rw-r--r-- | libre/hplip-libre/PKGBUILD | 37 | ||||
| -rw-r--r-- | libre/hplip-libre/hp-mkuri.patch | 11 |
2 files changed, 33 insertions, 15 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 069fa612d..21ab61b28 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $ +# $Id: PKGBUILD 182674 2013-04-12 14:26:14Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,9 +6,9 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.11 -pkgrel=2 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" +pkgver=3.13.4 +pkgrel=1 +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" license=('GPL') @@ -24,13 +24,18 @@ optdepends=('cups: for printing support' 'python2-pyqt: for running hp-toolbox' 'python2-gobject2: for running hp-toolbox' 'libusbx: for advanced usb support') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} - cups-1.6-buildfix.diff) + cups-1.6-buildfix.diff + hp-mkuri.patch) +md5sums=('e5c247161e2fd7685e0520e968393d19' + 'SKIP' + 'ef64578c6cb3ce252dbdcb0f1c2f4a47' + '0bd7779fdbc4d7a9386df04dce2cb8d4') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -38,10 +43,13 @@ build() { # fix build with cups 1.6 - FC hplip-ipp-accessors.patch patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff" + # fix linking libnotify, FS#34283 + patch -Np0 -i ${srcdir}/hp-mkuri.patch + export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.py base/magic.py sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py sed -i 's|python ./print.py|python2 ./print.py|' scan.py sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py @@ -49,9 +57,6 @@ build() { sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - # fix rc script path - FS#31921 - sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py - # 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 @@ -92,7 +97,9 @@ package() { rm -rf "$pkgdir"/usr/share/hal # log dir should not be world writeable 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 } -md5sums=('6caadc4a9e49076c284b146e2dce2937' - '835d3b854d097f229a32291338fa2320' - 'ef64578c6cb3ce252dbdcb0f1c2f4a47') diff --git a/libre/hplip-libre/hp-mkuri.patch b/libre/hplip-libre/hp-mkuri.patch new file mode 100644 index 000000000..518e7608f --- /dev/null +++ b/libre/hplip-libre/hp-mkuri.patch @@ -0,0 +1,11 @@ +--- io/hpmud/hp-mkuri.c.orig 2013-03-17 09:15:15.360624061 -0400 ++++ io/hpmud/hp-mkuri.c 2013-03-17 09:15:30.924316847 -0400 +@@ -266,7 +266,7 @@ + + /* Bypass glib build dependencies by loading libnotify manually. */ + +- if ((handle = load_library("libnotify.so.1")) == NULL) ++ if ((handle = load_library("libnotify.so.4")) == NULL) + { + BUG("failed to open libnotify: %m\n"); + goto bugout; |