Merge branch 'master' into 'master'

Fix the build with cups < 2.2.12

Closes #2968

See merge request GNOME/gtk!2744
This commit is contained in:
Matthias Clasen 2020-10-26 20:09:30 +00:00
commit 61e08baec1

View File

@ -647,7 +647,11 @@ add_cups_options (const char *key,
custom_value = TRUE;
break;
#if (CUPS_VERSION_MAJOR >= 3) || \
(CUPS_VERSION_MAJOR == 2 && CUPS_VERSION_MINOR >= 3) || \
(CUPS_VERSION_MAJOR == 2 && CUPS_VERSION_MINOR == 2 && CUPS_VERSION_PATCH >= 12)
case PPD_CUSTOM_UNKNOWN:
#endif
default :
custom_value = FALSE;
}