PR#5: Update to 3.0.1 - rpms/gdcm - src.fedoraproject.org

rpms / gdcm

#5 Update to 3.0.1

Closed 4 years ago by ankursinha. Opened 4 years ago by ankursinha.

rpms/ ankursinha/gdcm gdcm-3.0.1 into master

Ankur Sinha (Ankur Sinha Gmail) • 4 years ago

19d22a7

.gitignore

file modified

		`@@ -20,3 +20,5 @@`
		`/gdcm-2.8.4.tar.bz2`
		`/gdcm-2.8.8.tar.gz`
		`/gdcm-2.8.9.tar.gz`
		`+ /gdcm-3.0.0.tar.gz`
		`+ /gdcm-3.0.1.tar.gz`

0001-3.0.1-Use-copyright.patch ~~0001-Use-copyright.patch~~

file renamed

+6 -6

		`@@ -1,14 +1,14 @@`
		`- From 589f726562dbd7f1dc0145deb00a768a6e924808 Mon Sep 17 00:00:00 2001`
		`+ From 541353ba279245fb0297f50dcb23d2da0d45cdc4 Mon Sep 17 00:00:00 2001`
		`From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>`
		`- Date: Sun, 17 Feb 2019 18:27:19 +0000`
		`- Subject: [PATCH 1/7] Use copyright`
		`+ Date: Sun, 28 Jul 2019 16:38:52 +0100`
		`+ Subject: [PATCH] 3.0.1 Use copyright`

		`---`
		`CMake/UseCopyright.cmake \| 6 ++++--`
		`1 file changed, 4 insertions(+), 2 deletions(-)`

		`diff --git a/CMake/UseCopyright.cmake b/CMake/UseCopyright.cmake`
		`- index fb4fe1fad..b66736522 100644`
		`+ index fb4fe1fad..d8bc8e8cb 100644`
		`--- a/CMake/UseCopyright.cmake`
		`+++ b/CMake/UseCopyright.cmake`
		`@@ -18,8 +18,10 @@ macro(APPEND_COPYRIGHT)`
		`@@ -20,10 +20,10 @@`
		`+ if(EXISTS ${filename} )`
		`+ file(READ ${filename} content)`
		`+ file(APPEND ${COPYRIGHT_MODULE_FILENAME} ${content})`
		`- + endif()`
		`+ + endif()`
		`endforeach()`
		`endif()`
		`endmacro()`
		`--`
		`- 2.20.1`
		`+ 2.21.0`

0002-Increase-xslt-maxdepth.patch

file removed

-25

		`@@ -1,25 +0,0 @@`
		`- From b50d2402d588ab5c67da3051109a836287bcd742 Mon Sep 17 00:00:00 2001`
		`- From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>`
		`- Date: Sun, 17 Feb 2019 18:27:43 +0000`
		`- Subject: [PATCH 2/7] Increase xslt maxdepth`
		`-`
		`- ---`
		`- Utilities/doxygen/CMakeLists.txt \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/Utilities/doxygen/CMakeLists.txt b/Utilities/doxygen/CMakeLists.txt`
		`- index 5281bee8e..e192f34a3 100644`
		`- --- a/Utilities/doxygen/CMakeLists.txt`
		`- +++ b/Utilities/doxygen/CMakeLists.txt`
		`- @@ -252,7 +252,7 @@ find_package(LibXslt)`
		`- if(LIBXSLT_XSLTPROC_EXECUTABLE)`
		`- set(XSLT_PROCESSOR ${LIBXSLT_XSLTPROC_EXECUTABLE})`
		`- # http://docbook.sourceforge.net/release/xsl/current/doc/manpages/man.output.quietly.html`
		`- - set(XSLT_PROCESSOR_ARG --param man.output.quietly 1)`
		`- + set(XSLT_PROCESSOR_ARG --param man.output.quietly 1 --maxdepth 5000)`
		`- # User can change the behavior at cmake time:`
		`- if(NOT DEFINED GDCM_MANPAGES_USE_NONET)`
		`- set(GDCM_MANPAGES_USE_NONET FALSE)`
		`- --`
		`- 2.20.1`
		`-`

0003-Use-add_subdirectories-instead-of-deprecated-subdirs.patch

file removed

