diff options
author | root <root@rshg054.dnsready.net> | 2012-06-30 00:01:49 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-06-30 00:01:49 +0000 |
commit | ff31f6558b911e924318b059516075f6413c5d8b (patch) | |
tree | c60e837c5e5c8e10b9f367152621091c714e4ea7 /libre | |
parent | a9811800fb65ca331655a1bbe22e67e7564099f8 (diff) |
Sat Jun 30 00:01:49 UTC 2012
Diffstat (limited to 'libre')
-rw-r--r-- | libre/hplip-libre/PKGBUILD | 14 | ||||
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/linux-libre-tools/PKGBUILD | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index d8ce703b2..aa7dea706 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -2,12 +2,12 @@ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> -# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> +# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> _pkgname=hplip pkgname=hplip-libre pkgver=3.12.6 -pkgrel=2 +pkgrel=3 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" @@ -16,7 +16,7 @@ depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' 'net-snmp>=5.7.1') makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') optdepends=('cups: for printing support' - 'dbus-python: for dbus support' + 'python2-dbus: for dbus support' 'sane: for scanner support' 'python-imaging: for commandline scanning support' 'python-notify: for Desktop notification support' @@ -36,16 +36,16 @@ md5sums=('5303938e8630775ea6fb383af85775e5' build() { cd "$srcdir/$_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|' setup.py makeuri.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 ./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 - + # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip @@ -57,7 +57,7 @@ build() { gzip > ${i}.temp || return 1 mv ${i}.temp ${i} done - + export AUTOMAKE='automake --foreign' autoreconf --force --install diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8a407aee3..a54e9d948 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> @@ -15,7 +15,7 @@ _pgo=false # We're getting this from Debian Sid _debname=iceweasel _debver=13.0.1 -_debrel=1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -52,7 +52,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('9eb7668e4a5b5be63ccf4d43c212d011' - 'f3ac4e2f52965335ccf13588255e6db4' + 'c5eb6357cecd0d83e75ef37a9dcf3683' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 083cce961..def346093 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -28,9 +28,9 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '20870541e88109d2f153be3c58a277f1') build() { - cd "${srcdir}/linux-${_basekernel}" - + # apply stable patching set if [ "${_basekernel}" != "${pkgver}" ]; then + msg2 'Applying stable patch set' patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi |