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

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-02-01 13:52:38 +0000 (Wed, 01 Feb 2012)
New Revision: 9520

Modified:
   trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch
   trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch
Log:
another set of change for kfreebsd

Modified: trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch	2012-02-01 13:35:58 UTC (rev 9519)
+++ trunk/packages/gdcm/trunk/debian/patches/kfreebsdfix.patch	2012-02-01 13:52:38 UTC (rev 9520)
@@ -1,28 +1,44 @@
 Index: gdcm-2.2.0/Utilities/socketxx/socket++/local.h
 ===================================================================
---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/local.h	2012-01-28 15:41:05.000000000 +0100
-+++ gdcm-2.2.0/Utilities/socketxx/socket++/local.h	2012-01-28 15:41:25.000000000 +0100
-@@ -98,7 +98,7 @@
+--- gdcm-2.2.0.orig/Utilities/socketxx/socket++/local.h	2012-02-01 14:51:59.000000000 +0100
++++ gdcm-2.2.0/Utilities/socketxx/socket++/local.h	2012-02-01 14:52:04.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(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
--  extern char* SYS_SIGLIST [];
-+//  extern char* SYS_SIGLIST [];
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || 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-02-01 14:51:59.000000000 +0100
++++ gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx	2012-02-01 14:52:04.000000000 +0100
+@@ -28,6 +28,13 @@
+ #include "gdcmULConnectionInfo.h"
+ #include <socket++/sockinet.h>//for setting up the local socket
  
++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) // inet_addr
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#endif
++
+ #if defined (__APPLE__)
+ #include <arpa/inet.h> // inet_addr
+ #endif
 Index: gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h
 ===================================================================
---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/sockstream.h	2012-01-28 15:41:55.000000000 +0100
-+++ gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h	2012-01-28 15:42:48.000000000 +0100
-@@ -166,8 +166,10 @@
+--- gdcm-2.2.0.orig/Utilities/socketxx/socket++/sockstream.h	2012-02-01 14:51:59.000000000 +0100
++++ gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h	2012-02-01 14:52:04.000000000 +0100
+@@ -165,7 +165,7 @@
+             msg_peek            = MSG_PEEK,
              msg_dontroute    = MSG_DONTROUTE
  
- #if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
-+#ifdef MSG_MAXIOVLEN
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||| defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
              ,msg_maxiovlen    = MSG_MAXIOVLEN
  #endif
-+#endif
          };
-         enum shuthow {
-             shut_read,

Modified: trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch	2012-02-01 13:35:58 UTC (rev 9519)
+++ trunk/packages/gdcm/trunk/debian/patches/removepythonlink.patch	2012-02-01 13:52:38 UTC (rev 9520)
@@ -1,7 +1,7 @@
 Index: gdcm-2.2.0/Wrapping/Python/CMakeLists.txt
 ===================================================================
---- gdcm-2.2.0.orig/Wrapping/Python/CMakeLists.txt	2012-01-31 17:05:42.000000000 +0100
-+++ gdcm-2.2.0/Wrapping/Python/CMakeLists.txt	2012-01-31 17:05:52.000000000 +0100
+--- gdcm-2.2.0.orig/Wrapping/Python/CMakeLists.txt	2012-02-01 14:51:58.000000000 +0100
++++ gdcm-2.2.0/Wrapping/Python/CMakeLists.txt	2012-02-01 14:52:09.000000000 +0100
 @@ -83,7 +83,7 @@
  # the other gdcm lib. bad !!!
  #SET (SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS ${SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/docstrings.i)