From d672d6d2f6617f3cb9ca1f94e475fbe5a34c988b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 8 Mar 2014 17:08:43 -0200 Subject: hplip-libre-3.14.1-2: fix deps for libusb, python2-pyqt4 FS#39128 => https://bugs.archlinux.org/task/39128 --- libre/hplip-libre/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libre/hplip-libre/PKGBUILD') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 4ed863e35..7db2fbf41 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204311 2014-01-17 09:00:06Z andyrtr $ +# $Id: PKGBUILD 206910 2014-03-05 19:15:57Z andyrtr $ # Maintainer: Tom Gundersen # Contributor : Rémy Oudompheng # Contributor: Morgan LEFIEUX @@ -7,14 +7,14 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.14.1 -pkgrel=1 +pkgrel=2 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' 'net-snmp>=5.7.1' 'wget') -makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') +makedepends=('python2-pyqt4' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusb') optdepends=('cups: for printing support' 'python2-dbus: for dbus support' 'sane: for scanner support' @@ -22,9 +22,9 @@ optdepends=('cups: for printing support' 'python2-notify: for Desktop notification support' 'python2-reportlab: for pdf output in hp-scan' 'rpcbind: for network support' - 'python2-pyqt: for running hp-toolbox' + 'python2-pyqt4: for running hp-toolbox' 'python2-gobject2: for running hp-toolbox' - 'libusbx: for advanced usb support') + 'libusb: for advanced usb support') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver @@ -33,7 +33,7 @@ source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,. disable_upgrade.patch) md5sums=('11eb45f3d3edf1f03887fd13afc61b51' 'SKIP' - 'a853ba0eb0883f4bcee00b4277128b29') + '257c8bfe675862d90f4ce07d3dff1d9f') prepare() { cd $_pkgname-$pkgver -- cgit v1.2.3-2-g168b From 2939a371e9eeb7fdf554c72ab317d23b7e04159a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 8 Mar 2014 17:15:17 -0200 Subject: hplip-libre: fix patch checksum --- libre/hplip-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre/hplip-libre/PKGBUILD') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 7db2fbf41..77d324667 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -33,7 +33,7 @@ source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,. disable_upgrade.patch) md5sums=('11eb45f3d3edf1f03887fd13afc61b51' 'SKIP' - '257c8bfe675862d90f4ce07d3dff1d9f') + 'a853ba0eb0883f4bcee00b4277128b29') prepare() { cd $_pkgname-$pkgver -- cgit v1.2.3-2-g168b From 9873b3668085d09d729f33923481f62b50671b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 14 Mar 2014 21:25:00 -0300 Subject: hplip-libre-3.14.1-2.1: removing printers not supported with free drivers from the database --- libre/hplip-libre/PKGBUILD | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'libre/hplip-libre/PKGBUILD') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 77d324667..b39575e9c 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -7,8 +7,8 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.14.1 -pkgrel=2 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)" +pkgrel=2.1 +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') @@ -37,6 +37,28 @@ md5sums=('11eb45f3d3edf1f03887fd13afc61b51' prepare() { cd $_pkgname-$pkgver + + echo "Removing printers not supported with free drivers from the database" + + # based on http://devel.trisquel.info/gitweb/?p=package-helpers.git;a=blob_plain;f=helpers/make-hplip;hb=refs/heads/toutatis revision 4 + # keep header license + sed '/\[/,99999d' data/models/models.dat > mktemp + + for model in $(grep '\[' data/models/models.dat | /bin/sed 's/\[//; s/\]//'); do + sed -n "/\[$model\]/,/^$/p;" data/models/models.dat > mktemp1 + grep '^download=True' -q mktemp1 && continue + grep '^plugin=1' -q mktemp1 && continue + grep '^support-type=0' -q mktemp1 && continue + cat mktemp1 >> mktemp + done + + sed -i 's/plugin=2/plugin=0/g' mktemp + + cp mktemp data/models/models.dat + + rm -v mktemp{,1} + + echo "Preparing source" export PYTHON=python2 -- cgit v1.2.3-2-g168b From 685ff4e485c5245c3275d5ef7bb1bd8aefea8a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 17 Mar 2014 22:27:35 -0300 Subject: hplip-libre-3.14.3-1: updating version --- libre/hplip-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre/hplip-libre/PKGBUILD') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index b39575e9c..c382d2661 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206910 2014-03-05 19:15:57Z andyrtr $ +# $Id: PKGBUILD 208088 2014-03-17 17:40:46Z andyrtr $ # Maintainer: Tom Gundersen # Contributor : Rémy Oudompheng # Contributor: Morgan LEFIEUX @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.14.1 -pkgrel=2.1 +pkgver=3.14.3 +pkgrel=1 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" @@ -31,7 +31,7 @@ provides=$_pkgname=$pkgver install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch) -md5sums=('11eb45f3d3edf1f03887fd13afc61b51' +md5sums=('a0ae59a75d202b92738dc24610b98428' 'SKIP' 'a853ba0eb0883f4bcee00b4277128b29') -- cgit v1.2.3-2-g168b From 5ecc336aa6e041453943b4d4abc32d87db83403c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 22 Mar 2014 16:03:04 -0300 Subject: hplip-libre-3.14.3-2: fix FS#39587 => https://bugs.archlinux.org/task/39587 --- libre/hplip-libre/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libre/hplip-libre/PKGBUILD') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index c382d2661..e23e00fa4 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 208088 2014-03-17 17:40:46Z andyrtr $ +# $Id: PKGBUILD 208337 2014-03-22 17:39:33Z andyrtr $ # Maintainer: Tom Gundersen # Contributor : Rémy Oudompheng # Contributor: Morgan LEFIEUX @@ -7,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.14.3 -pkgrel=1 +pkgrel=2 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" @@ -70,6 +70,7 @@ prepare() { sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + sed -i 's|/usr/bin/python|/usr/bin/python2|' data/rules/hplip-printer@.service # disable insecure update - https://bugs.archlinux.org/task/38083 patch -Np0 -i ${srcdir}/disable_upgrade.patch -- cgit v1.2.3-2-g168b