0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  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. configure.in | 2 +-
  8. prnt/hpcups/HPCupsFilter.h | 2 ++
  9. prnt/hpijs/hpcupsfax.cpp | 1 +
  10. 3 files changed, 4 insertions(+), 1 deletion(-)
  11. diff --git a/configure.in b/configure.in
  12. index d3a1ddb..eabe14a 100755
  13. --- a/configure.in
  14. +++ b/configure.in
  15. @@ -554,7 +554,7 @@ fi
  16. if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
  17. AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)])
  18. - AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
  19. + AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
  20. if test "$libusb01_build" = "yes"; then
  21. AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)])
  22. AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
  23. diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
  24. index ff5548e..c517989 100644
  25. --- a/prnt/hpcups/HPCupsFilter.h
  26. +++ b/prnt/hpcups/HPCupsFilter.h
  27. @@ -38,6 +38,8 @@
  28. #include "dbuscomm.h"
  29. +#include <cups/ppd.h>
  30. +
  31. #define DBITMAPFILEHEADER 14
  32. #define DBITMAPINFOHEADER 40
  33. diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
  34. index 8514775..994e50f 100644
  35. --- a/prnt/hpijs/hpcupsfax.cpp
  36. +++ b/prnt/hpijs/hpcupsfax.cpp
  37. @@ -43,6 +43,7 @@
  38. #include <arpa/inet.h>
  39. #include <math.h>
  40. #include <cups/cups.h>
  41. +#include <cups/ppd.h>
  42. #include <cups/raster.h>
  43. #include <string>
  44. #ifdef FALSE