diff --git a/.gitignore b/.gitignore index e8f59f9..0f1ec1d 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ /cups-filters-1.28.2.tar.xz /cups-filters-1.28.5.tar.xz /cups-filters-1.28.6.tar.xz +/cups-filters-1.28.7.tar.xz diff --git a/0001-libcupsfilters-Added-NULL-check-when-removing-.Borde.patch b/0001-libcupsfilters-Added-NULL-check-when-removing-.Borde.patch deleted file mode 100644 index d7937df..0000000 --- a/0001-libcupsfilters-Added-NULL-check-when-removing-.Borde.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 240ffb901d06a117bb8e10b486bfd3de6fe464b2 Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Wed, 28 Oct 2020 10:44:19 +0100 -Subject: [PATCH] libcupsfilters: Added NULL check when removing ".Borderless" - suffixes from page size names - ---- - NEWS | 2 ++ - cupsfilters/ppdgenerator.c | 12 ++++++++---- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c -index 9fd4fb21..7b4aa0cf 100644 ---- a/cupsfilters/ppdgenerator.c -+++ b/cupsfilters/ppdgenerator.c -@@ -2224,7 +2224,8 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ - - if (all_borderless) { - suffix = strcasestr(ppdname, ".Borderless"); -- *suffix = '\0'; -+ if (suffix) -+ *suffix = '\0'; - } - - cupsFilePrintf(fp, "*OpenUI *PageSize/%s: PickOne\n" -@@ -2258,7 +2259,8 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ - - if (all_borderless) { - suffix = strcasestr(ppdsizename, ".Borderless"); -- *suffix = '\0'; -+ if (suffix) -+ *suffix = '\0'; - } - - cupsFilePrintf(fp, "*PageSize %s%s%s%s: \"<>setpagedevice\"\n", -@@ -2302,7 +2304,8 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ - - if (all_borderless) { - suffix = strcasestr(ppdsizename, ".Borderless"); -- *suffix = '\0'; -+ if (suffix) -+ *suffix = '\0'; - } - - cupsFilePrintf(fp, "*PageRegion %s%s%s%s: \"<>setpagedevice\"\n", -@@ -2338,7 +2341,8 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ - - if (all_borderless) { - suffix = strcasestr(ppdsizename, ".Borderless"); -- *suffix = '\0'; -+ if (suffix) -+ *suffix = '\0'; - } - - cupsFilePrintf(fp, "*ImageableArea %s: \"%s %s %s %s\"\n", ppdsizename, --- -2.26.2 - diff --git a/0001-libcupsfilters-In-the-PPD-generator-really-give-prio.patch b/0001-libcupsfilters-In-the-PPD-generator-really-give-prio.patch new file mode 100644 index 0000000..504ff70 --- /dev/null +++ b/0001-libcupsfilters-In-the-PPD-generator-really-give-prio.patch @@ -0,0 +1,63 @@ +From a5dd51e25842c7499917f00e53228695fd113826 Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Thu, 21 Jan 2021 15:50:26 +0100 +Subject: [PATCH] libcupsfilters: In the PPD generator really give priority to + Apple Raster against PDF + +(cherry picked from commit bcd1aedeecb83fe9499d1d0c3dc0dab1ea32811c) +--- + cupsfilters/ppdgenerator.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c +index 4e163836..ebc2ee1c 100644 +--- a/cupsfilters/ppdgenerator.c ++++ b/cupsfilters/ppdgenerator.c +@@ -1951,7 +1951,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ + formatfound = 1; + is_pdf = 1; + } else if (cupsArrayFind(pdl_list, "application/pdf")) { +- cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 100 -\"\n"); ++ cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 200 -\"\n"); + manual_copies = 0; + formatfound = 1; + is_pdf = 1; +@@ -2030,7 +2030,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ + if ((current_res = ippResolutionListToArray(attr)) != NULL && + joinResolutionArrays(&common_res, ¤t_res, &common_def, + ¤t_def)) { +- cupsFilePuts(fp, "*cupsFilter2: \"application/PCLm application/PCLm 200 -\"\n"); ++ cupsFilePuts(fp, "*cupsFilter2: \"application/PCLm application/PCLm 300 -\"\n"); + if (formatfound == 0) manual_copies = 1; + formatfound = 1; + is_pclm = 1; +@@ -2049,7 +2049,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ + /* We put a high cost factor here as if a printer supports also + another format, like PWG or Apple Raster, we prefer it, as some + PCL-XL printers have bugs in their PCL-XL interpreters */ +- cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/vnd.hp-pclxl 300 gstopxl\"\n"); ++ cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/vnd.hp-pclxl 400 gstopxl\"\n"); + if (formatfound == 0) manual_copies = 1; + formatfound = 1; + } +@@ -2058,7 +2058,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ + /* We put a high cost factor here as if a printer supports also + another format, like PWG or Apple Raster, we prefer it, as many + PostScript printers have bugs in their PostScript interpreters */ +- cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-postscript application/postscript 500 -\"\n"); ++ cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-postscript application/postscript 600 -\"\n"); + if (formatfound == 0) manual_copies = 0; + formatfound = 1; + } +@@ -2067,7 +2067,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ + another format, like PWG or Apple Raster, we prefer it, as there + are some printers, like HP inkjets which report to accept PCL + but do not support PCL 5c/e or PCL-XL */ +- cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx\"\n"); ++ cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-raster application/vnd.hp-pcl 800 rastertopclx\"\n"); + if (formatfound == 0) manual_copies = 1; + formatfound = 1; + } +-- +2.26.2 + diff --git a/sources b/sources index 930e8ca..5a7310d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cups-filters-1.28.6.tar.xz) = 6a353d155ccdcb6882e1fe33d730efded0c49c00a5946c099a983701e1abcd929469762bfa6b04b8bc3ab0b76cb374db04eb96d50b094b51eac56ec87517d784 +SHA512 (cups-filters-1.28.7.tar.xz) = fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727