[Pkg-cups-devel] r347 - in cupsys/branches/cups-1.2/debian: .

Kenshi Muto kmuto at costa.debian.org
Wed Aug 9 15:29:17 UTC 2006


Author: kmuto
Date: Wed Aug  9 15:29:16 2006
New Revision: 347

Added:
   cupsys/branches/cups-1.2/debian/patches/61_job_c_strangeloop.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list

Log:
r5809 has a problem around job.c. 61_job_c_strangeloop patch avoids it.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Aug  9 15:29:16 2006
@@ -3,6 +3,9 @@
   [ Kenshi Muto ]
   * Apply upstream svn change r5809.
     - BrowseRelay didn't work on Debian (closes: #372855)
+    61_job_c_strangeloop.dpatch: I don't make sure but job.c of
+    r5809 causes strange CPU busy when it gets printing jobs.
+    This patch avoids it.
   * libcupsys2 conflicts cupsys version 1.1.
     libcupsys2 version 1.2 changed its private API. This breaks
     old cupsys 1.1, but we believe cupsys is only one application

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Wed Aug  9 15:29:16 2006
@@ -25,3 +25,4 @@
 #58_fixdestc.dpatch
 #59_de_docroot.dpatch
 60_device_uri.dpatch
+61_job_c_strangeloop.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/61_job_c_strangeloop.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/61_job_c_strangeloop.dpatch	Wed Aug  9 15:29:16 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 61_job_c_strangeloop.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.2~/scheduler/job.c cupsys-1.2.2/scheduler/job.c
+--- cupsys-1.2.2~/scheduler/job.c	2006-08-09 15:16:18.000000000 +0000
++++ cupsys-1.2.2/scheduler/job.c	2006-08-09 15:17:17.000000000 +0000
+@@ -1728,7 +1728,7 @@
+       break;
+   }
+ 
+-  if (ptr == NULL && errno)
++  if (ptr == NULL) /* "&& errno" makes a strange infinite loop */
+   {
+    /*
+     * See if all of the filters and the backend have returned their



More information about the Pkg-cups-devel mailing list