[gentoo-commits] gentoo-x86 commit in net-print/cups/files: cups-1.7.3-noavahi.patch

[Andreas HAttel (dilfridge)]

dilfridge    14/06/06 22:29:48

  Added:                cups-1.7.3-noavahi.patch
  Log:
  Version bump, remove old; fixes also bug 511994
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

Revision  Changes    Path
1.1                  net-print/cups/files/cups-1.7.3-noavahi.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.7.3-noavahi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.7.3-noavahi.patch?rev=1.1&content-type=text/plain

Index: cups-1.7.3-noavahi.patch
===================================================================
From 8441e27ce4008828cbdd25bdd6249c0019853b92 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 9 May 2014 20:57:11 +0000
Subject: [PATCH] CUPS did not compile when Avahi or mDNSResponder was not
 present (STR #4402)

[modified: stripped ChangeLog hunk]

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11871 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 CHANGES-1.7.txt    | 2 ++
 scheduler/dirsvc.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 495bf1b..4e417b0 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -237,11 +237,13 @@ cupsdStartBrowsing(void)
   if (BrowseLocalProtocols & BROWSE_SMB)
     update_smb(1);
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
  /*
   * Register the individual printers
   */
 
   dnssdRegisterAllPrinters(0);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 }
 
 
@@ -255,6 +257,7 @@ cupsdStopBrowsing(void)
   if (!Browsing || !BrowseLocalProtocols)
     return;
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
  /*
   * De-register the individual printers
   */
@@ -265,7 +268,6 @@ cupsdStopBrowsing(void)
   * Shut down browsing sockets...
   */
 
-#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
     dnssdStop();
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
-- 
2.0.0