Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (3)
d/p: Update patches
· 658a5bdd
Gert Wollny
authored
Jul 09, 2019
658a5bdd
d/p: re-add charLS-2.0 fix
· dab12370
Gert Wollny
authored
Jul 11, 2019
dab12370
Update d/changelog
· 36e6c8ea
Gert Wollny
authored
Jul 11, 2019
36e6c8ea
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
36e6c8ea
...
...
@@ -3,8 +3,9 @@ gdcm (3.0.0-1) UNRELEASED; urgency=medium
* d/watch: update to version 4 of watch file
* New upstream version 3.0.0
* d/ Update to new 3.0 so version
* d/p: Update patches
-- Gert Wollny <gewo@debian.org> T
ue, 09
Jul 2019
09:17:52
+0200
-- Gert Wollny <gewo@debian.org> T
hu, 11
Jul 2019
12:43:29
+0200
gdcm (2.8.9-1~exp1) experimental; urgency=medium
...
...
debian/patches/series
View file @
36e6c8ea
02_fixhurd.patch
03_linkvtkdoc.patch
04_multiarch.patch
use_system_findjni.patch
unforce_cxx98.patch
#
use_system_findjni.patch
#
unforce_cxx98.patch
use_swig_add_library_for_csharp.patch
enable_ninja_build.patch
add_cxx11_vtk_defines.patch
...
...
debian/patches/unforce_cxx98.patch
deleted
100644 → 0
View file @
f33c6ed2
Description: removed the forced -std=c++98
GDCM includes headers that require at least -std=c++11
Author: Gert Wollny <gewo@debian.org>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,6 @@
cmake_policy(SET CMP0074 NEW)
endif()
project(GDCM)
-set(CMAKE_CXX_STANDARD 98)
set(CMAKE_CXX_EXTENSIONS OFF)
mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BUILD_TYPE CMAKE_INSTALL_PREFIX)
set(GDCM_CMAKE_DIR "${GDCM_SOURCE_DIR}/CMake" CACHE INTERNAL "")
debian/patches/use_swig_add_library_for_csharp.patch
View file @
36e6c8ea
...
...
@@ -2,7 +2,7 @@ Description: Use_swig_add_library_for_csharp
Author: Gert Wollny <gewo@debian.org>
--- a/Wrapping/Csharp/CMakeLists.txt
+++ b/Wrapping/Csharp/CMakeLists.txt
@@ -2
3
,7 +2
3
,8 @@
@@ -2
7
,7 +2
7
,8 @@
set(CMAKE_SWIG_FLAGS "-namespace gdcm -dllimport gdcmsharpglue")
separate_arguments(CMAKE_SWIG_FLAGS)
# libgdksharpglue.so
...
...
debian/patches/use_system_findjni.patch
deleted
100644 → 0
View file @
f33c6ed2
Description: Use_system_findjni
--- a/CMake/FindJNI.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright (c) 2006-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# Make sure to not use FindJNI anymore and prefer FindJavaProperties
-find_package(JavaProperties REQUIRED)
-find_path(JAVA_INCLUDE_PATH jni.h
- ${JavaProp_JAVA_HOME}/../include
-)
-
-string(TOLOWER ${JavaProp_OS_NAME} include_os_name) # Linux -> linux
-set(JAVA_JNI_MD_INCLUDE_DIRECTORIES
- ${JAVA_INCLUDE_PATH}/${include_os_name}
- ${JAVA_INCLUDE_PATH}/win32 # win32
- ${JAVA_INCLUDE_PATH}/linux # kFreeBSD
- ${JAVA_INCLUDE_PATH}/solaris # SunOS
- )
-find_path(JAVA_INCLUDE_PATH2 jni_md.h
- ${JAVA_JNI_MD_INCLUDE_DIRECTORIES}
- )
-
-find_path(JAVA_AWT_INCLUDE_PATH jawt.h
- ${JAVA_INCLUDE_PATH}
-)
-
-set(JAVA_AWT_LIBRARY_DIRECTORIES
- ${JavaProp_SUN_BOOT_LIBRARY_PATH} # works for linux
- ${JavaProp_JAVA_HOME}/../lib # works for win32
- )
-
-foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
- set(JAVA_JVM_LIBRARY_DIRECTORIES
- ${JAVA_JVM_LIBRARY_DIRECTORIES}
- "${dir}"
- "${dir}/client"
- "${dir}/server"
- )
-endforeach()
-
-find_library(JAVA_AWT_LIBRARY NAMES jawt
- PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
- )
-
-find_library(JAVA_JVM_LIBRARY NAMES jvm JavaVM
- PATHS ${JAVA_JVM_LIBRARY_DIRECTORIES}
- )
-
-# on linux I get this annoying error:
-# Exception in thread "main" java.lang.UnsatisfiedLinkError: libvtkgdcmJava.so:
-# libmawt.so: cannot open shared object file: No such file or directory
-
-# let's find this lib here then
-if(UNIX)
- find_library(JAVA_MAWT_LIBRARY NAMES mawt
- # there is one also in headless but it does not work...
- PATHS ${JavaProp_SUN_BOOT_LIBRARY_PATH}/xawt
- )
-endif()
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI DEFAULT_MSG JAVA_AWT_LIBRARY JAVA_JVM_LIBRARY
- JAVA_INCLUDE_PATH JAVA_INCLUDE_PATH2 JAVA_AWT_INCLUDE_PATH)
-
-mark_as_advanced(
- JAVA_AWT_LIBRARY
- JAVA_MAWT_LIBRARY
- JAVA_JVM_LIBRARY
- JAVA_AWT_INCLUDE_PATH
- JAVA_INCLUDE_PATH
- JAVA_INCLUDE_PATH2
-)
-
-set(JNI_LIBRARIES
- ${JAVA_AWT_LIBRARY}
- ${JAVA_JVM_LIBRARY}
-)
-
-set(JNI_INCLUDE_DIRS
- ${JAVA_INCLUDE_PATH}
- ${JAVA_INCLUDE_PATH2}
- ${JAVA_AWT_INCLUDE_PATH}
-)