rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove cups-filter-debug.patch

Browse Source 
It is no longer needed - we check whether we have filters to do the job before the job is created.
This commit is contained in:
Zdenek Dohnal 2020-11-27 08:03:52 +01:00
parent 60b98c4f8e
commit ead8199677
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cups-filter-debug.patch
View File

@ -1,32 +0,0 @@
diff -up cups-1.6b1/scheduler/job.c.filter-debug cups-1.6b1/scheduler/job.c
--- cups-1.6b1/scheduler/job.c.filter-debug 2012-05-25 16:06:01.000000000 +0200
+++ cups-1.6b1/scheduler/job.c 2012-05-25 16:07:46.309259511 +0200
@@ -625,10 +625,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I
if (!filters)
{
+ mime_filter_t *current;
+
cupsdLogJob(job, CUPSD_LOG_ERROR,
"Unable to convert file %d to printable format.",
job->current_file);
+ cupsdLogJob(job, CUPSD_LOG_ERROR,
+ "Required: %s/%s -> %s/%s",
+ job->filetypes[job->current_file]->super,
+ job->filetypes[job->current_file]->type,
+ job->printer->filetype->super,
+ job->printer->filetype->type);
+
+ for (current = (mime_filter_t *)cupsArrayFirst(MimeDatabase->srcs);
+ current;
+ current = (mime_filter_t *)cupsArrayNext(MimeDatabase->srcs))
+ cupsdLogJob(job, CUPSD_LOG_ERROR,
+ "Available: %s/%s -> %s/%s (%s)",
+ current->src->super, current->src->type,
+ current->dst->super, current->dst->type,
+ current->filter);
+
abort_message = "Aborting job because it cannot be printed.";
abort_state = IPP_JOB_ABORTED;

6
cups.spec
View File

@ -59,9 +59,6 @@ Patch12: cups-synconclose.patch
# TODO: move it to the cups-filters upstream
Patch13: cups-failover-backend.patch
# reported upstream
# adds logs when job fails due bad conversion
Patch14: cups-filter-debug.patch
# add device id for dymo printer
Patch15: cups-dymo-deviceid.patch
@ -304,8 +301,6 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
%patch100 -p1 -b .lspp
%endif
# Log extra debugging information if no filters are available.
%patch15 -p1 -b .filter-debug
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
%patch16 -p1 -b .dymo-deviceid
%patch17 -p1 -b .print-color-mode
@ -728,6 +723,7 @@ rm -f %{cups_serverbin}/backend/smb
* Fri Nov 27 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-20
- make unit files writeable by root
- remove %%post scriptlet - it is covered by drop-in now
- remove cups-filter-debug.patch
* Thu Nov 26 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-20
- remove downstream autostart patch - use systemd drop-in