Date: Sunday, November 6, 2016 @ 09:09:29
Author: andyrtr
Revision: 279879
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hplip/repos/extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 279878,
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
hplip/repos/extra-i686/PKGBUILD
(from rev 279878, hplip/trunk/PKGBUILD)
hplip/repos/extra-i686/disable_upgrade.patch
(from rev 279878, hplip/trunk/disable_upgrade.patch)
hplip/repos/extra-i686/fix_tabs.patch
(from rev 279878, hplip/trunk/fix_tabs.patch)
hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 279878,
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
hplip/repos/extra-x86_64/PKGBUILD
(from rev 279878, hplip/trunk/PKGBUILD)
hplip/repos/extra-x86_64/disable_upgrade.patch
(from rev 279878, hplip/trunk/disable_upgrade.patch)
hplip/repos/extra-x86_64/fix_tabs.patch
(from rev 279878, hplip/trunk/fix_tabs.patch)
Deleted:
hplip/repos/extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
hplip/repos/extra-i686/PKGBUILD
hplip/repos/extra-i686/disable_upgrade.patch
hplip/repos/extra-i686/fix_tabs.patch
hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
hplip/repos/extra-x86_64/PKGBUILD
hplip/repos/extra-x86_64/disable_upgrade.patch
hplip/repos/extra-x86_64/fix_tabs.patch
------------------------------------------------------------------------------+
/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch |
100 +++++
/PKGBUILD |
192 ++++++++++
/disable_upgrade.patch |
28 +
/fix_tabs.patch |
34 +
extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch |
50 --
extra-i686/PKGBUILD |
95 ----
extra-i686/disable_upgrade.patch |
14
extra-i686/fix_tabs.patch |
17
extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch |
50 --
extra-x86_64/PKGBUILD |
95 ----
extra-x86_64/disable_upgrade.patch |
14
extra-x86_64/fix_tabs.patch |
17
12 files changed, 354 insertions(+), 352 deletions(-)
Deleted:
extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
===================================================================
--- extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2016-11-06 09:09:08 UTC (rev 279878)
+++ extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,50 +0,0 @@
-From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppe...@canonical.com>
-Date: Sat, 24 Sep 2016 10:37:20 +0200
-Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
- definitions to ppd.h
-
----
- configure.in | 2 +-
- prnt/hpcups/HPCupsFilter.h | 2 ++
- prnt/hpijs/hpcupsfax.cpp | 1 +
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index d3a1ddb..eabe14a 100755
---- a/configure.in
-+++ b/configure.in
-@@ -554,7 +554,7 @@ fi
-
- if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
- AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"],
[AC_MSG_ERROR([cannot find libcups support], 9)])
-- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel
support], 3)])
-+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find
cups-devel support], 3)])
- if test "$libusb01_build" = "yes"; then
- AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot
find libusb support], 2)])
- AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel
support], 11)])
-diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
-index ff5548e..c517989 100644
---- a/prnt/hpcups/HPCupsFilter.h
-+++ b/prnt/hpcups/HPCupsFilter.h
-@@ -38,6 +38,8 @@
-
- #include "dbuscomm.h"
-
-+#include <cups/ppd.h>
-+
- #define DBITMAPFILEHEADER 14
- #define DBITMAPINFOHEADER 40
-
-diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
-index 8514775..994e50f 100644
---- a/prnt/hpijs/hpcupsfax.cpp
-+++ b/prnt/hpijs/hpcupsfax.cpp
-@@ -43,6 +43,7 @@
- #include <arpa/inet.h>
- #include <math.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <cups/raster.h>
- #include <string>
- #ifdef FALSE
Copied:
hplip/repos/extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 279878,
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===================================================================
--- extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(rev 0)
+++ extra-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppe...@canonical.com>
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
++++ b/configure.in
+@@ -554,7 +554,7 @@ fi
+
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+ AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"],
[AC_MSG_ERROR([cannot find libcups support], 9)])
+- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel
support], 3)])
++ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find
cups-devel support], 3)])
+ if test "$libusb01_build" = "yes"; then
+ AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot
find libusb support], 2)])
+ AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
++++ b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+
+ #include "dbuscomm.h"
+
++#include <cups/ppd.h>
++
+ #define DBITMAPFILEHEADER 14
+ #define DBITMAPINFOHEADER 40
+
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
++++ b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include <arpa/inet.h>
+ #include <math.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <cups/raster.h>
+ #include <string>
+ #ifdef FALSE
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-11-06 09:09:08 UTC (rev 279878)
+++ extra-i686/PKGBUILD 2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-# Maintainer: Tom Gundersen <t...@jklm.no>
-# Contributor : Rémy Oudompheng <r...@archlinux.org>
-# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.16.10
-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=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
- 'sane: for scanner support'
- 'xsane: sane scanner frontend'
- 'python-pillow: for commandline scanning support'
- 'python-reportlab: for pdf output in hp-scan'
- 'rpcbind: for network support'
- 'python-pyqt5: for running GUI and 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')
-backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
-source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- disable_upgrade.patch
- fix_tabs.patch
- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
-sha1sums=('e3bc9a0d135232eba412952ca58b63757783e22f'
- 'SKIP'
- '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
- 'bd18428ff1e378aa0a299331607eaed82021e34b'
- '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
-
-prepare() {
- cd $pkgname-$pkgver
-
- # disable insecure update - https://bugs.archlinux.org/task/38083
- patch -Np0 -i ${srcdir}/disable_upgrade.patch
-
- # fix tabs breaking printing; FS#50588
- patch -Np0 -i ${srcdir}/fix_tabs.patch
- # add missing 'include <cups/ppd.h>' at various places
- patch -Np1 -i
${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
-
- # 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
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-qt5 \
- --disable-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 #--help
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 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}
- 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
-
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}
Copied: hplip/repos/extra-i686/PKGBUILD (from rev 279878, hplip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+# Maintainer: Tom Gundersen <t...@jklm.no>
+# Contributor : Rémy Oudompheng <r...@archlinux.org>
+# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.16.10
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+ 'sane: for scanner support'
+ 'xsane: sane scanner frontend'
+ 'python-pillow: for commandline scanning support'
+ 'python-reportlab: for pdf output in hp-scan'
+ 'rpcbind: for network support'
+ 'python-pyqt5: for running GUI and 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'
+ 'wget: for network support')
+backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
+source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ disable_upgrade.patch
+ fix_tabs.patch
+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
+sha1sums=('e3bc9a0d135232eba412952ca58b63757783e22f'
+ 'SKIP'
+ '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
+ 'bd18428ff1e378aa0a299331607eaed82021e34b'
+ '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+
+ # fix tabs breaking printing; FS#50588
+ patch -Np0 -i ${srcdir}/fix_tabs.patch
+ # add missing 'include <cups/ppd.h>' at various places
+ patch -Np1 -i
${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
+
+ # 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
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt5 \
+ --disable-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 #--help
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 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}
+ 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
+
+ # remove rc script
+ rm -vrf "$pkgdir"/etc/init.d
+}
Deleted: extra-i686/disable_upgrade.patch
===================================================================
--- extra-i686/disable_upgrade.patch 2016-11-06 09:09:08 UTC (rev 279878)
+++ extra-i686/disable_upgrade.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,14 +0,0 @@
---- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
-+++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
-@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
- if os.getenv("HPLIP_DEBUG"):
- log.set_level('debug')
-
-+
-+log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
-+clean_exit(1)
-+
-+
- for o, a in opts:
- if o in ('-h', '--help'):
- usage()
Copied: hplip/repos/extra-i686/disable_upgrade.patch (from rev 279878,
hplip/trunk/disable_upgrade.patch)
===================================================================
--- extra-i686/disable_upgrade.patch (rev 0)
+++ extra-i686/disable_upgrade.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,14 @@
+--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
++++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
+@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
+ if os.getenv("HPLIP_DEBUG"):
+ log.set_level('debug')
+
++
++log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
++clean_exit(1)
++
++
+ for o, a in opts:
+ if o in ('-h', '--help'):
+ usage()
Deleted: extra-i686/fix_tabs.patch
===================================================================
--- extra-i686/fix_tabs.patch 2016-11-06 09:09:08 UTC (rev 279878)
+++ extra-i686/fix_tabs.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,17 +0,0 @@
---- prnt/filters/hpps 2016-08-26 12:04:29.000000000 +0200
-+++ prnt/filters/hpps.new 2016-08-31 21:19:57.868640372 +0200
-@@ -191,11 +191,11 @@
- msg("Setting Pin to default")
- else:
- szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']
-- for x in szKeyInitials:
-+ for x in szKeyInitials:
- try:
-- secpin += opts[x]
-+ secpin += opts[x]
- except KeyError:
-- secpin += '0'
-+ secpin += '0'
-
- os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
-
Copied: hplip/repos/extra-i686/fix_tabs.patch (from rev 279878,
hplip/trunk/fix_tabs.patch)
===================================================================
--- extra-i686/fix_tabs.patch (rev 0)
+++ extra-i686/fix_tabs.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,17 @@
+--- prnt/filters/hpps 2016-08-26 12:04:29.000000000 +0200
++++ prnt/filters/hpps.new 2016-08-31 21:19:57.868640372 +0200
+@@ -191,11 +191,11 @@
+ msg("Setting Pin to default")
+ else:
+ szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']
+- for x in szKeyInitials:
++ for x in szKeyInitials:
+ try:
+- secpin += opts[x]
++ secpin += opts[x]
+ except KeyError:
+- secpin += '0'
++ secpin += '0'
+
+ os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
+
Deleted:
extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
===================================================================
---
extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2016-11-06 09:09:08 UTC (rev 279878)
+++
extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,50 +0,0 @@
-From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppe...@canonical.com>
-Date: Sat, 24 Sep 2016 10:37:20 +0200
-Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
- definitions to ppd.h
-
----
- configure.in | 2 +-
- prnt/hpcups/HPCupsFilter.h | 2 ++
- prnt/hpijs/hpcupsfax.cpp | 1 +
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index d3a1ddb..eabe14a 100755
---- a/configure.in
-+++ b/configure.in
-@@ -554,7 +554,7 @@ fi
-
- if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
- AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"],
[AC_MSG_ERROR([cannot find libcups support], 9)])
-- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel
support], 3)])
-+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find
cups-devel support], 3)])
- if test "$libusb01_build" = "yes"; then
- AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot
find libusb support], 2)])
- AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel
support], 11)])
-diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
-index ff5548e..c517989 100644
---- a/prnt/hpcups/HPCupsFilter.h
-+++ b/prnt/hpcups/HPCupsFilter.h
-@@ -38,6 +38,8 @@
-
- #include "dbuscomm.h"
-
-+#include <cups/ppd.h>
-+
- #define DBITMAPFILEHEADER 14
- #define DBITMAPINFOHEADER 40
-
-diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
-index 8514775..994e50f 100644
---- a/prnt/hpijs/hpcupsfax.cpp
-+++ b/prnt/hpijs/hpcupsfax.cpp
-@@ -43,6 +43,7 @@
- #include <arpa/inet.h>
- #include <math.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <cups/raster.h>
- #include <string>
- #ifdef FALSE
Copied:
hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 279878,
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===================================================================
---
extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(rev 0)
+++
extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppe...@canonical.com>
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
++++ b/configure.in
+@@ -554,7 +554,7 @@ fi
+
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+ AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"],
[AC_MSG_ERROR([cannot find libcups support], 9)])
+- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel
support], 3)])
++ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find
cups-devel support], 3)])
+ if test "$libusb01_build" = "yes"; then
+ AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot
find libusb support], 2)])
+ AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
++++ b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+
+ #include "dbuscomm.h"
+
++#include <cups/ppd.h>
++
+ #define DBITMAPFILEHEADER 14
+ #define DBITMAPINFOHEADER 40
+
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
++++ b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include <arpa/inet.h>
+ #include <math.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <cups/raster.h>
+ #include <string>
+ #ifdef FALSE
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-11-06 09:09:08 UTC (rev 279878)
+++ extra-x86_64/PKGBUILD 2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-# Maintainer: Tom Gundersen <t...@jklm.no>
-# Contributor : Rémy Oudompheng <r...@archlinux.org>
-# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.16.10
-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=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
- 'sane: for scanner support'
- 'xsane: sane scanner frontend'
- 'python-pillow: for commandline scanning support'
- 'python-reportlab: for pdf output in hp-scan'
- 'rpcbind: for network support'
- 'python-pyqt5: for running GUI and 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')
-backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
-source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- disable_upgrade.patch
- fix_tabs.patch
- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
-sha1sums=('e3bc9a0d135232eba412952ca58b63757783e22f'
- 'SKIP'
- '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
- 'bd18428ff1e378aa0a299331607eaed82021e34b'
- '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
-
-prepare() {
- cd $pkgname-$pkgver
-
- # disable insecure update - https://bugs.archlinux.org/task/38083
- patch -Np0 -i ${srcdir}/disable_upgrade.patch
-
- # fix tabs breaking printing; FS#50588
- patch -Np0 -i ${srcdir}/fix_tabs.patch
- # add missing 'include <cups/ppd.h>' at various places
- patch -Np1 -i
${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
-
- # 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
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-qt5 \
- --disable-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 #--help
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 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}
- 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
-
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}
Copied: hplip/repos/extra-x86_64/PKGBUILD (from rev 279878,
hplip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+# Maintainer: Tom Gundersen <t...@jklm.no>
+# Contributor : Rémy Oudompheng <r...@archlinux.org>
+# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.16.10
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+ 'sane: for scanner support'
+ 'xsane: sane scanner frontend'
+ 'python-pillow: for commandline scanning support'
+ 'python-reportlab: for pdf output in hp-scan'
+ 'rpcbind: for network support'
+ 'python-pyqt5: for running GUI and 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'
+ 'wget: for network support')
+backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
+source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ disable_upgrade.patch
+ fix_tabs.patch
+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
+sha1sums=('e3bc9a0d135232eba412952ca58b63757783e22f'
+ 'SKIP'
+ '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
+ 'bd18428ff1e378aa0a299331607eaed82021e34b'
+ '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+
+ # fix tabs breaking printing; FS#50588
+ patch -Np0 -i ${srcdir}/fix_tabs.patch
+ # add missing 'include <cups/ppd.h>' at various places
+ patch -Np1 -i
${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
+
+ # 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
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt5 \
+ --disable-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 #--help
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 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}
+ 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
+
+ # remove rc script
+ rm -vrf "$pkgdir"/etc/init.d
+}
Deleted: extra-x86_64/disable_upgrade.patch
===================================================================
--- extra-x86_64/disable_upgrade.patch 2016-11-06 09:09:08 UTC (rev 279878)
+++ extra-x86_64/disable_upgrade.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,14 +0,0 @@
---- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
-+++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
-@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
- if os.getenv("HPLIP_DEBUG"):
- log.set_level('debug')
-
-+
-+log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
-+clean_exit(1)
-+
-+
- for o, a in opts:
- if o in ('-h', '--help'):
- usage()
Copied: hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 279878,
hplip/trunk/disable_upgrade.patch)
===================================================================
--- extra-x86_64/disable_upgrade.patch (rev 0)
+++ extra-x86_64/disable_upgrade.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,14 @@
+--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
++++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
+@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
+ if os.getenv("HPLIP_DEBUG"):
+ log.set_level('debug')
+
++
++log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
++clean_exit(1)
++
++
+ for o, a in opts:
+ if o in ('-h', '--help'):
+ usage()
Deleted: extra-x86_64/fix_tabs.patch
===================================================================
--- extra-x86_64/fix_tabs.patch 2016-11-06 09:09:08 UTC (rev 279878)
+++ extra-x86_64/fix_tabs.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -1,17 +0,0 @@
---- prnt/filters/hpps 2016-08-26 12:04:29.000000000 +0200
-+++ prnt/filters/hpps.new 2016-08-31 21:19:57.868640372 +0200
-@@ -191,11 +191,11 @@
- msg("Setting Pin to default")
- else:
- szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']
-- for x in szKeyInitials:
-+ for x in szKeyInitials:
- try:
-- secpin += opts[x]
-+ secpin += opts[x]
- except KeyError:
-- secpin += '0'
-+ secpin += '0'
-
- os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
-
Copied: hplip/repos/extra-x86_64/fix_tabs.patch (from rev 279878,
hplip/trunk/fix_tabs.patch)
===================================================================
--- extra-x86_64/fix_tabs.patch (rev 0)
+++ extra-x86_64/fix_tabs.patch 2016-11-06 09:09:29 UTC (rev 279879)
@@ -0,0 +1,17 @@
+--- prnt/filters/hpps 2016-08-26 12:04:29.000000000 +0200
++++ prnt/filters/hpps.new 2016-08-31 21:19:57.868640372 +0200
+@@ -191,11 +191,11 @@
+ msg("Setting Pin to default")
+ else:
+ szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']
+- for x in szKeyInitials:
++ for x in szKeyInitials:
+ try:
+- secpin += opts[x]
++ secpin += opts[x]
+ except KeyError:
+- secpin += '0'
++ secpin += '0'
+
+ os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
+
