Author: malat-guest
Date: 2009-07-08 09:24:55 +0000 (Wed, 08 Jul 2009)
New Revision: 3597
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
Log:
Fix swig/C# wrapper to load gdcmsharpglue (instead of gdcm)
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2009-07-08 08:02:07 UTC (rev
3596)
+++ trunk/packages/gdcm/trunk/debian/changelog 2009-07-08 09:24:55 UTC (rev
3597)
@@ -1,6 +1,7 @@
gdcm (2.0.12-4) unstable; urgency=low
* Another attempt at fixing armel
+ * Fix swig/C# wrapper to load gdcmsharpglue (instead of gdcm)
* Reactivate the missing gcc44.patch (gdcm svn rev: 5852).
Thanks to Andrea Gasparini for report
Modified: trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch 2009-07-08
08:02:07 UTC (rev 3596)
+++ trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch 2009-07-08
09:24:55 UTC (rev 3597)
@@ -1,7 +1,30 @@
See debian bug #533193
+--- gdcm-2-0-12.orig/Wrapping/Csharp/CMakeLists.txt 2009-07-07
15:56:10.000000000 +0200
++++ gdcm-2-0-12/Wrapping/Csharp/CMakeLists.txt 2009-07-07 15:51:31.000000000
+0200
+@@ -34,7 +34,7 @@
+ # Some old swig 1.3 did not support this option:
+ #SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}")
+
+-SET(CMAKE_SWIG_FLAGS "-namespace gdcm")
++SET(CMAKE_SWIG_FLAGS "-namespace gdcm -dllimport gdcmsharpglue")
+ SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
+ # libgdksharpglue.so
+ SWIG_ADD_MODULE(gdcmsharpglue csharp gdcm.i)
--- gdcm-2.0.12.orig/Utilities/VTK/CMakeLists.txt (revision 5834)
+++ gdcm-2.0.12/Utilities/VTK/CMakeLists.txt (working copy)
+@@ -145,9 +159,9 @@
+ SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES CPLUSPLUS ON)
+ #SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES COMPILE_FLAGS
-DUSEACTIVIZ)
+ IF(GDCM_USE_ACTIVIZ)
+- SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -DUSEACTIVIZ")
++ SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue
-DUSEACTIVIZ")
+ ELSE(GDCM_USE_ACTIVIZ)
+- SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm")
++ SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue")
+ ENDIF(GDCM_USE_ACTIVIZ)
+ SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
+ SWIG_ADD_MODULE(vtkgdcmsharpglue csharp vtkgdcm.i)
@@ -235,9 +235,13 @@
# Create the jar file:
# I am pretty sure this *.java thingy will byte me one day, when someone
will try
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
