diff options
| -rw-r--r-- | libre/hplip/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 50 | ||||
| -rw-r--r-- | libre/hplip/PKGBUILD | 16 |
2 files changed, 60 insertions, 6 deletions
diff --git a/libre/hplip/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch b/libre/hplip/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch new file mode 100644 index 000000000..491c3072b --- /dev/null +++ b/libre/hplip/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch @@ -0,0 +1,50 @@ +From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 +From: Till Kamppeter <till.kamppeter@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 diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD index 80e49a6cf..79e678258 100644 --- a/libre/hplip/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 275630 2016-08-31 19:27:03Z andyrtr $ +# $Id: PKGBUILD 277267 2016-09-28 17:59:05Z andyrtr $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer (Arch): Tom Gundersen <teg@jklm.no> # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org> @@ -8,8 +8,8 @@ # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=hplip -pkgver=3.16.8 -pkgrel=2.parabola1 +pkgver=3.16.9 +pkgrel=1.parabola1 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' 'armv7h') url="http://hplipopensource.com" @@ -30,11 +30,13 @@ conflicts=(${pkgname}-libre) backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio') source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch - fix_tabs.patch) -sha1sums=('0331d810702983e15c3a3b8cfe48d262fa23aac5' + fix_tabs.patch + 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) +sha1sums=('bf9ef2955df365c9544138aa6b7a6d5d20650792' 'SKIP' '4ef1b506ff5930ab841945ae9178f28fca1997ad' - 'bd18428ff1e378aa0a299331607eaed82021e34b') + 'bd18428ff1e378aa0a299331607eaed82021e34b' + '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com> prepare() { @@ -70,6 +72,8 @@ prepare() { # 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 |