diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/hplip/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/hplip/hplip.install | 18 |
2 files changed, 8 insertions, 23 deletions
diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD index 24a482752..493b9f192 100644 --- a/libre/hplip/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 267183 2016-05-07 12:47:54Z andyrtr $ +# $Id: PKGBUILD 268066 2016-05-15 15:50:56Z andyrtr $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer (Arch): Tom Gundersen <teg@jklm.no> # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org> @@ -9,13 +9,13 @@ pkgname=hplip pkgver=3.16.5 -pkgrel=1.parabola1 +pkgrel=3.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') url="http://hplipopensource.com" license=('GPL') depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine') -makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb') +makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb') optdepends=('cups: for printing support' 'sane: for scanner support' 'xsane: sane scanner frontend' @@ -27,7 +27,7 @@ optdepends=('cups: for printing support' 'libusb: for advanced usb support') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -install=hplip.install +backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio') source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch) sha1sums=('59264a6668ab37871fd007fcee70d4932f11f9d7' @@ -84,7 +84,8 @@ prepare() { build() { cd $pkgname-$pkgver ./configure --prefix=/usr \ - --enable-qt4 \ + --enable-qt5 \ + --disable-qt4 \ --disable-foomatic-rip-hplip-install \ --enable-foomatic-ppd-install \ --enable-hpcups-install \ @@ -103,6 +104,8 @@ package() { # remove config provided by sane and autostart of hp-daemon rm -rf "$pkgdir"/etc/{sane.d,xdg} + install -dm755 ${pkgdir}/etc/sane.d/dll.d + echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio # remove HAL .fdi file because HAL is no longer used rm -vrf "$pkgdir"/usr/share/hal diff --git a/libre/hplip/hplip.install b/libre/hplip/hplip.install deleted file mode 100644 index 74532cde3..000000000 --- a/libre/hplip/hplip.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - cat << EOF - -NOTE ----- -# If you want to use this driver with sane: -# echo "hpaio" >> /etc/sane.d/dll.conf - -EOF -} - -post_upgrade() { - if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then - # important upgrade notice - echo "> Please remove your printer in cups, then add it" - echo "> back and reconfigure it to make it work again!" - fi -} |