inkscape-poppler0.82.patch

   1 From 324c7903d9fd62e74c042c31477299be3b980fd2 Mon Sep 17 00:00:00 2001
   2 From: Thomas Holder <thomas@thomas-holder.de>
   3 Date: Sat, 26 Oct 2019 14:39:31 +0200
   4 Subject: [PATCH] fix poppler 0.82.0 build
   5
   6 ---
   7  src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
   8  src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
   9  src/extension/internal/pdfinput/svg-builder.cpp          | 2 +-
  10  src/extension/internal/pdfinput/svg-builder.h            | 2 +-
  11  4 files changed, 9 insertions(+), 3 deletions(-)
  12
  13 diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
  14 index 4f798e35bf..4eae275757 100644
  15 --- a/src/extension/internal/pdfinput/pdf-parser.cpp
  16 +++ b/src/extension/internal/pdfinput/pdf-parser.cpp
  17 @@ -2405,7 +2405,7 @@ void PdfParser::doShowText(GooString *s) {
  18    int wMode;
  19    double riseX, riseY;
  20    CharCode code;
  21 -  Unicode *u = NULL;
  22 +  Unicode _POPPLER_CONST_82 *u = NULL;
  23    double x, y, dx, dy, tdx, tdy;
  24    double originX, originY, tOriginX, tOriginY;
  25    double oldCTM[6], newCTM[6];
  26 diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
  27 index 5e8bc4ae90..01834007e8 100644
  28 --- a/src/extension/internal/pdfinput/poppler-transition-api.h
  29 +++ b/src/extension/internal/pdfinput/poppler-transition-api.h
  30 @@ -14,6 +14,12 @@
  31
  32  #include <glib/poppler-features.h>
  33
  34 +#if POPPLER_CHECK_VERSION(0, 82, 0)
  35 +#define _POPPLER_CONST_82 const
  36 +#else
  37 +#define _POPPLER_CONST_82
  38 +#endif
  39 +
  40  #if POPPLER_CHECK_VERSION(0, 76, 0)
  41  #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
  42  #else
  43 diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
  44 index 14727eba5f..a7134684a0 100644
  45 --- a/src/extension/internal/pdfinput/svg-builder.cpp
  46 +++ b/src/extension/internal/pdfinput/svg-builder.cpp
  47 @@ -1395,7 +1395,7 @@ void SvgBuilder::beginString(GfxState *state) {
  48  void SvgBuilder::addChar(GfxState *state, double x, double y,
  49                           double dx, double dy,
  50                           double originX, double originY,
  51 -                         CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
  52 +                         CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
  53
  54
  55      bool is_space = ( uLen == 1 && u[0] == 32 );
  56 diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
  57 index c42d694dec..050465d4bf 100644
  58 --- a/src/extension/internal/pdfinput/svg-builder.h
  59 +++ b/src/extension/internal/pdfinput/svg-builder.h
  60 @@ -142,7 +142,7 @@ public:
  61      void addChar(GfxState *state, double x, double y,
  62                   double dx, double dy,
  63                   double originX, double originY,
  64 -                 CharCode code, int nBytes, Unicode *u, int uLen);
  65 +                 CharCode code, int nBytes, Unicode const *u, int uLen);
  66      void beginTextObject(GfxState *state);
  67      void endTextObject(GfxState *state);
  68
  69 --
  70 2.22.0
  71