From 5b139a41e7d7485c91317a5fea478e46c3bed3f5 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Jan 20 2020 13:32:11 +0000
Subject: Rebuild for poppler-0.84.0


---

diff --git a/gdcm-3.0.1-poppler-0.84.0.patch b/gdcm-3.0.1-poppler-0.84.0.patch
new file mode 100644
index 0000000..0fee150
--- /dev/null
+++ b/gdcm-3.0.1-poppler-0.84.0.patch
@@ -0,0 +1,53 @@
+--- 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];
diff --git a/gdcm.spec b/gdcm.spec
index 278f1de..f46b85b 100644
--- a/gdcm.spec
+++ b/gdcm.spec
@@ -3,7 +3,7 @@
 
 Name:       gdcm
 Version:    3.0.1
-Release:    4%{?dist}
+Release:    5%{?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
@@ -16,6 +16,7 @@ Patch1: 0001-3.0.1-Use-copyright.patch
 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
@@ -268,6 +269,9 @@ make test -C %{_target_platform} || exit 0
 %{python3_sitearch}/__pycache__/%{name}*
 
 %changelog
+* Mon Jan 20 2020 Marek Kasik <mkasik@redhat.com> - 3.0.1-5
+- Rebuild for poppler-0.84.0
+
 * Sat Nov 23 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.0.1-4
 - Fix exported variables
 - https://bugzilla.redhat.com/show_bug.cgi?id=1687233