diff options
-rw-r--r-- | libre/hplip/PKGBUILD (renamed from libre/hplip-libre/PKGBUILD) | 20 | ||||
-rw-r--r-- | libre/hplip/cups-1.6-buildfix.diff (renamed from libre/hplip-libre/cups-1.6-buildfix.diff) | 0 | ||||
-rw-r--r-- | libre/hplip/disable_upgrade.patch (renamed from libre/hplip-libre/disable_upgrade.patch) | 0 | ||||
-rw-r--r-- | libre/hplip/hp-mkuri.patch (renamed from libre/hplip-libre/hp-mkuri.patch) | 0 | ||||
-rw-r--r-- | libre/hplip/hplip-CVE-2013-4325.patch (renamed from libre/hplip-libre/hplip-CVE-2013-4325.patch) | 0 | ||||
-rw-r--r-- | libre/hplip/hplip.install (renamed from libre/hplip-libre/hplip.install) | 0 | ||||
-rw-r--r-- | libre/hplip/hplip_typo.patch (renamed from libre/hplip-libre/hplip_typo.patch) | 0 |
7 files changed, 9 insertions, 11 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip/PKGBUILD index 5558c54cc..f4665872d 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -5,10 +5,9 @@ # Contributor (Arch): Morgan LEFIEUX <comete@archlinuxfr.org> # Maintainer: Jorge López <jorginho@lavabit.com> -_pkgname=hplip -pkgname=hplip-libre +pkgname=hplip pkgver=3.14.6 -pkgrel=1 +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' 'mips64el') url="http://hplipopensource.com" @@ -26,18 +25,17 @@ optdepends=('cups: for printing support' 'python2-pyqt4: for running GUI and hp-toolbox' 'python2-gobject2: for running hp-toolbox' 'libusb: for advanced usb support') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) install=hplip.install -source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch) md5sums=('ec14b3bf3ac17a7c00b96e51d4c38114' 'SKIP' 'a853ba0eb0883f4bcee00b4277128b29') prepare() { - cd $_pkgname-$pkgver + cd $pkgname-$pkgver echo "Removing printers not supported with free drivers from the database" @@ -92,7 +90,7 @@ prepare() { } build() { - cd $_pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr \ --enable-qt4 \ --disable-foomatic-rip-hplip-install \ @@ -110,8 +108,8 @@ build() { } package() { - #cd $_pkgname-$pkgver - cd $_pkgname-${pkgver/.a/a} + #cd $pkgname-$pkgver + cd $pkgname-${pkgver/.a/a} make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install # remove config provided by sane and autostart of hp-daemon diff --git a/libre/hplip-libre/cups-1.6-buildfix.diff b/libre/hplip/cups-1.6-buildfix.diff index 8341a1610..8341a1610 100644 --- a/libre/hplip-libre/cups-1.6-buildfix.diff +++ b/libre/hplip/cups-1.6-buildfix.diff diff --git a/libre/hplip-libre/disable_upgrade.patch b/libre/hplip/disable_upgrade.patch index 600d6ccc7..600d6ccc7 100644 --- a/libre/hplip-libre/disable_upgrade.patch +++ b/libre/hplip/disable_upgrade.patch diff --git a/libre/hplip-libre/hp-mkuri.patch b/libre/hplip/hp-mkuri.patch index 518e7608f..518e7608f 100644 --- a/libre/hplip-libre/hp-mkuri.patch +++ b/libre/hplip/hp-mkuri.patch diff --git a/libre/hplip-libre/hplip-CVE-2013-4325.patch b/libre/hplip/hplip-CVE-2013-4325.patch index 85bff893b..85bff893b 100644 --- a/libre/hplip-libre/hplip-CVE-2013-4325.patch +++ b/libre/hplip/hplip-CVE-2013-4325.patch diff --git a/libre/hplip-libre/hplip.install b/libre/hplip/hplip.install index 74532cde3..74532cde3 100644 --- a/libre/hplip-libre/hplip.install +++ b/libre/hplip/hplip.install diff --git a/libre/hplip-libre/hplip_typo.patch b/libre/hplip/hplip_typo.patch index 8d22f51ea..8d22f51ea 100644 --- a/libre/hplip-libre/hplip_typo.patch +++ b/libre/hplip/hplip_typo.patch |