Date: Monday, February 16, 2015 @ 19:19:39 Author: andyrtr Revision: 231614
upgpkg: hplip 3.15.2-3 use python-gobject; FS#43781 Modified: hplip/trunk/PKGBUILD ----------+ PKGBUILD | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-16 17:40:41 UTC (rev 231613) +++ PKGBUILD 2015-02-16 18:19:39 UTC (rev 231614) @@ -6,22 +6,21 @@ pkgname=hplip pkgver=3.15.2 -pkgrel=2 +pkgrel=3 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') depends=('python' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine') -makedepends=('python-pyqt4' 'python-gobject2' 'sane' 'rpcbind' 'cups' 'libusb') +makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb') optdepends=('cups: for printing support' 'python-dbus: for dbus support' 'sane: for scanner support' 'python-pillow: for commandline scanning support' - #'python2-notify: for Desktop notification support' 'python-reportlab: for pdf output in hp-scan' 'rpcbind: for network support' 'python-pyqt4: for running GUI and hp-toolbox' - 'python-gobject2: for running hp-toolbox' + 'python-gobject: for running hp-toolbox' 'hplip-plugin: binary blobs for specific devices (AUR) or run hp-setup to download the plugin' 'libusb: for advanced usb support') install=hplip.install @@ -35,18 +34,6 @@ prepare() { cd $pkgname-$pkgver -# 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|' 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 -# 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