Unbreak the build with poppler-0.83.0.

To be committed right after poppler.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gdcm/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile    25 Oct 2019 19:40:08 -0000      1.15
+++ Makefile    16 Dec 2019 20:56:12 -0000
@@ -29,9 +29,9 @@ MASTER_SITES =                        ${MASTER_SITE_SOURCEFOR
 
 MODULES =                      devel/cmake
 
-# c++-11
+# c++-14
 COMPILER =                     base-clang ports-gcc
-CXXFLAGS +=                    -std=c++11
+CXXFLAGS +=                    -std=c++14
 
 WANTLIB += ${COMPILER_LIBCXX} c crypto expat json-c m openjp2
 WANTLIB += poppler ssl uuid xml2 z
Index: patches/patch-Applications_Cxx_gdcminfo_cxx
===================================================================
RCS file: patches/patch-Applications_Cxx_gdcminfo_cxx
diff -N patches/patch-Applications_Cxx_gdcminfo_cxx
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Applications_Cxx_gdcminfo_cxx 16 Dec 2019 20:56:12 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build with poppler-0.83.0.
+
+Index: Applications/Cxx/gdcminfo.cxx
+--- Applications/Cxx/gdcminfo.cxx.orig
++++ Applications/Cxx/gdcminfo.cxx
+@@ -513,7 +513,7 @@ static int ProcessOneFile( std::string const & filenam
+ #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
+     globalParams = new GlobalParams(0);
+ #else
+-    globalParams = new GlobalParams();
++    globalParams = std::make_unique<GlobalParams>();
+ #endif
+     uMap = globalParams->getTextEncoding();
+ 
Index: patches/patch-Applications_Cxx_gdcmpdf_cxx
===================================================================
RCS file: patches/patch-Applications_Cxx_gdcmpdf_cxx
diff -N patches/patch-Applications_Cxx_gdcmpdf_cxx
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Applications_Cxx_gdcmpdf_cxx  16 Dec 2019 20:56:12 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build with poppler-0.83.0.
+
+Index: Applications/Cxx/gdcmpdf.cxx
+--- Applications/Cxx/gdcmpdf.cxx.orig
++++ Applications/Cxx/gdcmpdf.cxx
+@@ -339,7 +339,7 @@ int main (int argc, char *argv[])
+ #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
+   globalParams = new GlobalParams(0);
+ #else
+-  globalParams = new GlobalParams();
++  globalParams = std::make_unique<GlobalParams>();
+ #endif
+   uMap = globalParams->getTextEncoding();
+ 

Reply via email to