Update update to 3.0.7 and rebuild for poppler 0.90.0

.gitignore

@@ -22,3 +22,4 @@
 /gdcm-2.8.9.tar.gz
 /gdcm-3.0.0.tar.gz
 /gdcm-3.0.1.tar.gz
+/gdcm-3.0.7.tar.gz

gdcm-2.8.8-dont_use_EOF.patch

@@ -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<'\0',64,0> s3 = "coucou";
-   std::cout << s3.c_str() << " -> " << s3.size() << std::endl;
- 
--  gdcm::String<EOF,64,0> s4 = "coucou!";
-+  gdcm::String<'\0',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<'\0',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<'\0',64,0> s6( ss );
-   std::cout << s6.c_str() << " -> " << s6.size() << std::endl;
- 
--  gdcm::String<EOF,64,0> s7( ss, 1, 5 );
-+  gdcm::String<'\0',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<'\0',64,0> s8( ss, 1, 6 );
-   std::cout << s8.c_str() << " -> " << s8.size() << std::endl;
- 
-   return 0;

gdcm-3.0.1-poppler-0.84.0.patch

@@ -1,53 +0,0 @@
---- GDCM-3.0.1/Applications/Cxx/CMakeLists.txt
-+++ GDCM-3.0.1/Applications/Cxx/CMakeLists.txt
-@@ -72,6 +72,14 @@ if(GDCM_USE_SYSTEM_POPPLER)
-   if(LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
-     list(APPEND libpoppler_flags -DLIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
-   endif()
-+  if(NOT LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
-+    CHECK_CXX_SOURCE_COMPILES(
-+      "\#include <poppler/GlobalParams.h>\nint main() { globalParams = new GlobalParams(); return 0;}"
-+      LIBPOPPLER_GLOBALPARAMS_IS_NOT_UNIQUE_PTR)
-+    if(NOT LIBPOPPLER_GLOBALPARAMS_IS_NOT_UNIQUE_PTR)
-+      list(APPEND libpoppler_flags -DLIBPOPPLER_GLOBALPARAMS_IS_UNIQUE_PTR)
-+    endif()
-+  endif()
-   CHECK_CXX_SOURCE_COMPILES(
-     "\#include <poppler/PDFDoc.h>\nint main() { PDFDoc d((GooString*)NULL,(GooString*)NULL,(GooString*)NULL); d.getPDFVersion(); return 0;}"
-     LIBPOPPLER_PDFDOC_HAS_PDFVERSION)
---- GDCM-3.0.1/Applications/Cxx/gdcminfo.cxx
-+++ GDCM-3.0.1/Applications/Cxx/gdcminfo.cxx
-@@ -510,11 +510,15 @@ static int ProcessOneFile( std::string c
-     std::string moddate;
- 
-     UnicodeMap *uMap;
-+#ifdef LIBPOPPLER_GLOBALPARAMS_IS_UNIQUE_PTR
-+  globalParams = std::make_unique<GlobalParams>();
-+#else
- #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
-     globalParams = new GlobalParams(0);
- #else
-     globalParams = new GlobalParams();
- #endif
-+#endif
-     uMap = globalParams->getTextEncoding();
- 
-     Object info;
---- GDCM-3.0.1/Applications/Cxx/gdcmpdf.cxx
-+++ GDCM-3.0.1/Applications/Cxx/gdcmpdf.cxx
-@@ -336,11 +336,15 @@ int main (int argc, char *argv[])
-   UnicodeMap *uMap;
-   ownerPW = NULL;
-   userPW = NULL;
-+#ifdef LIBPOPPLER_GLOBALPARAMS_IS_UNIQUE_PTR
-+  globalParams = std::make_unique<GlobalParams>();
-+#else
- #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
-   globalParams = new GlobalParams(0);
- #else
-   globalParams = new GlobalParams();
- #endif
-+#endif
-   uMap = globalParams->getTextEncoding();
- 
-   //const char *filename = argv[1];

gdcm.spec

@@ -2,8 +2,8 @@
 %bcond_with tests
 
 Name:       gdcm
-Version:    3.0.1
-Release:    8%{?dist}
+Version:    3.0.7
+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
@@ -12,11 +12,8 @@ Source0:    https://github.com/malaterre/%{name}/archive/v%{version}/%{name}-%{v
 Source1:    http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.gz
 
 Patch1: 0001-3.0.1-Use-copyright.patch
-# https://sourceforge.net/p/gdcm/bugs/487/
-Patch2: gdcm-2.8.8-dont_use_EOF.patch
 # Fix for 1687233
 Patch3: 0002-Fix-export-variables.patch
-Patch4: gdcm-3.0.1-poppler-0.84.0.patch
 
 BuildRequires:  CharLS-devel >= 2.0
 BuildRequires:  cmake
@@ -199,25 +196,25 @@ make test -C %{_target_platform} || exit 0
 %doc AUTHORS README.md
 %license Copyright.txt README.Copyright.txt
 %{_libdir}/libgdcmCommon.so.3.0
-%{_libdir}/libgdcmCommon.so.3.0.1
+%{_libdir}/libgdcmCommon.so.3.0.7
 %{_libdir}/libgdcmDICT.so.3.0
-%{_libdir}/libgdcmDICT.so.3.0.1
+%{_libdir}/libgdcmDICT.so.3.0.7
 %{_libdir}/libgdcmDSED.so.3.0
-%{_libdir}/libgdcmDSED.so.3.0.1
+%{_libdir}/libgdcmDSED.so.3.0.7
 %{_libdir}/libgdcmIOD.so.3.0
-%{_libdir}/libgdcmIOD.so.3.0.1
+%{_libdir}/libgdcmIOD.so.3.0.7
 %{_libdir}/libgdcmMEXD.so.3.0
-%{_libdir}/libgdcmMEXD.so.3.0.1
+%{_libdir}/libgdcmMEXD.so.3.0.7
 %{_libdir}/libgdcmMSFF.so.3.0
-%{_libdir}/libgdcmMSFF.so.3.0.1
+%{_libdir}/libgdcmMSFF.so.3.0.7
 %{_libdir}/libgdcmjpeg12.so.3.0
-%{_libdir}/libgdcmjpeg12.so.3.0.1
+%{_libdir}/libgdcmjpeg12.so.3.0.7
 %{_libdir}/libgdcmjpeg16.so.3.0
-%{_libdir}/libgdcmjpeg16.so.3.0.1
+%{_libdir}/libgdcmjpeg16.so.3.0.7
 %{_libdir}/libgdcmjpeg8.so.3.0
-%{_libdir}/libgdcmjpeg8.so.3.0.1
+%{_libdir}/libgdcmjpeg8.so.3.0.7
 %{_libdir}/libgdcmmd5.so.3.0
-%{_libdir}/libgdcmmd5.so.3.0.1
+%{_libdir}/libgdcmmd5.so.3.0.7
 %{_libdir}/libsocketxx.so.1.2
 %{_libdir}/libsocketxx.so.1.2.0
 %dir %{_datadir}/%{name}
@@ -269,6 +266,11 @@ make test -C %{_target_platform} || exit 0
 %{python3_sitearch}/__pycache__/%{name}*
 
 %changelog
+* Wed Jul 15 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.0.7-1
+- Update to 3.0.7
+- drop unneeded patches.
+- Rebuild for poppler 0.90.0
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.0.1-8
 - Rebuilt for Python 3.9
 

sources

@@ -1,2 +1 @@
-SHA512 (gdcmData.tar.gz) = ddc67a7a0b41b2d6e1e03defb6fb8a06ceeb2e9dd9bb47dfa4f7283d79df7c1e52577b799c00e930719ae6cdda46bded9497a67b8241359f238f5366085ec9ee
-SHA512 (gdcm-3.0.1.tar.gz) = 1483c65ce93fd9d7240913388899cb78e7da2954880b549a511f51b45a6fc3616e9eca292097749a3945fa4406a069e03d6e798ccf6c1fd8d6c96b1fb70e258f
+SHA512 (gdcm-3.0.7.tar.gz) = f0e54a1280692ef50bf8428d5b3a8774f294103bf4c59830cf37841c16e192c303d92f6c22eac923b4357041243f2fff034aa037d87185c7186de1d26d77c879