Fix builds with current PAPPL.

OpenPrinting · Jan 24, 2024 · 42a9bc3 · 42a9bc3
1 parent 971e028
commit 42a9bc3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/configure b/configure
@@ -3810,7 +3810,7 @@ then :
 
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-    CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags cups3)"
+    CPPFLAGS="$($PKGCONFIG --cflags cups3) $CPPFLAGS"
     LIBS="$($PKGCONFIG --libs cups3) $LIBS"
 
 else $as_nop
@@ -3830,7 +3830,7 @@ then :
 
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-    CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags pappl2)"
+    CPPFLAGS="$($PKGCONFIG --cflags pappl2) $CPPFLAGS"
     LIBS="$($PKGCONFIG --libs pappl2) $LIBS"
 
 else $as_nop

diff --git a/configure.ac b/configure.ac
@@ -81,7 +81,7 @@ dnl CUPS library v3
 AC_MSG_CHECKING([for CUPS library v3])
 AS_IF([$PKGCONFIG --exists cups3], [
     AC_MSG_RESULT([yes])
-    CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags cups3)"
+    CPPFLAGS="$($PKGCONFIG --cflags cups3) $CPPFLAGS"
     LIBS="$($PKGCONFIG --libs cups3) $LIBS"
 ], [
     AC_MSG_RESULT([no])
@@ -94,7 +94,7 @@ dnl PAPPL library...
 AC_MSG_CHECKING([for PAPPL library v2.0 or later])
 AS_IF([$PKGCONFIG --exists pappl2 --atleast-version=2.0], [
     AC_MSG_RESULT([yes])
-    CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags pappl2)"
+    CPPFLAGS="$($PKGCONFIG --cflags pappl2) $CPPFLAGS"
     LIBS="$($PKGCONFIG --libs pappl2) $LIBS"
 ], [
     AC_MSG_RESULT([no])

diff --git a/daemon/drivers.c b/daemon/drivers.c
@@ -476,12 +476,13 @@ LocalDriverCallback(
     // Finishings
     if ((attr = ippFindAttribute(response, "finishings-supported", IPP_TAG_ENUM)) != NULL)
     {
+      // Update to support all finishings in PAPPL 2.x...
       if (ippContainsInteger(attr, IPP_FINISHINGS_PUNCH))
-        data->finishings |= PAPPL_FINISHINGS_PUNCH;
+        data->finishings_supported |= PAPPL_FINISHINGS_PUNCH;
       if (ippContainsInteger(attr, IPP_FINISHINGS_STAPLE))
-        data->finishings |= PAPPL_FINISHINGS_STAPLE;
+        data->finishings_supported |= PAPPL_FINISHINGS_STAPLE;
       if (ippContainsInteger(attr, IPP_FINISHINGS_TRIM))
-        data->finishings |= PAPPL_FINISHINGS_TRIM;
+        data->finishings_supported |= PAPPL_FINISHINGS_TRIM;
     }
 
     // Color modes