wok-current view hplip/stuff/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch @ rev 25695
Up linux 5.10.214, Patch xorg-server (CVE-2024-31080, CVE-2024-31081, CVE-2024-31082, CVE-2024-31083)
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Thu Apr 04 08:53:51 2024 +0000 (2 months ago) |
| parents | |
| children |
line source
1 From 1bd330a5240519781fe325c75c29de43ab0ffb29 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
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(-)
13 diff --git a/configure.in b/configure.in
14 index bf3902b84..f12eda941 100755
15 --- a/configure.in
16 +++ b/configure.in
17 @@ -591,7 +591,7 @@ fi
19 if test "$class_driver" = "no" && 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 3d003d5d2..60f858025 100644
28 --- a/prnt/hpcups/HPCupsFilter.h
29 +++ b/prnt/hpcups/HPCupsFilter.h
30 @@ -38,6 +38,8 @@
31 #include <cups/ppd.h>
32 #include "dbuscomm.h"
34 +#include <cups/ppd.h>
35 +
36 #define DBITMAPFILEHEADER 14
37 #define DBITMAPINFOHEADER 40
39 diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
40 index 8514775d4..994e50f39 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