-523

		`@@ -1,523 +0,0 @@`
		`- From 06ad1df56f41b2cf4718307e9c2a15f929010925 Mon Sep 17 00:00:00 2001`
		`- From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>`
		`- Date: Sun, 17 Feb 2019 19:53:12 +0000`
		`- Subject: [PATCH 3/7] Use add_subdirectories instead of deprecated subdirs`
		`-`
		`- ---`
		`- Applications/CMakeLists.txt \| 2 +-`
		`- CMakeLists.txt \| 16 ++++++-------`
		`- Examples/CMakeLists.txt \| 10 ++++----`
		`- Source/CMakeLists.txt \| 16 ++++++-------`
		`- Testing/CMakeLists.txt \| 4 +---`
		`- Testing/Source/CMakeLists.txt \| 16 ++++++-------`
		`- Testing/Source/Common/CMakeLists.txt \| 4 ++--`
		`- Testing/Source/DataDictionary/CMakeLists.txt \| 4 ++--`
		`- .../CMakeLists.txt \| 6 ++---`
		`- .../CMakeLists.txt \| 4 ++--`
		`- .../MediaStorageAndFileFormat/CMakeLists.txt \| 6 ++---`
		`- .../MessageExchangeDefinition/CMakeLists.txt \| 2 +-`
		`- Utilities/CMakeLists.txt \| 24 +++++++++----------`
		`- Utilities/VTK/CMakeLists.txt \| 6 ++---`
		`- Utilities/VTK/Examples/CMakeLists.txt \| 8 +++----`
		`- Utilities/VTK/Testing/CMakeLists.txt \| 6 ++---`
		`- Utilities/doxygen/CMakeLists.txt \| 2 +-`
		`- Utilities/gdcmexpat/CMakeLists.txt \| 2 +-`
		`- Utilities/gdcmjpeg/CMakeLists.txt \| 4 +++-`
		`- Wrapping/CMakeLists.txt \| 10 ++++----`
		`- 20 files changed, 74 insertions(+), 78 deletions(-)`
		`-`
		`- diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt`
		`- index ccbaece9f..35f9732a9 100644`
		`- --- a/Applications/CMakeLists.txt`
		`- +++ b/Applications/CMakeLists.txt`
		`- @@ -1 +1 @@`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`- diff --git a/CMakeLists.txt b/CMakeLists.txt`
		`- index f82bfd251..86a4f6751 100644`
		`- --- a/CMakeLists.txt`
		`- +++ b/CMakeLists.txt`
		`- @@ -205,7 +205,7 @@ if(NOT GDCM_HAVE_STDINT_H)`
		`- "${GDCM_SOURCE_DIR}/Utilities/C99"`
		`- )`
		`- # Process the install rules from C99`
		`- - subdirs(Utilities/C99)`
		`- + add_subdirectory(Utilities/C99)`
		`- endif()`
		`- endif()`
		`-`
		`- @@ -602,11 +602,11 @@ if(GDCM_STANDALONE)`
		`- else()`
		`- set(BUILD_APPLICATIONS OFF)`
		`- endif()`
		`- -subdirs(Utilities)`
		`- +add_subdirectory(Utilities)`
		`- add_subdirectory(Source)`
		`-`
		`- if(GDCM_STANDALONE)`
		`- - subdirs(Wrapping)`
		`- + add_subdirectory(Wrapping)`
		`- if(GDCM_WRAP_CSHARP)`
		`- add_subdirectory(Wrapping/Csharp)`
		`- endif()`
		`- @@ -615,7 +615,7 @@ endif()`
		`- if(GDCM_STANDALONE)`
		`- # After Wrapping please`
		`- if(BUILD_EXAMPLES)`
		`- - subdirs(Examples)`
		`- + add_subdirectory(Examples)`
		`- endif()`
		`- endif()`
		`-`
		`- @@ -655,7 +655,7 @@ if(GDCM_STANDALONE)`
		`- mark_as_advanced(DART_TESTING_TIMEOUT)`
		`- enable_testing()`
		`- include(CTest)`
		`- - subdirs(Testing)`
		`- + add_subdirectory(Testing)`
		`- if(NOT GDCM_DATA_ROOT)`
		`- message("If you want to build the test suite, you must set GDCM_DATA_ROOT (advanced option) "`
		`- "to the full path name of the gdcmData directory; if you don't want, disable GDCM_BUILD_TESTING.\n"`
		`- @@ -687,7 +687,7 @@ if(GDCM_STANDALONE)`
		`- mark_as_advanced(VTK_DIR)`
		`- set(GDCM_VTK_DIR ${VTK_DIR})`
		`- mark_as_advanced(GDCM_USE_PARAVIEW)`
		`- - subdirs(Utilities/VTK)`
		`- + add_subdirectory(Utilities/VTK)`
		`- endif()`
		`- endif()`
		`-`
		`- @@ -696,7 +696,7 @@ if(GDCM_STANDALONE)`
		`- option(GDCM_BUILD_APPLICATIONS "apps ?" OFF)`
		`- set(BUILD_APPLICATIONS ${GDCM_BUILD_APPLICATIONS})`
		`- if(BUILD_APPLICATIONS)`
		`- - subdirs(Applications)`
		`- + add_subdirectory(Applications)`
		`- endif()`
		`- else()`
		`- set(BUILD_APPLICATIONS OFF)`
		`- @@ -1051,5 +1051,5 @@ if(GDCM_USE_VTK)`
		`- endif()`
		`- set(GDCM_LIBRARY_DIRS ${LIBRARY_OUTPUT_PATH})`
		`- if(GDCM_STANDALONE)`
		`- -subdirs(CMake/ExportConfiguration)`
		`- +add_subdirectory(CMake/ExportConfiguration)`
		`- endif()`
		`- diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt`
		`- index 8ac324abf..ca76e1bad 100644`
		`- --- a/Examples/CMakeLists.txt`
		`- +++ b/Examples/CMakeLists.txt`
		`- @@ -2,18 +2,18 @@ cmake_minimum_required(VERSION 2.8.7)`
		`-`
		`- # Choose behavior based on whether we are building inside the GDCM tree.`
		`- if(GDCM_BINARY_DIR)`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(GDCM_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`-`
		`- if(GDCM_WRAP_CSHARP)`
		`- - subdirs(Csharp)`
		`- + add_subdirectory(Csharp)`
		`- endif()`
		`-`
		`- if(GDCM_WRAP_JAVA)`
		`- - subdirs(Java)`
		`- + add_subdirectory(Java)`
		`- endif()`
		`-`
		`- else()`
		`- @@ -25,6 +25,6 @@ else()`
		`- find_package(GDCM REQUIRED)`
		`- include(${GDCM_USE_FILE})`
		`-`
		`- - subdirs(Cxx)`
		`- + add_subdirectory(Cxx)`
		`-`
		`- endif()`
		`- diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt`
		`- index 7e1586754..e8011d6fd 100644`
		`- --- a/Source/CMakeLists.txt`
		`- +++ b/Source/CMakeLists.txt`
		`- @@ -1,10 +1,8 @@`
		`- # ...`
		`- -subdirs(`
		`- - Common`
		`- - Attribute`
		`- - DataDictionary`
		`- - DataStructureAndEncodingDefinition`
		`- - InformationObjectDefinition`
		`- - MediaStorageAndFileFormat`
		`- - MessageExchangeDefinition`
		`- - )`
		`- +add_subdirectory(Common)`
		`- +add_subdirectory(Attribute)`
		`- +add_subdirectory(DataDictionary)`
		`- +add_subdirectory(DataStructureAndEncodingDefinition)`
		`- +add_subdirectory(InformationObjectDefinition)`
		`- +add_subdirectory(MediaStorageAndFileFormat)`
		`- +add_subdirectory(MessageExchangeDefinition)`
		`- diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt`
		`- index 66fc2da4f..79359b327 100644`
		`- --- a/Testing/CMakeLists.txt`
		`- +++ b/Testing/CMakeLists.txt`
		`- @@ -2,9 +2,7 @@`
		`- find_package(DCMTK)`
		`- find_package(DICOM3TOOLS)`
		`-`
		`- -subdirs(`
		`- - Source`
		`- - )`
		`- +add_subdirectory(Source)`
		`-`
		`- #-----------------------------------------------------------------------------`
		`- # Here is one cool test: you can pretty much test all configuration using`
		`- diff --git a/Testing/Source/CMakeLists.txt b/Testing/Source/CMakeLists.txt`
		`- index 6d1a4649c..e7986b787 100644`
		`- --- a/Testing/Source/CMakeLists.txt`
		`- +++ b/Testing/Source/CMakeLists.txt`
		`- @@ -8,12 +8,10 @@ get_directory_property(gdcm_data_image_filenames_glob DIRECTORY Data DEFINITION`
		`- get_directory_property(gdcm_data_filenames_glob DIRECTORY Data DEFINITION GDCM_DATA_FILENAMES_GLOB)`
		`- get_directory_property(black_list_reader DIRECTORY Data DEFINITION BLACK_LIST_READER)`
		`-`
		`- -subdirs(`
		`- - Attribute`
		`- - Common`
		`- - DataDictionary`
		`- - DataStructureAndEncodingDefinition`
		`- - InformationObjectDefinition`
		`- - MediaStorageAndFileFormat`
		`- - MessageExchangeDefinition`
		`- -)`
		`- +add_subdirectory(Attribute)`
		`- +add_subdirectory(Common)`
		`- +add_subdirectory(DataDictionary)`
		`- +add_subdirectory(DataStructureAndEncodingDefinition)`
		`- +add_subdirectory(InformationObjectDefinition)`
		`- +add_subdirectory(MediaStorageAndFileFormat)`
		`- +add_subdirectory(MessageExchangeDefinition)`
		`- diff --git a/Testing/Source/Common/CMakeLists.txt b/Testing/Source/Common/CMakeLists.txt`
		`- index 5fee2e107..1577b6b2a 100644`
		`- --- a/Testing/Source/Common/CMakeLists.txt`
		`- +++ b/Testing/Source/Common/CMakeLists.txt`
		`- @@ -1,5 +1,5 @@`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(GDCM_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`- diff --git a/Testing/Source/DataDictionary/CMakeLists.txt b/Testing/Source/DataDictionary/CMakeLists.txt`
		`- index 5fee2e107..1577b6b2a 100644`
		`- --- a/Testing/Source/DataDictionary/CMakeLists.txt`
		`- +++ b/Testing/Source/DataDictionary/CMakeLists.txt`
		`- @@ -1,5 +1,5 @@`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(GDCM_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`- diff --git a/Testing/Source/DataStructureAndEncodingDefinition/CMakeLists.txt b/Testing/Source/DataStructureAndEncodingDefinition/CMakeLists.txt`
		`- index 2e31593f3..583adbe2f 100644`
		`- --- a/Testing/Source/DataStructureAndEncodingDefinition/CMakeLists.txt`
		`- +++ b/Testing/Source/DataStructureAndEncodingDefinition/CMakeLists.txt`
		`- @@ -1,9 +1,9 @@`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(GDCM_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`-`
		`- if(GDCM_WRAP_JAVA)`
		`- - subdirs(Java)`
		`- + add_subdirectory(Java)`
		`- endif()`
		`- diff --git a/Testing/Source/InformationObjectDefinition/CMakeLists.txt b/Testing/Source/InformationObjectDefinition/CMakeLists.txt`
		`- index 5fee2e107..1577b6b2a 100644`
		`- --- a/Testing/Source/InformationObjectDefinition/CMakeLists.txt`
		`- +++ b/Testing/Source/InformationObjectDefinition/CMakeLists.txt`
		`- @@ -1,5 +1,5 @@`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(GDCM_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`- diff --git a/Testing/Source/MediaStorageAndFileFormat/CMakeLists.txt b/Testing/Source/MediaStorageAndFileFormat/CMakeLists.txt`
		`- index 515862320..afe32837e 100644`
		`- --- a/Testing/Source/MediaStorageAndFileFormat/CMakeLists.txt`
		`- +++ b/Testing/Source/MediaStorageAndFileFormat/CMakeLists.txt`
		`- @@ -1,10 +1,10 @@`
		`- # Always`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(GDCM_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`-`
		`- if(GDCM_WRAP_CSHARP)`
		`- - subdirs(Csharp)`
		`- + add_subdirectory(Csharp)`
		`- endif()`
		`- diff --git a/Testing/Source/MessageExchangeDefinition/CMakeLists.txt b/Testing/Source/MessageExchangeDefinition/CMakeLists.txt`
		`- index ccbaece9f..35f9732a9 100644`
		`- --- a/Testing/Source/MessageExchangeDefinition/CMakeLists.txt`
		`- +++ b/Testing/Source/MessageExchangeDefinition/CMakeLists.txt`
		`- @@ -1 +1 @@`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`- diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt`
		`- index ab685cb56..054ec525b 100644`
		`- --- a/Utilities/CMakeLists.txt`
		`- +++ b/Utilities/CMakeLists.txt`
		`- @@ -8,7 +8,7 @@ if(NOT GDCM_USE_SYSTEM_LJPEG)`
		`- set(JPEG_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(JPEG_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- set(JPEG_INSTALL_INCLUDE_DIR ${GDCM_INSTALL_INCLUDE_DIR}/gdcmjpeg)`
		`- - subdirs(gdcmjpeg)`
		`- + add_subdirectory(gdcmjpeg)`
		`- endif()`
		`-`
		`- # Do expat`
		`- @@ -18,7 +18,7 @@ if(NOT GDCM_USE_SYSTEM_EXPAT)`
		`- set(EXPAT_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES})`
		`- set(EXPAT_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(EXPAT_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- - subdirs(gdcmexpat)`
		`- + add_subdirectory(gdcmexpat)`
		`- endif()`
		`-`
		`- # Do openjpeg (jpeg2000 implementation)`
		`- @@ -29,7 +29,7 @@ if(NOT GDCM_USE_SYSTEM_OPENJPEG)`
		`- set(OPENJPEG_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(OPENJPEG_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- set(OPENJPEG_INSTALL_INCLUDE_DIR ${GDCM_INSTALL_INCLUDE_DIR}/gdcmopenjpeg)`
		`- - subdirs(gdcmopenjpeg)`
		`- + add_subdirectory(gdcmopenjpeg)`
		`- mark_as_advanced(BUILD_JPIP BUILD_JPWL BUILD_CODEC BUILD_DOC BUILD_MJ2 BUILD_PKGCONFIG_FILES BUILD_SHARED_LIBS BUILD_THIRDPARTY OPJ_DATA_ROOT OPJ_DISABLE_TPSOT_FIX)`
		`- endif()`
		`-`
		`- @@ -42,7 +42,7 @@ if(NOT GDCM_USE_SYSTEM_CHARLS)`
		`- set(CHARLS_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(CHARLS_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- set(CHARLS_INSTALL_INCLUDE_DIR ${GDCM_INSTALL_INCLUDE_DIR}/gdcmcharls)`
		`- - subdirs(gdcmcharls)`
		`- + add_subdirectory(gdcmcharls)`
		`- endif()`
		`- endif()`
		`-`
		`- @@ -54,7 +54,7 @@ if(NOT GDCM_USE_SYSTEM_MD5)`
		`- set(MD5_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES})`
		`- set(MD5_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(MD5_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- - subdirs(gdcmmd5)`
		`- + add_subdirectory(gdcmmd5)`
		`- endif()`
		`- endif()`
		`-`
		`- @@ -65,7 +65,7 @@ if(NOT GDCM_USE_SYSTEM_ZLIB)`
		`- set(ZLIB_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES})`
		`- set(ZLIB_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(ZLIB_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- - subdirs(gdcmzlib)`
		`- + add_subdirectory(gdcmzlib)`
		`- endif()`
		`-`
		`- # Do getopt`
		`- @@ -75,10 +75,10 @@ if(WIN32 AND NOT CYGWIN)`
		`- set(GETOPT_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES})`
		`- set(GETOPT_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(GETOPT_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- - subdirs(getopt)`
		`- + add_subdirectory(getopt)`
		`- endif()`
		`-`
		`- -subdirs(doxygen)`
		`- +add_subdirectory(doxygen)`
		`-`
		`- # you could be running mingw32 on linux in which case you do NOT want the gdcmuuid lib`
		`- APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING)`
		`- @@ -88,14 +88,14 @@ if(NOT WIN32 AND NOT MINGW)`
		`- set(UUID_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES})`
		`- set(UUID_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(UUID_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- - subdirs(gdcmuuid)`
		`- + add_subdirectory(gdcmuuid)`
		`- endif()`
		`- endif()`
		`-`
		`- APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/pvrg/COPYING)`
		`- if(GDCM_USE_PVRG)`
		`- if(NOT GDCM_USE_SYSTEM_PVRG)`
		`- - subdirs(pvrg)`
		`- + add_subdirectory(pvrg)`
		`- endif()`
		`- endif()`
		`-`
		`- @@ -116,7 +116,7 @@ APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/C99/COPYING)`
		`- #endif()`
		`-`
		`- #if(GDCM_USE_KWSTYLE)`
		`- - subdirs(KWStyle)`
		`- + add_subdirectory(KWStyle)`
		`- #endif()`
		`-`
		`- if(NOT GDCM_USE_SYSTEM_SOCKETXX)`
		`- @@ -125,7 +125,7 @@ if(NOT GDCM_USE_SYSTEM_SOCKETXX)`
		`- set(SOCKETXX_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})`
		`- set(SOCKETXX_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})`
		`- set(SOCKETXX_INSTALL_INCLUDE_DIR ${GDCM_INSTALL_INCLUDE_DIR}/socketxx)`
		`- - subdirs(socketxx)`
		`- + add_subdirectory(socketxx)`
		`- endif()`
		`-`
		`- add_subdirectory(gdcmrle)`
		`- diff --git a/Utilities/VTK/CMakeLists.txt b/Utilities/VTK/CMakeLists.txt`
		`- index 0431b3ea2..6c3fed0e7 100644`
		`- --- a/Utilities/VTK/CMakeLists.txt`
		`- +++ b/Utilities/VTK/CMakeLists.txt`
		`- @@ -814,15 +814,15 @@ if(GDCM_WRAP_PYTHON)`
		`- endif()`
		`-`
		`- if(BUILD_TESTING)`
		`- - subdirs(Testing)`
		`- + add_subdirectory(Testing)`
		`- endif()`
		`-`
		`- if(BUILD_APPLICATIONS)`
		`- - subdirs(Applications)`
		`- + add_subdirectory(Applications)`
		`- endif()`
		`-`
		`- if(BUILD_EXAMPLES)`
		`- - subdirs(Examples)`
		`- + add_subdirectory(Examples)`
		`- endif()`
		`-`
		`- if(GDCM_USE_PARAVIEW)`
		`- diff --git a/Utilities/VTK/Examples/CMakeLists.txt b/Utilities/VTK/Examples/CMakeLists.txt`
		`- index 0cee6f2e5..9e52e3446 100644`
		`- --- a/Utilities/VTK/Examples/CMakeLists.txt`
		`- +++ b/Utilities/VTK/Examples/CMakeLists.txt`
		`- @@ -1,14 +1,14 @@`
		`- -#subdirs(Cxx Python)`
		`- -subdirs(Cxx)`
		`- +#add_subdirectory(Cxx Python)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(GDCM_WRAP_CSHARP)`
		`- - subdirs(Csharp)`
		`- + add_subdirectory(Csharp)`
		`- endif()`
		`-`
		`- if(GDCM_WRAP_JAVA)`
		`- if(VTK_WRAP_JAVA)`
		`- if(EXISTS ${GDCM_VTK_JAVA_JAR})`
		`- - subdirs(Java)`
		`- + add_subdirectory(Java)`
		`- endif()`
		`- endif()`
		`- endif()`
		`- diff --git a/Utilities/VTK/Testing/CMakeLists.txt b/Utilities/VTK/Testing/CMakeLists.txt`
		`- index a06b19589..5118d2743 100644`
		`- --- a/Utilities/VTK/Testing/CMakeLists.txt`
		`- +++ b/Utilities/VTK/Testing/CMakeLists.txt`
		`- @@ -1,13 +1,13 @@`
		`- -subdirs(Cxx)`
		`- +add_subdirectory(Cxx)`
		`-`
		`- if(VTK_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`-`
		`- if(GDCM_WRAP_JAVA)`
		`- if(VTK_WRAP_JAVA)`
		`- if(EXISTS ${GDCM_VTK_JAVA_JAR})`
		`- - subdirs(Java)`
		`- + add_subdirectory(Java)`
		`- endif()`
		`- endif()`
		`- endif()`
		`- diff --git a/Utilities/doxygen/CMakeLists.txt b/Utilities/doxygen/CMakeLists.txt`
		`- index e192f34a3..55a28e31c 100644`
		`- --- a/Utilities/doxygen/CMakeLists.txt`
		`- +++ b/Utilities/doxygen/CMakeLists.txt`
		`- @@ -221,7 +221,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/latex/Makefile`
		`- if(GDCM_VTK_DOCUMENTATION)`
		`- set(BUILD_DOCUMENTATION 1)`
		`- endif()`
		`- - subdirs(vtk)`
		`- + add_subdirectory(vtk)`
		`- endif()`
		`- endif()`
		`-`
		`- diff --git a/Utilities/gdcmexpat/CMakeLists.txt b/Utilities/gdcmexpat/CMakeLists.txt`
		`- index 9c86fb569..a1685476d 100644`
		`- --- a/Utilities/gdcmexpat/CMakeLists.txt`
		`- +++ b/Utilities/gdcmexpat/CMakeLists.txt`
		`- @@ -45,4 +45,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/expat_mangle.h.in`
		`-`
		`- # for expat_config.h`
		`- include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})`
		`- -subdirs(lib)`
		`- +add_subdirectory(lib)`
		`- diff --git a/Utilities/gdcmjpeg/CMakeLists.txt b/Utilities/gdcmjpeg/CMakeLists.txt`
		`- index c687acd09..bfcc94b88 100644`
		`- --- a/Utilities/gdcmjpeg/CMakeLists.txt`
		`- +++ b/Utilities/gdcmjpeg/CMakeLists.txt`
		`- @@ -170,7 +170,9 @@ endforeach()`
		`- # I could not get the depencencies in CMake to work properly so instead`
		`- # have multiple directory for each target that will ensure proper recompilation`
		`- # of the objects files`
		`- -subdirs(8 12 16)`
		`- +add_subdirectory(8)`
		`- +add_subdirectory(12)`
		`- +add_subdirectory(16)`
		`-`
		`- if(NOT JPEG_INSTALL_NO_DEVELOPMENT)`
		`- file(GLOB header_files "*.h")`
		`- diff --git a/Wrapping/CMakeLists.txt b/Wrapping/CMakeLists.txt`
		`- index 89e0f3fdb..aca078b13 100644`
		`- --- a/Wrapping/CMakeLists.txt`
		`- +++ b/Wrapping/CMakeLists.txt`
		`- @@ -1,20 +1,20 @@`
		`- # python`
		`- if(GDCM_WRAP_PYTHON)`
		`- - subdirs(Python)`
		`- + add_subdirectory(Python)`
		`- endif()`
		`- # java`
		`- if(GDCM_WRAP_JAVA)`
		`- - subdirs(Java)`
		`- + add_subdirectory(Java)`
		`- endif()`
		`- # php`
		`- if(GDCM_WRAP_PHP)`
		`- - subdirs(PHP)`
		`- + add_subdirectory(PHP)`
		`- endif()`
		`- # perl`
		`- if(GDCM_WRAP_PERL)`
		`- - subdirs(Perl)`
		`- + add_subdirectory(Perl)`
		`- endif()`
		`- # C#`
		`- if(GDCM_WRAP_CSHARP)`
		`- -# subdirs(Csharp)`
		`- +# add_subdirectory(Csharp)`
		`- endif()`
		`- --`
		`- 2.20.1`
		`-`

0004-Relocate-cmake-file-inclusions.patch

file removed

-65

		`@@ -1,65 +0,0 @@`
		`- From 31ba0efdc107d5f20734c4663ee29789ab051e15 Mon Sep 17 00:00:00 2001`
		`- From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>`
		`- Date: Sun, 17 Feb 2019 20:41:05 +0000`
		`- Subject: [PATCH 4/7] Relocate cmake file inclusions`
		`-`
		`- ---`
		`- CMakeLists.txt \| 9 ---------`
		`- Wrapping/Java/CMakeLists.txt \| 5 +++++`
		`- Wrapping/Python/CMakeLists.txt \| 4 ++++`
		`- 3 files changed, 9 insertions(+), 9 deletions(-)`
		`-`
		`- diff --git a/CMakeLists.txt b/CMakeLists.txt`
		`- index 86a4f6751..c49fe738b 100644`
		`- --- a/CMakeLists.txt`
		`- +++ b/CMakeLists.txt`
		`- @@ -620,21 +620,12 @@ if(GDCM_STANDALONE)`
		`- endif()`
		`-`
		`- #-----------------------------------------------------------------------------`
		`- -# Special CMake Module required when doing Python Testing`
		`- if(GDCM_STANDALONE)`
		`- - if(BUILD_TESTING AND GDCM_WRAP_PYTHON)`
		`- - include(${GDCM_SOURCE_DIR}/CMake/UsePythonTest.cmake)`
		`- - endif()`
		`- -`
		`- # Special CMake Module required when doing C# Testing`
		`- if(BUILD_TESTING AND GDCM_WRAP_CSHARP)`
		`- include(${GDCM_SOURCE_DIR}/CMake/UseCSharpTest.cmake)`
		`- endif()`
		`-`
		`- -# Special CMake Module required when doing Java Testing`
		`- - if(BUILD_TESTING AND GDCM_WRAP_JAVA)`
		`- - include(${GDCM_SOURCE_DIR}/CMake/UseJavaTest.cmake)`
		`- - endif()`
		`- endif()`
		`- #-----------------------------------------------------------------------------`
		`- # Need pthread for the following class:`
		`- diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt`
		`- index b6301128b..e3bccc79e 100644`
		`- --- a/Wrapping/Java/CMakeLists.txt`
		`- +++ b/Wrapping/Java/CMakeLists.txt`
		`- @@ -1,3 +1,8 @@`
		`- +# Special CMake Module required when doing Java Testing`
		`- +if(BUILD_TESTING AND GDCM_WRAP_JAVA)`
		`- + include(${GDCM_SOURCE_DIR}/CMake/UseJavaTest.cmake)`
		`- +endif()`
		`- +`
		`- find_package(SWIG REQUIRED)`
		`- include(${SWIG_USE_FILE})`
		`- option(GDCM_AUTOLOAD_GDCMJNI "Automatically load gdcmjni" ON)`
		`- diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt`
		`- index 3bf724764..f9f706c51 100644`
		`- --- a/Wrapping/Python/CMakeLists.txt`
		`- +++ b/Wrapping/Python/CMakeLists.txt`
		`- @@ -1,3 +1,7 @@`
		`- +# Special CMake Module required when doing Python Testing`
		`- +if(BUILD_TESTING AND GDCM_WRAP_PYTHON)`
		`- + include(${GDCM_SOURCE_DIR}/CMake/UsePythonTest.cmake)`
		`- +endif()`
		`- # Try to rebuild wrapping a little more often:`
		`- include_regular_expression("^(gdcm).*$")`
		`- # TODO:`
		`- --`
		`- 2.20.1`
		`-`

0005-use-cpp-11-standard.patch

file removed

-26

		`@@ -1,26 +0,0 @@`
		`- From eaf7fa5c5a58383b6183d7d32b889771faabd3cd Mon Sep 17 00:00:00 2001`
		`- From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>`
		`- Date: Sun, 17 Feb 2019 20:59:46 +0000`
		`- Subject: [PATCH 5/7] use cpp 11 standard`
		`-`
		`- ---`
		`- CMakeLists.txt \| 3 ++-`
		`- 1 file changed, 2 insertions(+), 1 deletion(-)`
		`-`
		`- diff --git a/CMakeLists.txt b/CMakeLists.txt`
		`- index c49fe738b..c955ee232 100644`
		`- --- a/CMakeLists.txt`
		`- +++ b/CMakeLists.txt`
		`- @@ -18,7 +18,8 @@ if( POLICY CMP0074 )`
		`- cmake_policy(SET CMP0074 NEW)`
		`- endif()`
		`- project(GDCM)`
		`- -set(CMAKE_CXX_STANDARD 98)`
		`- +set(CMAKE_CXX_STANDARD 11)`
		`- +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")`
		`- 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 "")`
		`- --`
		`- 2.20.1`
		`-`

0006-Update-for-new-poppler.patch

file removed

-183

		`@@ -1,183 +0,0 @@`
		`- From 84da37121e7814cf1e5c423cc0779d6df6b1c660 Mon Sep 17 00:00:00 2001`
		`- From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>`
		`- Date: Sun, 17 Feb 2019 21:23:45 +0000`
		`- Subject: [PATCH 6/7] Update for new poppler`
		`-`
		`- ---`
		`- Applications/Cxx/gdcminfo.cxx \| 34 +++++++++++++++++-----------------`
		`- Applications/Cxx/gdcmpdf.cxx \| 12 ++++++------`
		`- 2 files changed, 23 insertions(+), 23 deletions(-)`
		`-`
		`- diff --git a/Applications/Cxx/gdcminfo.cxx b/Applications/Cxx/gdcminfo.cxx`
		`- index 2c510d7df..d9506be4e 100644`
		`- --- a/Applications/Cxx/gdcminfo.cxx`
		`- +++ b/Applications/Cxx/gdcminfo.cxx`
		`- @@ -105,22 +105,22 @@ static int checkdeflated(const char *name)`
		`- return 1;`
		`- }`
		`- in = fopen(name, "r");`
		`- - if (in == NULL)`
		`- + if (in == nullptr)`
		`- {`
		`- fprintf( stderr, "in is NULL\n" );`
		`- return 1;`
		`- }`
		`- buf = (unsigned char*)malloc(size);`
		`- - if (buf != NULL && (size1 = (unsigned long)fread(buf, 1, size, in)) != size) {`
		`- + if (buf != nullptr && (size1 = (unsigned long)fread(buf, 1, size, in)) != size) {`
		`- free(buf);`
		`- - buf = NULL;`
		`- + buf = nullptr;`
		`- fprintf( stderr, "could not fread: %lu bytes != %lu\n", size, size1 );`
		`- fprintf( stderr, "feof: %i ferror %i\n", feof(in), ferror(in) );`
		`- }`
		`- fclose(in);`
		`- len = size;`
		`- source = buf;`
		`- - if( source == NULL ) {`
		`- + if( source == nullptr ) {`
		`- fprintf( stderr, "source is NULL\n" );`
		`- return 1;`
		`- }`
		`- @@ -172,7 +172,7 @@ static int checkdeflated(const char *name)`
		`- printf( "deflate stream has proper length: %lu\n", len );`
		`- }`
		`-`
		`- - ret = puff(NULL, &destlen, source, &sourcelen);`
		`- + ret = puff(nullptr, &destlen, source, &sourcelen);`
		`-`
		`- if (ret)`
		`- fprintf(stdout,"puff() failed with return code %d\n", ret);`
		`- @@ -202,7 +202,7 @@ static std::string getInfoDate(Dict infoDict, const char key)`
		`- #endif`
		`- {`
		`- const GooString* gs = obj.getString();`
		`- - s = gs->getCString();`
		`- + s = gs->c_str();`
		`- if (s[0] == 'D' && s[1] == ':')`
		`- {`
		`- s += 2;`
		`- @@ -258,7 +258,7 @@ static std::string getInfoString(Dict infoDict, const char key, UnicodeMap *uM`
		`- {`
		`- Object obj;`
		`- const GooString *s1;`
		`- - GBool isUnicode;`
		`- + bool isUnicode;`
		`- Unicode u;`
		`- char buf[8];`
		`- int i, n;`
		`- @@ -274,12 +274,12 @@ static std::string getInfoString(Dict infoDict, const char key, UnicodeMap *uM`
		`- if ((s1->getChar(0) & 0xff) == 0xfe &&`
		`- (s1->getChar(1) & 0xff) == 0xff)`
		`- {`
		`- - isUnicode = gTrue;`
		`- + isUnicode = true;`
		`- i = 2;`
		`- }`
		`- else`
		`- {`
		`- - isUnicode = gFalse;`
		`- + isUnicode = false;`
		`- i = 0;`
		`- }`
		`- while (i < obj.getString()->getLength())`
		`- @@ -400,7 +400,7 @@ static int ProcessOneFile( std::string const & filename, gdcm::Defs const & defs`
		`- return 1;`
		`- }`
		`- gdcm::SplitMosaicFilter filter;`
		`- - const gdcm::Image *pimage = NULL;`
		`- + const gdcm::Image *pimage = nullptr;`
		`- const gdcm::Image &image = reader.GetImage();`
		`- if( mosaic )`
		`- {`
		`- @@ -539,10 +539,10 @@ static int ProcessOneFile( std::string const & filename, gdcm::Defs const & defs`
		`- int pages = doc->getNumPages();`
		`- const char *encrypted = doc->isEncrypted() ? "yes" : "no";`
		`- // printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",`
		`- - // doc->okToPrint(gTrue) ? "yes" : "no",`
		`- - // doc->okToCopy(gTrue) ? "yes" : "no",`
		`- - // doc->okToChange(gTrue) ? "yes" : "no",`
		`- - // doc->okToAddNotes(gTrue) ? "yes" : "no");`
		`- + // doc->okToPrint(true) ? "yes" : "no",`
		`- + // doc->okToCopy(true) ? "yes" : "no",`
		`- + // doc->okToChange(true) ? "yes" : "no",`
		`- + // doc->okToAddNotes(true) ? "yes" : "no");`
		`-`
		`- // print linearization info`
		`- const char *optimized = doc->isLinearized() ? "yes" : "no";`
		`- @@ -608,10 +608,10 @@ int main(int argc, char *argv[])`
		`- int version = 0;`
		`- int debug = 0;`
		`- int error = 0;`
		`- - while (1) {`
		`- + while (true) {`
		`- int option_index = 0;`
		`- static struct option long_options[] = {`
		`- - {"input", 1, 0, 0},`
		`- + {"input", 1, nullptr, 0},`
		`- {"recursive", 0, &recursive, 1},`
		`- {"check-deflated", 0, &deflated, 1},`
		`- {"resources-path", 0, &resourcespath, 1},`
		`- @@ -627,7 +627,7 @@ int main(int argc, char *argv[])`
		`- {"error", 0, &error, 1},`
		`- {"help", 0, &help, 1},`
		`- {"version", 0, &version, 1},`
		`- - {0, 0, 0, 0} // required`
		`- + {nullptr, 0, nullptr, 0} // required`
		`- };`
		`- static const char short_options[] = "i:rdVWDEhv";`
		`- c = getopt_long (argc, argv, short_options,`
		`- diff --git a/Applications/Cxx/gdcmpdf.cxx b/Applications/Cxx/gdcmpdf.cxx`
		`- index b3f22b520..15220a34b 100644`
		`- --- a/Applications/Cxx/gdcmpdf.cxx`
		`- +++ b/Applications/Cxx/gdcmpdf.cxx`
		`- @@ -50,7 +50,7 @@ static std::string getInfoDate(Dict infoDict, const char key)`
		`- #endif`
		`- {`
		`- const GooString* gs = obj.getString();`
		`- - s = gs->getCString();`
		`- + s = gs->c_str();`
		`- if (s[0] == 'D' && s[1] == ':')`
		`- {`
		`- s += 2;`
		`- @@ -102,11 +102,11 @@ static std::string getInfoDate(Dict infoDict, const char key)`
		`- return out;`
		`- }`
		`-`
		`- -static std::string getInfoString(Dict infoDict, const char key, UnicodeMap *uMap, GBool & unicode)`
		`- +static std::string getInfoString(Dict infoDict, const char key, UnicodeMap *uMap, bool & unicode)`
		`- {`
		`- Object obj;`
		`- const GooString *s1;`
		`- - GBool isUnicode = gFalse;`
		`- + bool isUnicode = false;`
		`- Unicode u;`
		`- char buf[8];`
		`- int i, n;`
		`- @@ -122,12 +122,12 @@ static std::string getInfoString(Dict infoDict, const char key, UnicodeMap *uM`
		`- if ((s1->getChar(0) & 0xff) == 0xfe &&`
		`- (s1->getChar(1) & 0xff) == 0xff)`
		`- {`
		`- - isUnicode = gTrue;`
		`- + isUnicode = true;`
		`- i = 2;`
		`- }`
		`- else`
		`- {`
		`- - isUnicode = gFalse;`
		`- + isUnicode = false;`
		`- i = 0;`
		`- }`
		`- while (i < obj.getString()->getLength())`
		`- @@ -398,7 +398,7 @@ http://msdn.microsoft.com/en-us/library/078sfkak(VS.80).aspx`
		`- std::string creationdate;`
		`- std::string moddate;`
		`-`
		`- - GBool isUnicode = gFalse;`
		`- + bool isUnicode = false;`
		`- if (doc->isOk())`
		`- {`
		`- #ifdef LIBPOPPLER_NEW_OBJECT_API`
		`- --`
		`- 2.20.1`
		`-`

0007-Use-unversioned-dir.patch

file removed

-25

		`@@ -1,25 +0,0 @@`
		`- From 6f2a780a35e1cfafb238b2eca2e3d28f9cbea3a0 Mon Sep 17 00:00:00 2001`
		`- From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>`
		`- Date: Sun, 17 Feb 2019 22:56:02 +0000`
		`- Subject: [PATCH 7/7] Use unversioned dir`
		`-`
		`- ---`
		`- CMakeLists.txt \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/CMakeLists.txt b/CMakeLists.txt`
		`- index c955ee232..338ed6260 100644`
		`- --- a/CMakeLists.txt`
		`- +++ b/CMakeLists.txt`
		`- @@ -237,7 +237,7 @@ endif()`
		`- # Install directories`
		`-`
		`- string(TOLOWER ${PROJECT_NAME} projectname)`
		`- -set(subdir "${projectname}-${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}")`
		`- +set(subdir "${projectname}")`
		`-`
		`- if(NOT GDCM_INSTALL_BIN_DIR)`
		`- set(GDCM_INSTALL_BIN_DIR "bin")`
		`- --`
		`- 2.20.1`
		`-`

gdcm-2.8.8-dont_use_EOF.patch

file removed

-41

		`@@ -1,41 +0,0 @@`
		`- --- ./Testing/Source/Common/Cxx/TestString2.cxx.orig 2019-02-26 22:01:26.738230841 +0000`
		`- +++ ./Testing/Source/Common/Cxx/TestString2.cxx 2019-02-26 22:59:07.751826144 +0000`
		`- @@ -16,7 +16,6 @@`
		`- #include <iostream>`
		`-`
		`- #include <string.h> // strlen`
		`- -#include <stdio.h> // EOF`
		`-`
		`- int TestString2(int , char *[])`
		`- {`
		`- @@ -26,24 +25,24 @@ int TestString2(int , char *[])`
		`- gdcm::String<> s2 = "coucou!";`
		`- std::cout << s2 << " -> " << s2.size() << std::endl;`
		`-`
		`- - gdcm::String<EOF,64,0> s3 = "coucou";`
		`- + gdcm::String<'\\',64,0> s3 = "coucou";`
		`- std::cout << s3.c_str() << " -> " << s3.size() << std::endl;`
		`-`
		`- - gdcm::String<EOF,64,0> s4 = "coucou!";`
		`- + gdcm::String<'\\',64,0> s4 = "coucou!";`
		`- std::cout << s4.c_str() << " -> " << s4.size() << std::endl;`
		`-`
		`- const char *s = "coucou!";`
		`- - gdcm::String<EOF,64,0> s5( s, strlen(s) );`
		`- + gdcm::String<'\\',64,0> s5( s, strlen(s) );`
		`- std::cout << s5.c_str() << " -> " << s5.size() << std::endl;`
		`-`
		`- std::string ss = "coucou!";`
		`- - gdcm::String<EOF,64,0> s6( ss );`
		`- + gdcm::String<'\\',64,0> s6( ss );`
		`- std::cout << s6.c_str() << " -> " << s6.size() << std::endl;`
		`-`
		`- - gdcm::String<EOF,64,0> s7( ss, 1, 5 );`
		`- + gdcm::String<'\\',64,0> s7( ss, 1, 5 );`
		`- std::cout << s7.c_str() << " -> " << s7.size() << std::endl;`
		`-`
		`- - gdcm::String<EOF,64,0> s8( ss, 1, 6 );`
		`- + gdcm::String<'\\',64,0> s8( ss, 1, 6 );`
		`- std::cout << s8.c_str() << " -> " << s8.size() << std::endl;`
		`-`
		`- return 0;`

gdcm.spec

file modified

+50 -65

		`@@ -1,9 +1,9 @@`
		`# Enabled by default`
		`- %bcond_without tests`
		`+ %bcond_with tests`

		`Name: gdcm`
		`- Version: 2.8.9`
		`- Release: 2%{?dist}`
		`+ Version: 3.0.1`
		`+ Release: 1%{?dist}`
		`Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files`
		`License: BSD`
		`URL: http://gdcm.sourceforge.net/wiki/index.php/Main_Page`
		`@@ -11,31 +11,15 @@`
		`Source0: https://github.com/malaterre/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz`
		`Source1: http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.gz`

		`- Patch1: 0001-Use-copyright.patch`
		`- # Increase maxdepth to permit generation of man pages`
		`- # https://sourceforge.net/p/gdcm/bugs/449/`
		`- Patch2: 0002-Increase-xslt-maxdepth.patch`
		`- # Use add_subdirectories since subdirs may not pass variables properly`
		`- # https://stackoverflow.com/a/30894329/375067`
		`- # https://cmake.org/pipermail/cmake/2007-August/015928.html`
		`- # Upstream has already made this change in their master branch`
		`- Patch3: 0003-Use-add_subdirectories-instead-of-deprecated-subdirs.patch`
		`- # Move inclusions to right locations`
		`- Patch4: 0004-Relocate-cmake-file-inclusions.patch`
		`- # Use c++11 standard`
		`- Patch5: 0005-use-cpp-11-standard.patch`
		`- # For new poppler`
		`- Patch6: 0006-Update-for-new-poppler.patch`
		`- # Use unversioned directory name`
		`- Patch7: 0007-Use-unversioned-dir.patch`
		`- Patch8: gdcm-2.8.8-dont_use_EOF.patch`
		`-`
		`- BuildRequires: CharLS-devel >= 1.0`
		`+ Patch1: 0001-3.0.1-Use-copyright.patch`
		`+`
		`+ BuildRequires: CharLS-devel >= 2.0`
		`BuildRequires: cmake`
		`BuildRequires: doxygen`
		`BuildRequires: libxslt-devel`
		`BuildRequires: dcmtk-devel`
		`BuildRequires: docbook5-style-xsl`
		`+ BuildRequires: docbook-style-xsl`
		`BuildRequires: expat-devel`
		`BuildRequires: fontconfig-devel`
		`BuildRequires: gcc`
		`@@ -55,13 +39,14 @@`
		`BuildRequires: sqlite-devel`
		`BuildRequires: json-c-devel`
		`BuildRequires: libxml2-devel`
		`- # TODO: enable VTK`
		`+`
		`# BuildRequires: vtk-devel`
		`- # Still needed`
		`- BuildRequires: /usr/bin/latex`
		`- BuildRequires: /usr/bin/pdflatex`
		`- BuildRequires: /usr/bin/dvips`
		`- BuildRequires: /usr/bin/epstopdf`
		`+`
		`+ # Do not generate latex`
		`+ # BuildRequires: /usr/bin/latex`
		`+ # BuildRequires: /usr/bin/pdflatex`
		`+ # BuildRequires: /usr/bin/dvips`
		`+ # BuildRequires: /usr/bin/epstopdf`
		`#BuildRequires: texlive-ec`


		`@@ -118,19 +103,15 @@`
		`used this library with python`

		`%prep`
		`- %autosetup -n GDCM-%{version} -S git -N`
		`+ %autosetup -n GDCM-%{version} -S git`
		`# Data source`
		`%setup -n GDCM-%{version} -q -T -D -a 1`
		`- %patch -p1 -P 1 2 3 4 5 7 8`
		`- %if 0%{?fedora} > 29`
		`- %patch6 -p1 -b .poppler.0.73.0`
		`- %endif`

		`# Fix cmake command`
		`sed -i.backup 's/add_dependency/add_dependencies/' Utilities/doxygen/CMakeLists.txt`

		`# Stop doxygen from producing LaTeX output`
		`- # sed -i.backup 's/^GENERATE_LATEX.=.YES/GENERATE_LATEX = NO/' Utilities/doxygen/doxyfile.in`
		`+ sed -i.backup 's/^GENERATE_LATEX.=.YES/GENERATE_LATEX = NO/' Utilities/doxygen/doxyfile.in`

		`# Remove bundled utilities (we use Fedora's ones)`

		`@@ -163,12 +144,13 @@`
		`-DGDCM_INSTALL_LIB_DIR=%{_libdir} \`
		`-DGDCM_BUILD_TESTING:BOOL=ON \`
		`-DGDCM_DATA_ROOT=../gdcmData/ \`
		`- -DGDCM_BUILD_EXAMPLES:BOOL=ON \`
		`+ -DGDCM_BUILD_EXAMPLES:BOOL=OFF \`
		`-DGDCM_DOCUMENTATION:BOOL=ON \`
		`-DGDCM_WRAP_PYTHON:BOOL=ON \`
		`-DPYTHON_EXECUTABLE=%{__python3} \`
		`-DGDCM_INSTALL_PYTHONMODULE_DIR=%{python3_sitearch} \`
		`-DGDCM_WRAP_JAVA:BOOL=OFF \`
		`+ -DGDCM_WRAP_CSHARP:BOOL=OFF \`
		`-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \`
		`-DGDCM_BUILD_APPLICATIONS:BOOL=ON \`
		`-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \`
		`@@ -194,15 +176,12 @@`
		`%make_build -C %{_target_platform}`

		`%install`
		`- make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}`
		`+ %make_install -C %{_target_platform}`
		`install -d $RPM_BUILD_ROOT%{python3_sitearch}`

		`- ## Cleaning Example dir from cmake cache files + remove 0-length files`
		`- find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles \| xargs rm -rf`
		`- find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 \| xargs rm -rf`
		`-`
		`- ## Moving Example dir into _datadir`
		`- cp -r %{_builddir}/%{?buildsubdir}/Examples $RPM_BUILD_ROOT%{_datadir}/%{name}/`
		`+ # Install examples`
		`+ install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}/Examples/`
		`+ cp -rv ./Examples/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/Examples/`

		`%if %{with tests}`
		`%check`
		`@@ -212,33 +191,34 @@`
		`%endif`

		`%files`
		`- %doc AUTHORS README.txt`
		`+ %doc AUTHORS README.md`
		`%license Copyright.txt README.Copyright.txt`
		`- %{_libdir}/libgdcmCommon.so.2.8`
		`- %{_libdir}/libgdcmCommon.so.2.8.8`
		`- %{_libdir}/libgdcmDICT.so.2.8`
		`- %{_libdir}/libgdcmDICT.so.2.8.8`
		`- %{_libdir}/libgdcmDSED.so.2.8`
		`- %{_libdir}/libgdcmDSED.so.2.8.8`
		`- %{_libdir}/libgdcmIOD.so.2.8`
		`- %{_libdir}/libgdcmIOD.so.2.8.8`
		`- %{_libdir}/libgdcmMEXD.so.2.8`
		`- %{_libdir}/libgdcmMEXD.so.2.8.8`
		`- %{_libdir}/libgdcmMSFF.so.2.8`
		`- %{_libdir}/libgdcmMSFF.so.2.8.8`
		`- %{_libdir}/libgdcmjpeg12.so.2.8`
		`- %{_libdir}/libgdcmjpeg12.so.2.8.8`
		`- %{_libdir}/libgdcmjpeg16.so.2.8`
		`- %{_libdir}/libgdcmjpeg16.so.2.8.8`
		`- %{_libdir}/libgdcmjpeg8.so.2.8`
		`- %{_libdir}/libgdcmjpeg8.so.2.8.8`
		`- %{_libdir}/libgdcmmd5.so.2.8`
		`- %{_libdir}/libgdcmmd5.so.2.8.8`
		`+ %{_libdir}/libgdcmCommon.so.3.0`
		`+ %{_libdir}/libgdcmCommon.so.3.0.1`
		`+ %{_libdir}/libgdcmDICT.so.3.0`
		`+ %{_libdir}/libgdcmDICT.so.3.0.1`
		`+ %{_libdir}/libgdcmDSED.so.3.0`
		`+ %{_libdir}/libgdcmDSED.so.3.0.1`
		`+ %{_libdir}/libgdcmIOD.so.3.0`
		`+ %{_libdir}/libgdcmIOD.so.3.0.1`
		`+ %{_libdir}/libgdcmMEXD.so.3.0`
		`+ %{_libdir}/libgdcmMEXD.so.3.0.1`
		`+ %{_libdir}/libgdcmMSFF.so.3.0`
		`+ %{_libdir}/libgdcmMSFF.so.3.0.1`
		`+ %{_libdir}/libgdcmjpeg12.so.3.0`
		`+ %{_libdir}/libgdcmjpeg12.so.3.0.1`
		`+ %{_libdir}/libgdcmjpeg16.so.3.0`
		`+ %{_libdir}/libgdcmjpeg16.so.3.0.1`
		`+ %{_libdir}/libgdcmjpeg8.so.3.0`
		`+ %{_libdir}/libgdcmjpeg8.so.3.0.1`
		`+ %{_libdir}/libgdcmmd5.so.3.0`
		`+ %{_libdir}/libgdcmmd5.so.3.0.1`
		`%{_libdir}/libsocketxx.so.1.2`
		`%{_libdir}/libsocketxx.so.1.2.0`
		`%dir %{_datadir}/%{name}`
		`- %{_datadir}/%{name}/XML/`
		`+ %{_datadir}/%{name}-3.0/XML/`
		`%exclude %{_docdir}/%{name}/html/`
		`+ %exclude %{_docdir}/%{name}/Examples/`

		`%files doc`
		`%doc %{_docdir}/%{name}/html/`
		`@@ -284,6 +264,11 @@`
		`%{python3_sitearch}/__pycache__/%{name}*`

		`%changelog`
		`+ * Thu Aug 01 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.0.1-1`
		`+ - Update to 3.0.1: contains soname bump`
		`+ - Rebase copyright patch`
		`+ - Remove unneeded patches`
		`+`
		`* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

sources

file modified

+1 -2

		`@@ -1,2 +1,1 @@`
		`- SHA512 (gdcm-2.8.9.tar.gz) = 3c80503de6df8fe2589849ae9334d11e3cb033701450e1d7ea2781d122d1c8c1fc205fefc358d0ad1b9c5199c838e1c7c1bb34949da1c73cc8ae174b72e7e70c`
		`- SHA512 (gdcmData.tar.gz) = ddc67a7a0b41b2d6e1e03defb6fb8a06ceeb2e9dd9bb47dfa4f7283d79df7c1e52577b799c00e930719ae6cdda46bded9497a67b8241359f238f5366085ec9ee`
		`+ SHA512 (gdcm-3.0.1.tar.gz) = 1483c65ce93fd9d7240913388899cb78e7da2954880b549a511f51b45a6fc3616e9eca292097749a3945fa4406a069e03d6e798ccf6c1fd8d6c96b1fb70e258f`