Hello community,

here is the log from the commit of package gdcm for openSUSE:Leap:15.2 checked 
in at 2020-04-17 13:38:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/gdcm (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.gdcm.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gdcm"

Fri Apr 17 13:38:00 2020 rev:3 rq:794281 version:3.0.5

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/gdcm/gdcm.changes      2020-03-31 
07:24:26.614452002 +0200
+++ /work/SRC/openSUSE:Leap:15.2/.gdcm.new.2738/gdcm.changes    2020-04-17 
13:38:34.352266334 +0200
@@ -1,0 +2,6 @@
+Tue Apr 14 18:59:21 UTC 2020 - Ismail Dönmez <[email protected]>
+
+- Update poppler_api.patch to make UnicodeMap* const.
+- Compile with -fpermissive so that this works on Leap 15.2 too
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gdcm.spec ++++++
--- /var/tmp/diff_new_pack.iuNvEs/_old  2020-04-17 13:38:34.816266683 +0200
+++ /var/tmp/diff_new_pack.iuNvEs/_new  2020-04-17 13:38:34.820266686 +0200
@@ -135,6 +135,7 @@
 %build
 
 %cmake .. \
+    -DCMAKE_CXX_FLAGS="%{optflags} -fpermissive" \
        -DCMAKE_VERBOSE_MAKEFILE=ON \
        -DGDCM_INSTALL_PACKAGE_DIR=%{_libdir}/cmake/%{name} \
        -DGDCM_INSTALL_INCLUDE_DIR=%{_includedir}/%{name} \

++++++ poppler_api.patch ++++++
--- /var/tmp/diff_new_pack.iuNvEs/_old  2020-04-17 13:38:34.856266713 +0200
+++ /var/tmp/diff_new_pack.iuNvEs/_new  2020-04-17 13:38:34.864266719 +0200
@@ -1,10 +1,25 @@
 # Patch to fix new poppler API on gdcm 3.0.5
 # Axel Braun <[email protected]>
 
-diff -U 3 -dHrN -- a/Applications/Cxx/gdcminfo.cxx 
b/Applications/Cxx/gdcminfo.cxx
---- a/Applications/Cxx/gdcminfo.cxx    2020-02-18 14:11:04.000000000 +0100
-+++ b/Applications/Cxx/gdcminfo.cxx    2020-03-29 15:00:39.398419657 +0200
-@@ -513,7 +513,7 @@
+Index: gdcm-3.0.5/Applications/Cxx/gdcminfo.cxx
+===================================================================
+--- gdcm-3.0.5.orig/Applications/Cxx/gdcminfo.cxx
++++ gdcm-3.0.5/Applications/Cxx/gdcminfo.cxx
+@@ -258,7 +258,7 @@ static std::string getInfoDate(Dict *inf
+   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 c
+     std::string creationdate;
+     std::string moddate;
+ 
+-    UnicodeMap *uMap;
++    const UnicodeMap *uMap;
  #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
      globalParams = new GlobalParams(0);
  #else
@@ -13,10 +28,27 @@
  #endif
      uMap = globalParams->getTextEncoding();
  
-diff -U 3 -dHrN -- a/Applications/Cxx/gdcmpdf.cxx 
b/Applications/Cxx/gdcmpdf.cxx
---- a/Applications/Cxx/gdcmpdf.cxx     2020-02-18 14:11:04.000000000 +0100
-+++ b/Applications/Cxx/gdcmpdf.cxx     2020-03-29 14:52:23.374400551 +0200
-@@ -339,7 +339,7 @@
+Index: gdcm-3.0.5/Applications/Cxx/gdcmpdf.cxx
+===================================================================
+--- gdcm-3.0.5.orig/Applications/Cxx/gdcmpdf.cxx
++++ gdcm-3.0.5/Applications/Cxx/gdcmpdf.cxx
+@@ -106,7 +106,7 @@ static std::string getInfoDate(Dict *inf
+   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


Reply via email to