hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch

   1 From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
   2 From: Till Kamppeter <till.kamppeter@canonical.com>
   3 Date: Sat, 24 Sep 2016 10:37:20 +0200
   4 Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
   5  definitions to ppd.h
   6
   7 ---
   8  configure.in               | 2 +-
   9  prnt/hpcups/HPCupsFilter.h | 2 ++
  10  prnt/hpijs/hpcupsfax.cpp   | 1 +
  11  3 files changed, 4 insertions(+), 1 deletion(-)
  12
  13 diff --git a/configure.in b/configure.in
  14 index d3a1ddb..eabe14a 100755
  15 --- a/configure.in
  16 +++ b/configure.in
  17 @@ -554,7 +554,7 @@ fi
  18
  19  if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
  20     AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)])
  21 -   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
  22 +   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
  23     if test "$libusb01_build" = "yes"; then
  24        AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)])
  25        AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
  26 diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
  27 index ff5548e..c517989 100644
  28 --- a/prnt/hpcups/HPCupsFilter.h
  29 +++ b/prnt/hpcups/HPCupsFilter.h
  30 @@ -38,6 +38,8 @@
  31
  32  #include "dbuscomm.h"
  33
  34 +#include <cups/ppd.h>
  35 +
  36  #define                DBITMAPFILEHEADER               14
  37  #define                DBITMAPINFOHEADER               40
  38
  39 diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
  40 index 8514775..994e50f 100644
  41 --- a/prnt/hpijs/hpcupsfax.cpp
  42 +++ b/prnt/hpijs/hpcupsfax.cpp
  43 @@ -43,6 +43,7 @@
  44  #include <arpa/inet.h>
  45  #include <math.h>
  46  #include <cups/cups.h>
  47 +#include <cups/ppd.h>
  48  #include <cups/raster.h>
  49  #include <string>
  50  #ifdef FALSE