Hello community,

here is the log from the commit of package inkscape for openSUSE:Factory 
checked in at 2019-11-07 23:09:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/inkscape (Old)
 and      /work/SRC/openSUSE:Factory/.inkscape.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "inkscape"

Thu Nov  7 23:09:02 2019 rev:103 rq:744908 version:0.92.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes        2019-08-15 
15:43:22.451195811 +0200
+++ /work/SRC/openSUSE:Factory/.inkscape.new.2990/inkscape.changes      
2019-11-07 23:09:07.816037132 +0100
@@ -1,0 +2,9 @@
+Sat Nov  2 11:46:16 UTC 2019 - Bjørn Lie <[email protected]>
+
+- Add backported inkscape-fix-for-poppler-0.82.patch: Fix build
+  with poppler 0.82 and newer.
+- Stop post(un) handling of desktop_database_post(un) and
+  icon_theme_cache_post(un) macros, no longer needed for any
+  supported version of openSUSE.
+
+-------------------------------------------------------------------

New:
----
  inkscape-fix-for-poppler-0.82.patch

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

Other differences:
------------------
++++++ inkscape.spec ++++++
--- /var/tmp/diff_new_pack.3wguMu/_old  2019-11-07 23:09:09.332038924 +0100
+++ /var/tmp/diff_new_pack.3wguMu/_new  2019-11-07 23:09:09.332038924 +0100
@@ -45,6 +45,8 @@
 Patch6:         f5e0ea893f34_extensions_python3_compatibility.patch
 # PATCH-FIX-UPSTREAM 
https://gitlab.com/inkscape/inkscape/merge_requests/582.patch -- fixed in 0.92.5
 Patch7:         mr_582_extensions_python3_compatibility.patch
+# PATCH-FIX-UPSTREAM inkscape-fix-for-poppler-0.82.patch -- Fix build poppler 
0.82
+Patch8:         inkscape-fix-for-poppler-0.82.patch
 
 BuildRequires:  gtkspell-devel
 %if 0%{?suse_version} > 1325
@@ -236,14 +238,6 @@
 
 %fdupes %{buildroot}
 
-%post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
 # We can't really move the localized manpages to the lang package, since they'd
 # create a conflict between the lang subpackage and bundles
 

++++++ inkscape-fix-for-poppler-0.82.patch ++++++
>From 324c7903d9fd62e74c042c31477299be3b980fd2 Mon Sep 17 00:00:00 2001
From: Thomas Holder <[email protected]>
Date: Sat, 26 Oct 2019 14:39:31 +0200
Subject: [PATCH] fix poppler 0.82.0 build

---
 src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
 src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
 src/extension/internal/pdfinput/svg-builder.cpp          | 2 +-
 src/extension/internal/pdfinput/svg-builder.h            | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

Index: inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp
===================================================================
--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp
+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s)
   int wMode;
   double riseX, riseY;
   CharCode code;
-  Unicode *u = NULL;
+  Unicode _POPPLER_CONST_82 *u = nullptr;
   double x, y, dx, dy, tdx, tdy;
   double originX, originY, tOriginX, tOriginY;
   double oldCTM[6], newCTM[6];
Index: inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h
===================================================================
--- 
inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h
+++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h
@@ -3,6 +3,12 @@
 
 #include <glib/poppler-features.h>
 
+#if POPPLER_CHECK_VERSION(0, 82, 0)
+#define _POPPLER_CONST_82 const
+#else
+#define _POPPLER_CONST_82
+#endif
+
 #if POPPLER_CHECK_VERSION(0, 76, 0)
 #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
 #else
Index: inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp
===================================================================
--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp
+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp
@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *s
 void SvgBuilder::addChar(GfxState *state, double x, double y,
                          double dx, double dy,
                          double originX, double originY,
-                         CharCode /*code*/, int /*nBytes*/, Unicode *u, int 
uLen) {
+                         CharCode /*code*/, int /*nBytes*/, Unicode const *u, 
int uLen) {
 
 
     bool is_space = ( uLen == 1 && u[0] == 32 );
Index: inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.h
===================================================================
--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.h
+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.h
@@ -141,7 +141,7 @@ public:
     void addChar(GfxState *state, double x, double y,
                  double dx, double dy,
                  double originX, double originY,
-                 CharCode code, int nBytes, Unicode *u, int uLen);
+                 CharCode code, int nBytes, Unicode const *u, int uLen);
     void beginTextObject(GfxState *state);
     void endTextObject(GfxState *state);
 

Reply via email to