[arch-commits] Commit in hplip/repos (8 files)

Andreas Radke andyrtr at nymeria.archlinux.org
Thu Jun 27 14:29:58 UTC 2013


    Date: Thursday, June 27, 2013 @ 16:29:57
  Author: andyrtr
Revision: 188977

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
    (from rev 188976, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hp-mkuri.patch
    (from rev 188976, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-i686/hplip.install
    (from rev 188976, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
    (from rev 188976, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hp-mkuri.patch
    (from rev 188976, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-x86_64/hplip.install
    (from rev 188976, hplip/trunk/hplip.install)

-------------------------------+
 testing-i686/PKGBUILD         |   93 ++++++++++++++++++++++++++++++++++++++++
 testing-i686/hp-mkuri.patch   |   11 ++++
 testing-i686/hplip.install    |   18 +++++++
 testing-x86_64/PKGBUILD       |   93 ++++++++++++++++++++++++++++++++++++++++
 testing-x86_64/hp-mkuri.patch |   11 ++++
 testing-x86_64/hplip.install  |   18 +++++++
 6 files changed, 244 insertions(+)

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 188976, hplip/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2013-06-27 14:29:57 UTC (rev 188977)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor : Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.13.6
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+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')
+optdepends=('cups: for printing support'
+            'python2-dbus: for dbus support'
+            'sane: for scanner support'
+            'python2-imaging: for commandline scanning support'
+            'python2-notify: for Desktop notification support'
+            'rpcbind: for network support'
+            'python2-pyqt: for running hp-toolbox'
+            'python2-gobject2: for running hp-toolbox'
+            'hplip-plugin: binary blobs for specific devices'
+            'libusbx: for advanced usb support')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+        hp-mkuri.patch)
+md5sums=('3dd5052864052b8cd4ce013bb71f4d6c'
+         'SKIP'
+         '0bd7779fdbc4d7a9386df04dce2cb8d4')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
+ 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
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || return 1
+		mv ${i}.temp ${i}
+	done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+             --enable-qt4 \
+             --disable-foomatic-rip-hplip-install \
+             --enable-foomatic-ppd-install \
+             --enable-hpcups-install \
+             --enable-new-hpcups \
+             --enable-cups-ppd-install \
+             --enable-cups-drv-install \
+             --enable-hpijs-install \
+             --enable-foomatic-drv-install \
+             --enable-pp-build \
+             --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove rc script
+ rm -rf "$pkgdir"/etc/init.d
+}

Copied: hplip/repos/testing-i686/hp-mkuri.patch (from rev 188976, hplip/trunk/hp-mkuri.patch)
===================================================================
--- testing-i686/hp-mkuri.patch	                        (rev 0)
+++ testing-i686/hp-mkuri.patch	2013-06-27 14:29:57 UTC (rev 188977)
@@ -0,0 +1,11 @@
+--- io/hpmud/hp-mkuri.c.orig	2013-03-17 09:15:15.360624061 -0400
++++ io/hpmud/hp-mkuri.c	2013-03-17 09:15:30.924316847 -0400
+@@ -266,7 +266,7 @@
+ 
+     /* Bypass glib build dependencies by loading libnotify manually. */  
+ 
+-    if ((handle = load_library("libnotify.so.1")) == NULL)
++    if ((handle = load_library("libnotify.so.4")) == NULL)
+     {
+        BUG("failed to open libnotify: %m\n");
+        goto bugout;

Copied: hplip/repos/testing-i686/hplip.install (from rev 188976, hplip/trunk/hplip.install)
===================================================================
--- testing-i686/hplip.install	                        (rev 0)
+++ testing-i686/hplip.install	2013-06-27 14:29:57 UTC (rev 188977)
@@ -0,0 +1,18 @@
+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
+}

Copied: hplip/repos/testing-x86_64/PKGBUILD (from rev 188976, hplip/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2013-06-27 14:29:57 UTC (rev 188977)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor : Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.13.6
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+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')
+optdepends=('cups: for printing support'
+            'python2-dbus: for dbus support'
+            'sane: for scanner support'
+            'python2-imaging: for commandline scanning support'
+            'python2-notify: for Desktop notification support'
+            'rpcbind: for network support'
+            'python2-pyqt: for running hp-toolbox'
+            'python2-gobject2: for running hp-toolbox'
+            'hplip-plugin: binary blobs for specific devices'
+            'libusbx: for advanced usb support')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+        hp-mkuri.patch)
+md5sums=('3dd5052864052b8cd4ce013bb71f4d6c'
+         'SKIP'
+         '0bd7779fdbc4d7a9386df04dce2cb8d4')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
+ 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
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || return 1
+		mv ${i}.temp ${i}
+	done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+             --enable-qt4 \
+             --disable-foomatic-rip-hplip-install \
+             --enable-foomatic-ppd-install \
+             --enable-hpcups-install \
+             --enable-new-hpcups \
+             --enable-cups-ppd-install \
+             --enable-cups-drv-install \
+             --enable-hpijs-install \
+             --enable-foomatic-drv-install \
+             --enable-pp-build \
+             --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove rc script
+ rm -rf "$pkgdir"/etc/init.d
+}

Copied: hplip/repos/testing-x86_64/hp-mkuri.patch (from rev 188976, hplip/trunk/hp-mkuri.patch)
===================================================================
--- testing-x86_64/hp-mkuri.patch	                        (rev 0)
+++ testing-x86_64/hp-mkuri.patch	2013-06-27 14:29:57 UTC (rev 188977)
@@ -0,0 +1,11 @@
+--- io/hpmud/hp-mkuri.c.orig	2013-03-17 09:15:15.360624061 -0400
++++ io/hpmud/hp-mkuri.c	2013-03-17 09:15:30.924316847 -0400
+@@ -266,7 +266,7 @@
+ 
+     /* Bypass glib build dependencies by loading libnotify manually. */  
+ 
+-    if ((handle = load_library("libnotify.so.1")) == NULL)
++    if ((handle = load_library("libnotify.so.4")) == NULL)
+     {
+        BUG("failed to open libnotify: %m\n");
+        goto bugout;

Copied: hplip/repos/testing-x86_64/hplip.install (from rev 188976, hplip/trunk/hplip.install)
===================================================================
--- testing-x86_64/hplip.install	                        (rev 0)
+++ testing-x86_64/hplip.install	2013-06-27 14:29:57 UTC (rev 188977)
@@ -0,0 +1,18 @@
+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
+}




More information about the arch-commits mailing list