[med-svn] r10039 - trunk/packages/gdcm/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-03-21 20:57:38 +0000 (Wed, 21 Mar 2012)
New Revision: 10039

Modified:
   trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch
Log:
revert previous mistake

Modified: trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch	2012-03-21 06:05:33 UTC (rev 10038)
+++ trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch	2012-03-21 20:57:38 UTC (rev 10039)
@@ -2,8 +2,8 @@
 http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_
 Index: gdcm-2.2.0/Source/Common/gdcmSystem.cxx
 ===================================================================
---- gdcm-2.2.0.orig/Source/Common/gdcmSystem.cxx	2011-12-30 16:37:28.000000000 +0100
-+++ gdcm-2.2.0/Source/Common/gdcmSystem.cxx	2012-03-06 10:29:27.000000000 +0100
+--- gdcm-2.2.0.orig/Source/Common/gdcmSystem.cxx	2012-03-21 21:54:04.000000000 +0100
++++ gdcm-2.2.0/Source/Common/gdcmSystem.cxx	2012-03-21 21:54:20.000000000 +0100
 @@ -363,6 +363,10 @@
    return Rmdir(source) == 0;
  }
@@ -17,8 +17,8 @@
  {
 Index: gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx
 ===================================================================
---- gdcm-2.2.0.orig/Source/DataDictionary/gdcmGlobal.cxx	2011-12-30 16:37:28.000000000 +0100
-+++ gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx	2012-03-06 10:29:27.000000000 +0100
+--- gdcm-2.2.0.orig/Source/DataDictionary/gdcmGlobal.cxx	2012-03-21 21:54:04.000000000 +0100
++++ gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx	2012-03-21 21:54:20.000000000 +0100
 @@ -131,6 +131,10 @@
    return true;
  }
@@ -30,10 +30,36 @@
  const char *Global::Locate(const char *resfile) const
  {
  #ifdef _WIN32
+Index: gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/socketxx/socket++/sockstream.h	2012-03-21 21:54:19.000000000 +0100
++++ gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h	2012-03-21 21:54:20.000000000 +0100
+@@ -165,7 +165,7 @@
+             msg_peek            = MSG_PEEK,
+             msg_dontroute    = MSG_DONTROUTE
+ 
+-#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
+             ,msg_maxiovlen    = MSG_MAXIOVLEN
+ #endif
+         };
+Index: gdcm-2.2.0/Utilities/socketxx/socket++/local.h
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/socketxx/socket++/local.h	2012-03-21 21:54:19.000000000 +0100
++++ gdcm-2.2.0/Utilities/socketxx/socket++/local.h	2012-03-21 21:54:20.000000000 +0100
+@@ -97,7 +97,7 @@
+ //  extern "C" int gethostname (char* hostname, size_t len);
+ // the above breaks on some old MacOSX system where prototype is:
+ //  extern "C" int gethostname (char* hostname, int len);
+-#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
+   extern char* SYS_SIGLIST [];
+ #endif
+ #endif
 Index: gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx
 ===================================================================
---- gdcm-2.2.0.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx	2012-03-20 13:40:05.000000000 +0100
-+++ gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx	2012-03-20 13:40:10.000000000 +0100
+--- gdcm-2.2.0.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx	2012-03-21 21:54:51.000000000 +0100
++++ gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx	2012-03-21 21:54:55.000000000 +0100
 @@ -35,9 +35,7 @@
  #include <arpa/inet.h>
  #endif