[Pkg-cups-devel] r664 - cupsys/trunk/debian/patches

[Kenshi Muto]

Author: kmuto
Date: Sun Dec 23 02:09:00 2007
New Revision: 664

Log:
update patch for 1.3.5

Modified:
   cupsys/trunk/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch

Modified: cupsys/trunk/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch	(original)
+++ cupsys/trunk/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch	Sun Dec 23 02:09:00 2007
@@ -5,20 +5,19 @@
 ## DP: Forwarded and committed upstream: http://www.cups.org/str.php?L2631 (revision 7141 - pre 1.3.6)
 
 @DPATCH@
-diff -urNad cupsys-1.3.4~/scheduler/main.c cupsys-1.3.4/scheduler/main.c
---- cupsys-1.3.4~/scheduler/main.c	2007-12-19 06:36:48.000000000 +0100
-+++ cupsys-1.3.4/scheduler/main.c	2007-12-19 06:38:57.000000000 +0100
-@@ -148,6 +148,9 @@
-   cups_file_t		*fp;		/* Fake lpsched lock file */
-   struct stat		statbuf;	/* Needed for checking lpsched FIFO */
- #endif /* __sgi */
-+#ifndef __APPLE__
-+  time_t		netif_time = 0;	/* Time since last network update */
-+#endif /* __APPLE__ */
+diff -urNad cupsys-1.3.5~/scheduler/main.c cupsys-1.3.5/scheduler/main.c
+--- cupsys-1.3.5~/scheduler/main.c	2007-12-23 10:51:11.864573425 +0900
++++ cupsys-1.3.5/scheduler/main.c	2007-12-23 10:52:58.700407295 +0900
+@@ -151,6 +151,8 @@
+ #ifdef __APPLE__
+   int			run_as_child = 0;
+ 					/* Needed for Mac OS X fork/exec */
++#else
++  time_t		netif_time = 0; /* Time since last network update */
+ #endif /* __APPLE__ */
  #if HAVE_LAUNCHD
    int			launchd_idle_exit;
- 					/* Idle exit on select timeout? */
-@@ -808,6 +811,18 @@
+@@ -834,6 +836,18 @@
  
      current_time = time(NULL);