diff options
Diffstat (limited to 'libre/hplip-libre')
| -rw-r--r-- | libre/hplip-libre/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/hplip-libre/hp-mkuri.patch | 11 |
2 files changed, 24 insertions, 8 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 30a1b6f05..21ab61b28 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180013 2013-03-14 18:45:58Z andyrtr $ +# $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.13.3 -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') @@ -30,10 +30,12 @@ provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} - cups-1.6-buildfix.diff) -md5sums=('4a378cc08f7a4f131968c0966c1ceb8c' - 'f37ad6d95a36d7547a2c60374fc4d1ec' - 'ef64578c6cb3ce252dbdcb0f1c2f4a47') + cups-1.6-buildfix.diff + hp-mkuri.patch) +md5sums=('e5c247161e2fd7685e0520e968393d19' + 'SKIP' + 'ef64578c6cb3ce252dbdcb0f1c2f4a47' + '0bd7779fdbc4d7a9386df04dce2cb8d4') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -41,6 +43,9 @@ 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~' {} + 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; |