fix graphics/gdcm with new poppler

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

fix graphics/gdcm with new poppler

Matthias Kilian
Hi,

this fixes the build with poppler-0.85.0.

ok to commit after the poppler update?

Ciao,
        Kili

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gdcm/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 2 Jan 2020 20:32:24 -0000 1.16
+++ Makefile 15 Feb 2020 21:09:51 -0000
@@ -3,7 +3,7 @@
 COMMENT = cross-platform DICOM implementation
 
 DISTNAME = gdcm-3.0.4
-REVISION = 0
+REVISION = 1
 
 SHARED_LIBS +=  gdcmCommon                1.0 # 2.8
 SHARED_LIBS +=  gdcmDICT                  1.0 # 2.8
Index: patches/patch-Applications_Cxx_gdcminfo_cxx
===================================================================
RCS file: /cvs/ports/graphics/gdcm/patches/patch-Applications_Cxx_gdcminfo_cxx,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Applications_Cxx_gdcminfo_cxx
--- patches/patch-Applications_Cxx_gdcminfo_cxx 2 Jan 2020 20:32:24 -0000 1.4
+++ patches/patch-Applications_Cxx_gdcminfo_cxx 15 Feb 2020 21:09:51 -0000
@@ -1,11 +1,25 @@
 $OpenBSD: patch-Applications_Cxx_gdcminfo_cxx,v 1.4 2020/01/02 20:32:24 kili Exp $
 
-Fix build with poppler-0.83.0.
+Fix build with poppler-0.83.0 and -0.85.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
+@@ -258,7 +258,7 @@ static std::string getInfoDate(Dict *infoDict, const c
+   return out;
+ }
+
+-static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap)
++static std::string getInfoString(Dict *infoDict, const char *key, const UnicodeMap *uMap)
+ {
+   Object obj;
+ #ifdef LIBPOPPLER_GOOSTRING_HAS_CONSTGETCHAR
+@@ -509,11 +509,11 @@ static int ProcessOneFile( std::string const & filenam
+     std::string creationdate;
+     std::string moddate;
+
+-    UnicodeMap *uMap;
++    const UnicodeMap *uMap;
  #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
      globalParams = new GlobalParams(0);
  #else
Index: patches/patch-Applications_Cxx_gdcmpdf_cxx
===================================================================
RCS file: /cvs/ports/graphics/gdcm/patches/patch-Applications_Cxx_gdcmpdf_cxx,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Applications_Cxx_gdcmpdf_cxx
--- patches/patch-Applications_Cxx_gdcmpdf_cxx 2 Jan 2020 20:32:24 -0000 1.4
+++ patches/patch-Applications_Cxx_gdcmpdf_cxx 15 Feb 2020 21:09:51 -0000
@@ -1,11 +1,27 @@
 $OpenBSD: patch-Applications_Cxx_gdcmpdf_cxx,v 1.4 2020/01/02 20:32:24 kili Exp $
 
-Fix build with poppler-0.83.0.
+Fix build with poppler-0.83.0 and -0.85.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[])
+@@ -106,7 +106,7 @@ static std::string getInfoDate(Dict *infoDict, const c
+   return out;
+ }
+
+-static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, bool & unicode)
++static std::string getInfoString(Dict *infoDict, const char *key, const UnicodeMap *uMap, bool & unicode)
+ {
+   Object obj;
+ #ifdef LIBPOPPLER_GOOSTRING_HAS_CONSTGETCHAR
+@@ -333,13 +333,13 @@ int main (int argc, char *argv[])
+   GooString *fileName;
+   PDFDoc *doc;
+   Object info;
+-  UnicodeMap *uMap;
++  const UnicodeMap *uMap;
+   ownerPW = NULL;
+   userPW = NULL;
  #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
    globalParams = new GlobalParams(0);
  #else