commit ac9cbaff2a49e9d5bd60671bd67d3cc97533b3ac
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Fri Nov 15 20:15:48 2024 +0100
- drop cups-final-content-type.patch as it causes problems with
cups-filters-2.0, rel 3
cups-final-content-type.patch | 17 -----------------
cups.spec | 4 +---
2 files changed, 1 insertion(+), 20 deletions(-)
---
diff --git a/cups.spec b/cups.spec
index 5f58887..8483c4b 100644
--- a/cups.spec
+++ b/cups.spec
@@ -13,7 +13,7 @@ Summary(pl.UTF-8): Ogólny system druku dla Uniksa
Summary(pt_BR.UTF-8): Sistema Unix de Impressão
Name: cups
Version: 2.4.11
-Release: 2
+Release: 3
Epoch: 1
License: LGPL v2 (libraries), GPL v2 (the rest)
Group: Applications/Printing
@@ -39,7 +39,6 @@ Patch11: %{name}-usb.patch
Patch12: %{name}-desktop.patch
Patch15: reactivate_recommended_driver.patch
Patch16:
read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
-Patch18: %{name}-final-content-type.patch
Patch102: cups-banners.patch
Patch103: cups-pid.patch
Patch104: cups-eggcups.patch
@@ -276,7 +275,6 @@ bibliotecas do CUPS.
%patch12 -p1
%patch15 -p1
%patch16 -p1
-%patch18 -p1
%patch102 -p1
%patch103 -p1
diff --git a/cups-final-content-type.patch b/cups-final-content-type.patch
deleted file mode 100644
index 7076e2b..0000000
--- a/cups-final-content-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up cups-1.6.4/scheduler/job.c.final-content-type
cups-1.6.4/scheduler/job.c
---- cups-1.6.4/scheduler/job.c.final-content-type 2013-09-27
16:58:13.934775402 +0100
-+++ cups-1.6.4/scheduler/job.c 2013-09-27 17:00:57.716549576 +0100
-@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I
-
- if (!job->printer->remote)
- {
-- for (filter = (mime_filter_t *)cupsArrayLast(filters);
-- filter && filter->dst;
-- filter = (mime_filter_t *)cupsArrayPrev(filters))
-- if (strcmp(filter->dst->super, "printer") ||
-- strcmp(filter->dst->type, job->printer->name))
-- break;
-+ filter = (mime_filter_t *)cupsArrayLast(filters);
-
- if (filter && filter->dst)
- {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cups.git/commitdiff/ac9cbaff2a49e9d5bd60671bd67d3cc97533b3ac
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
