[med-svn] [Git][med-team/gdcm][master] 2 commits: Add patch from Gianfranco Costamagna to fix build with poppler 0.71.

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian Med / gdcm


Commits:
014dceaf by Mattia Rizzolo at 2018-11-28T11:08:09Z
Add patch from Gianfranco Costamagna to fix build with poppler 0.71.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
5fb10988 by Mattia Rizzolo at 2018-11-28T11:14:03Z
Changelog for 2.8.8-5

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/poppler0.71.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+gdcm (2.8.8-5) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+  * Set Rules-Requires-Root:no.
+  * Improve the libvtkgdcm2.8a symbols patters to not include a symbol that
+    should not be optional.  Thanks to jrtc27 for the feedback.
+  * Add patch from Gianfranco Costamagna to fix build with poppler 0.71.
+
+ -- Mattia Rizzolo <mattia at debian.org>  Wed, 28 Nov 2018 12:13:53 +0100
+
 gdcm (2.8.8-4) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/patches/poppler0.71.patch
=====================================
@@ -0,0 +1,86 @@
+Description: Fix build with poppler 0.71
+Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Forwarded: https://github.com/malaterre/GDCM/pull/70
+Last-Update: 2018-11-28
+
+--- a/Applications/Cxx/gdcminfo.cxx
++++ b/Applications/Cxx/gdcminfo.cxx
+@@ -258,7 +258,7 @@
+ {
+   Object obj;
+   const GooString *s1;
+-  GBool isUnicode;
++  bool isUnicode;
+   Unicode u;
+   char buf[8];
+   int i, n;
+@@ -274,12 +274,12 @@
+     if ((s1->getChar(0) & 0xff) == 0xfe &&
+       (s1->getChar(1) & 0xff) == 0xff)
+       {
+-      isUnicode = gTrue;
++      isUnicode = true;
+       i = 2;
+       }
+     else
+       {
+-      isUnicode = gFalse;
++      isUnicode = false;
+       i = 0;
+       }
+     while (i < obj.getString()->getLength())
+@@ -539,10 +539,10 @@
+       int pages = doc->getNumPages();
+       const char *encrypted = doc->isEncrypted() ? "yes" : "no";
+       //  printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
+-      //   doc->okToPrint(gTrue) ? "yes" : "no",
+-      //   doc->okToCopy(gTrue) ? "yes" : "no",
+-      //   doc->okToChange(gTrue) ? "yes" : "no",
+-      //   doc->okToAddNotes(gTrue) ? "yes" : "no");
++      //   doc->okToPrint(true) ? "yes" : "no",
++      //   doc->okToCopy(true) ? "yes" : "no",
++      //   doc->okToChange(true) ? "yes" : "no",
++      //   doc->okToAddNotes(true) ? "yes" : "no");
+ 
+       // print linearization info
+       const char *optimized = doc->isLinearized() ? "yes" : "no";
+--- a/Applications/Cxx/gdcmpdf.cxx
++++ b/Applications/Cxx/gdcmpdf.cxx
+@@ -102,11 +102,11 @@
+   return out;
+ }
+ 
+-static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, GBool & unicode)
++static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, bool & unicode)
+ {
+   Object obj;
+   const GooString *s1;
+-  GBool isUnicode = gFalse;
++  bool isUnicode = false;
+   Unicode u;
+   char buf[8];
+   int i, n;
+@@ -122,12 +122,12 @@
+     if ((s1->getChar(0) & 0xff) == 0xfe &&
+       (s1->getChar(1) & 0xff) == 0xff)
+       {
+-      isUnicode = gTrue;
++      isUnicode = true;
+       i = 2;
+       }
+     else
+       {
+-      isUnicode = gFalse;
++      isUnicode = false;
+       i = 0;
+       }
+     while (i < obj.getString()->getLength())
+@@ -398,7 +398,7 @@
+   std::string creationdate;
+   std::string moddate;
+ 
+-  GBool isUnicode = gFalse;
++  bool isUnicode = false;
+   if (doc->isOk())
+     {
+ #ifdef LIBPOPPLER_NEW_OBJECT_API


=====================================
debian/patches/series
=====================================
@@ -7,3 +7,4 @@ use_swig_add_library_for_csharp.patch
 enable_ninja_build.patch
 gdcm-fix-xslt-maxdepth.patch
 add_cxx11_vtk_defines.patch
+poppler0.71.patch



View it on GitLab: https://salsa.debian.org/med-team/gdcm/compare/5ce2d3b89e1dbfbbcb760128cf24b6489668cdce...5fb1098828c1d5ffc4fc1caaa750d849bacf1899

-- 
View it on GitLab: https://salsa.debian.org/med-team/gdcm/compare/5ce2d3b89e1dbfbbcb760128cf24b6489668cdce...5fb1098828c1d5ffc4fc1caaa750d849bacf1899
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181128/9827e9d1/attachment-0001.html>