diff options
Diffstat (limited to 'devel/gdcm/files')
5 files changed, 14 insertions, 35 deletions
diff --git a/devel/gdcm/files/patch-CMakeLists.txt b/devel/gdcm/files/patch-CMakeLists.txt index cf0640890926..46e14950a63a 100644 --- a/devel/gdcm/files/patch-CMakeLists.txt +++ b/devel/gdcm/files/patch-CMakeLists.txt @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2012-01-02 12:11:48.000000000 +0100 -+++ CMakeLists.txt 2012-01-02 12:13:50.000000000 +0100 -@@ -45,7 +45,7 @@ - "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}") - SET(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES} +--- CMakeLists.txt.orig 2015-08-22 14:09:50 UTC ++++ CMakeLists.txt +@@ -53,7 +53,7 @@ if(NOT DEFINED GDCM_API_VERSION) + endif() + set(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES} VERSION "${GDCM_VERSION}" - SOVERSION "${GDCM_API_VERSION}" + SOVERSION "${GDCM_MAJOR_VERSION}" ) - #SET(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES} + #set(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES} # VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}" diff --git a/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake b/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake index 3980d4c04277..ba3fa4d11a68 100644 --- a/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake +++ b/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake @@ -1,5 +1,5 @@ ---- CMake/FindOpenJPEG.cmake.orig 2014-04-03 09:33:49.000000000 +0200 -+++ CMake/FindOpenJPEG.cmake 2014-06-10 09:34:13.000000000 +0200 +--- CMake/FindOpenJPEG.cmake.orig 2015-08-22 14:09:50 UTC ++++ CMake/FindOpenJPEG.cmake @@ -18,7 +18,15 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) @@ -17,7 +17,7 @@ find_package(OpenJPEG QUIET NO_MODULE) if( NOT OpenJPEG_DIR ) -@@ -51,3 +59,4 @@ +@@ -51,3 +59,4 @@ mark_as_advanced( OPENJPEG_INCLUDE_DIR ) endif() diff --git a/devel/gdcm/files/patch-Source-DataDictionary_gdcmGlobal.cxx b/devel/gdcm/files/patch-Source-DataDictionary_gdcmGlobal.cxx deleted file mode 100644 index eccf73102831..000000000000 --- a/devel/gdcm/files/patch-Source-DataDictionary_gdcmGlobal.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/DataDictionary/gdcmGlobal.cxx.orig 2011-07-07 09:11:27.000000000 +0200 -+++ Source/DataDictionary/gdcmGlobal.cxx 2011-07-07 09:11:56.000000000 +0200 -@@ -45,7 +45,7 @@ - void LoadDefaultPaths() - { - assert( RessourcePaths.empty() ); -- const char filename2[] = GDCM_CMAKE_INSTALL_PREFIX "/" GDCM_INSTALL_DATA_DIR "/XML/"; -+ const char filename2[] = GDCM_INSTALL_DATA_DIR "/XML/"; - RessourcePaths.push_back( filename2 ); - const char *curprocfn = System::GetCurrentProcessFileName(); - if( curprocfn ) diff --git a/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt b/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt deleted file mode 100644 index 452b7b92d234..000000000000 --- a/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- Source/InformationObjectDefinition/CMakeLists.txt.orig 2012-09-21 12:05:25.000000000 +0200 -+++ Source/InformationObjectDefinition/CMakeLists.txt 2012-09-21 12:05:39.000000000 +0200 -@@ -37,6 +37,7 @@ - "${GDCM_SOURCE_DIR}/Source/DataStructureAndEncodingDefinition" - "${GDCM_SOURCE_DIR}/Source/DataDictionary" - "${GDCM_SOURCE_DIR}/Utilities" -+ "${EXPAT_INCLUDE_DIR}" - ) - - ADD_LIBRARY(gdcmIOD ${IOD_SRCS}) diff --git a/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt b/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt index 180313141957..239580ecc968 100644 --- a/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt +++ b/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt @@ -1,8 +1,8 @@ ---- Utilities/gdcmjpeg/CMakeLists.txt.orig 2012-09-19 15:48:46.000000000 +0200 -+++ Utilities/gdcmjpeg/CMakeLists.txt 2012-09-19 15:49:31.000000000 +0200 -@@ -23,7 +23,7 @@ - ENDIF(NOT DEFINED JPEG_API_VERSION) - SET(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES} +--- Utilities/gdcmjpeg/CMakeLists.txt.orig 2015-08-22 14:09:50 UTC ++++ Utilities/gdcmjpeg/CMakeLists.txt +@@ -24,7 +24,7 @@ if(NOT DEFINED JPEG_API_VERSION) + endif() + set(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES} VERSION "${GDCM_VERSION}" - SOVERSION "${JPEG_API_VERSION}" + SOVERSION "${GDCM_MAJOR_VERSION}" |