[med-svn] r9146 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-03 16:15:59 +0000 (Tue, 03 Jan 2012)
New Revision: 9146

Added:
   trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/series
Log:
Fix comp?\195?\169

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2012-01-03 14:20:02 UTC (rev 9145)
+++ trunk/packages/gdcm/trunk/debian/changelog	2012-01-03 16:15:59 UTC (rev 9146)
@@ -1,3 +1,10 @@
+gdcm (2.0.19-2) UNRELEASED; urgency=low
+
+  * Fix compilation on kFreeBSD when using gcj
+    - debian/patches/fixgcj.patch
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 03 Jan 2012 17:15:04 +0100
+
 gdcm (2.0.19-1) unstable; urgency=low
 
   * New upstream: 2.0.19

Added: trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/fixgcj.patch	2012-01-03 16:15:59 UTC (rev 9146)
@@ -0,0 +1,25 @@
+From 5263b20bb4ea628f850c8f3b0d5c1d8a5f2163a2 Mon Sep 17 00:00:00 2001
+From: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Date: Tue, 3 Jan 2012 17:09:13 +0100
+Subject: [PATCH] Need to explicitely state we need 1.5 for generic
+
+---
+ CMake/FindJavaProperties.cmake |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMake/FindJavaProperties.cmake b/CMake/FindJavaProperties.cmake
+index cfc48a8..14e9c62 100644
+--- a/CMake/FindJavaProperties.cmake
++++ b/CMake/FindJavaProperties.cmake
+@@ -57,7 +57,7 @@ if(${current_list_path}/GetSystemProperty.java IS_NEWER_THAN ${CMAKE_BINARY_DIR}
+   #message("${current_list_path}/GetSystemProperty.java")
+   #message("${CMAKE_CURRENT_BINARY_DIR}/GetSystemProperty.class")
+   execute_process(
+-    COMMAND ${Java_JAVAC_EXECUTABLE}
++    COMMAND ${Java_JAVAC_EXECUTABLE} -source 1.5
+     ${current_list_path}/GetSystemProperty.java -d ${CMAKE_BINARY_DIR}
+     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+     )
+-- 
+1.7.4.1
+

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2012-01-03 14:20:02 UTC (rev 9145)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2012-01-03 16:15:59 UTC (rev 9146)
@@ -1,2 +1,3 @@
 toplevelskip.patch
 #removedocfromall.patch
+fixgcj.patch