[arch-commits] Commit in inkscape/trunk (2 files)

[Andreas Radke]

    Date: Tuesday, September 6, 2022 @ 05:27:01
  Author: andyrtr
Revision: 455105

upgpkg: inkscape 1.2.1-5: update poppler patch to latest upstream version to fix some rendering issues

Modified:
  inkscape/trunk/PKGBUILD
  inkscape/trunk/inkscape-1.2.1-poppler-22.09.0.patch

--------------------------------------+
 PKGBUILD                             |    5 +++--
 inkscape-1.2.1-poppler-22.09.0.patch |   26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-05 23:35:59 UTC (rev 455104)
+++ PKGBUILD	2022-09-06 05:27:01 UTC (rev 455105)
@@ -5,7 +5,7 @@
 pkgname=inkscape
 pkgver=1.2.1
 _tag='9c6d41e4102d2e2e21a6d53ddba38ce202271001' # git rev-parse INKSCAPE_${pkgver/./_}
-pkgrel=4
+pkgrel=5
 pkgdesc='Professional vector graphics editor'
 url='https://inkscape.org/'
 license=('GPL' 'LGPL')
@@ -48,7 +48,7 @@
 source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}"
         inkscape-1.2.1-poppler-22.09.0.patch)
 sha256sums=('SKIP'
-            'd25ffb560c691398403fc93eb5dde358f4309f95fdce8fd34a57d540e84fc38f')
+            '5e847d11c1c42db717ad39bc03708e3b855f0e0a99ee4ac8d97f5bfe4af8985c')
 
 _backports=(
 )
@@ -63,6 +63,7 @@
 		git cherry-pick -n "${_c}"
 	done
 
+	# https://gitlab.com/inkscape/inkscape/-/merge_requests/4719
 	patch -Np1 -i ../inkscape-1.2.1-poppler-22.09.0.patch
 }
 

Modified: inkscape-1.2.1-poppler-22.09.0.patch
===================================================================
--- inkscape-1.2.1-poppler-22.09.0.patch	2022-09-05 23:35:59 UTC (rev 455104)
+++ inkscape-1.2.1-poppler-22.09.0.patch	2022-09-06 05:27:01 UTC (rev 455105)
@@ -1,6 +1,4 @@
-https://gitlab.com/inkscape/inkscape/-/merge_requests/4719
-
-From dce083204c62f1185ad079fc124f7fb40a1d0bb6 Mon Sep 17 00:00:00 2001
+From fb00794923d19cfbb2ca4adca3ae8971553a06be Mon Sep 17 00:00:00 2001
 From: Sam James <sam at gentoo.org>
 Date: Fri, 2 Sep 2022 06:21:28 +0100
 Subject: [PATCH] Fix build with Poppler 22.09.0
@@ -10,15 +8,15 @@
 
 With Poppler 22.09.0, inkscape fails to build with:
 ```
-/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’
+/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’
   394 |     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
       |     ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 In file included from /var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:44:
-/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector<double>& GfxState::getLineDash(double*)’
+/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector<double>& GfxState::getLineDash(double*)’
  1506 |     const std::vector<double> &getLineDash(double *start)
       |                                ^~~~~~~~~~~
 [...]
-/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’
+/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’
   700 |   state->setLineDash(dash, length, args[1].getNum());
       |   ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ```
@@ -36,6 +34,13 @@
 ```
 
 Signed-off-by: Sam James <sam at gentoo.org>
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp  | 4 ++++
+ src/extension/internal/pdfinput/svg-builder.cpp | 9 ++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index cca1e84096..80d64c9b86 100644
 --- a/src/extension/internal/pdfinput/pdf-parser.cpp
 +++ b/src/extension/internal/pdfinput/pdf-parser.cpp
 @@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
@@ -43,7 +48,7 @@
      }
    }
 +#if POPPLER_CHECK_VERSION(22, 9, 0)
-+  state->setLineDash(std::vector<double> (*dash, length), args[1].getNum());
++  state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
 +#else
    state->setLineDash(dash, length, args[1].getNum());
 +#endif
@@ -50,9 +55,11 @@
    builder->updateStyle(state);
  }
  
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 12f71dd921..9fc56fe63c 100644
 --- a/src/extension/internal/pdfinput/svg-builder.cpp
 +++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -388,10 +388,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
+@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
      sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
  
      // Line dash
@@ -71,3 +78,6 @@
      if ( dash_length > 0 ) {
          Inkscape::CSSOStringStream os_array;
          for ( int i = 0 ; i < dash_length ; i++ ) {
+-- 
+GitLab
+