* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/
@ 2018-05-23 13:59 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-05-23 13:59 UTC (permalink / raw
To: gentoo-commits
commit: 86c5fc23402880ae5a24116dabb21bebe27cc072
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 13:59:00 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 23 13:59:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c5fc23
media-gfx/inkscape: Use official upstream patch.
Package-Manager: Portage-2.3.38, Repoman-2.3.9
.../files/inkscape-0.92.3-freetype_pkgconfig.patch | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
index 0f577bd0e9a..d00c23d8add 100644
--- a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
@@ -1,6 +1,19 @@
---- inkscape-0.92.3/configure.ac
-+++ inkscape-0.92.3/configure.ac
-@@ -252,12 +252,9 @@
+From 62ed18b4d99e690298cc1984b6f2df2363d165fe Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 18 May 2018 07:55:38 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config file no longer gets installed
+by default.
+---
+ configure.ac | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12a081612b..1b75e23670 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,12 +252,9 @@ AC_CHECK_FUNCS([mallinfo], [
[#include <malloc.h>])
])
@@ -16,3 +29,6 @@
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
+--
+2.17.0
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/
@ 2022-09-02 5:52 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-09-02 5:52 UTC (permalink / raw
To: gentoo-commits
commit: 8b48848a1b4238b6e3abb3e9b546014bc72d5c8e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 05:26:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 05:32:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b48848a
media-gfx/inkscape: add link to upstream PR for poppler fix
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/inkscape-1.2.1-poppler-22.09.0.patch | 38 ++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
index 2e5d3b4782f3..87583019d6e3 100644
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
+++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
@@ -1,3 +1,41 @@
+https://gitlab.com/inkscape/inkscape/-/merge_requests/4719
+
+From dce083204c62f1185ad079fc124f7fb40a1d0bb6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Sep 2022 06:21:28 +0100
+Subject: [PATCH] Fix build with Poppler 22.09.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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*)’
+ 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*)’
+ 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)’
+ 700 | state->setLineDash(dash, length, args[1].getNum());
+ | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+Poppler changed the getLineDash interface:
+```
+- void getLineDash(double **dash, int *length, double *start)
++ const std::vector<double> &getLineDash(double *start)
+```
+
+... and the setLineDash interface:
+````
+- void setLineDash(double *dash, int length, double start);
++ void setLineDash(std::vector<double> &&dash, double start);
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
--- 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*/)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/
@ 2022-10-15 19:34 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2022-10-15 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 3067c50bb68ed3a77aa41093812aaefae5c7dafb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct 4 10:40:32 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3067c50b
media-gfx/inkscape: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27609
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/inkscape-1.1-poppler-21.11.0.patch | 20 ---
.../files/inkscape-1.1.2-automagic-libX11.patch | 166 ---------------------
.../files/inkscape-1.1.2-poppler-22.03.0.patch | 38 -----
3 files changed, 224 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
deleted file mode 100644
index 7b02253d5f9a..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- }
- if (printCommands) {
- printf(" font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+ font->getTag().c_str(),
-+#else
- font->getTag()->getCString(),
-+#endif
- font->getName() ? font->getName()->getCString() : "???",
- args[1].getNum());
- fflush(stdout);
-GitLab
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch b/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch
deleted file mode 100644
index fe104415fb89..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1.2-automagic-libX11.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 6d0ace0518f0da18c7e81be1edecd50d997230b1 Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Tue, 11 May 2021 10:43:27 +0200
-Subject: [PATCH] CMake: Fix automagic dependency on X11
-
-Related: https://bugs.gentoo.org/768663
-Related: https://github.com/gentoo/gentoo/pull/20181
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,6 +36,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME inkscape) # needs to be before any inst
-
- include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable
- include(CMakeScripts/ConfigPaths.cmake)
-+include(CMakeDependentOption)
-
- set(PROJECT_NAME inkscape)
-
-@@ -126,6 +127,7 @@ option(WITH_GSPELL "Compile with support of gspell" ON)
- option(WITH_NLS "Compile with Native Language Support (using gettext)" ON)
- option(WITH_JEMALLOC "Compile with JEMALLOC support" OFF)
- option(WITH_ASAN "Compile with Clang's AddressSanitizer (for debugging purposes)" OFF)
-+cmake_dependent_option(WITH_X11 "Compile with X11 support" ON "UNIX; NOT APPLE" OFF)
- option(WITH_INTERNAL_2GEOM "Prefer internal copy of lib2geom" OFF)
-
- option(WITH_FUZZ "Compile for fuzzing purpose (use 'make fuzz' only)" OFF)
-@@ -285,6 +287,7 @@ message("WITH_LIBWPG: ${WITH_LIBWPG}")
- message("WITH_NLS: ${WITH_NLS}")
- message("WITH_OPENMP: ${WITH_OPENMP}")
- message("WITH_JEMALLOC: ${WITH_JEMALLOC}")
-+message("WITH_X11: ${WITH_X11}")
- message("WITH_INTERNAL_2GEOM: ${WITH_INTERNAL_2GEOM}")
-
- message("WITH_PROFILING: ${WITH_PROFILING}")
---- a/CMakeScripts/DefineDependsandFlags.cmake
-+++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -403,12 +403,17 @@ sanitize_ldflags_for_libs(SIGC++_LDFLAGS)
- list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
- list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
-
--# Some linkers, like gold, don't find symbols recursively. So we have to link against X11 explicitly
--find_package(X11)
--if(X11_FOUND)
-+if(WITH_X11)
-+ find_package(X11 REQUIRED)
- list(APPEND INKSCAPE_INCS_SYS ${X11_INCLUDE_DIRS})
- list(APPEND INKSCAPE_LIBS ${X11_LIBRARIES})
--endif(X11_FOUND)
-+ add_definitions(-DHAVE_X11)
-+
-+ pkg_get_variable(GTK3_TARGETS gtk+-3.0 targets)
-+ if(NOT("${GTK3_TARGETS}" MATCHES "x11"))
-+ message(FATAL_ERROR "GTK+3 doesn't targets X11, this is required for WITH_X11")
-+ endif()
-+endif(WITH_X11)
-
- # end Dependencies
-
---- a/src/ege-color-prof-tracker.cpp
-+++ b/src/ege-color-prof-tracker.cpp
-@@ -46,11 +46,11 @@
-
- #include <gtk/gtk.h>
-
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- #include <X11/Xlib.h>
-
- #include <gdk/gdkx.h>
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
-
- #include "ege-color-prof-tracker.h"
- #include "helper/sp-marshal.h"
-@@ -69,24 +69,24 @@ static void ege_color_prof_tracker_dispose(GObject *);
-
- class ScreenTrack {
- public:
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- gboolean zeroSeen;
- gboolean otherSeen;
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
- std::vector<EgeColorProfTracker *> *trackers;
- GPtrArray* profiles;
- ~ScreenTrack(){ delete trackers; }
- };
-
-
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- GdkFilterReturn x11_win_filter(GdkXEvent *xevent, GdkEvent *event, gpointer data);
- void handle_property_change(GdkScreen* screen, const gchar* name);
- void add_x11_tracking_for_screen(GdkScreen* screen);
- static void fire(gint monitor);
- static void clear_profile( guint monitor );
- static void set_profile( guint monitor, const guint8* data, guint len );
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
-
- static guint signals[LAST_SIGNAL] = {0};
-
-@@ -323,10 +323,10 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
-
- int numMonitors = gdk_display_get_n_monitors(display);
-
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- tracked_screen->zeroSeen = FALSE;
- tracked_screen->otherSeen = FALSE;
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
- tracked_screen->trackers= new std::vector<EgeColorProfTracker *>;
- tracked_screen->trackers->push_back(tracker );
- tracked_screen->profiles = g_ptr_array_new();
-@@ -336,14 +336,14 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
-
- g_signal_connect( G_OBJECT(screen), "size-changed", G_CALLBACK( screen_size_changed_cb ), tracker );
-
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- if (GDK_IS_X11_DISPLAY (display) ) {
- // printf( "track_screen: Display is using X11\n" );
- add_x11_tracking_for_screen(screen);
- } else {
- // printf( "track_screen: Display is not using X11\n" );
- }
--#endif // GDK_WINDOWING_X11
-+#endif // HAVE_X11
- }
- }
-
-@@ -411,13 +411,13 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
- if ( numMonitors > (gint)tracked_screen->profiles->len ) {
- for ( guint i = tracked_screen->profiles->len; i < (guint)numMonitors; i++ ) {
- g_ptr_array_add( tracked_screen->profiles, nullptr );
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- if (GDK_IS_X11_DISPLAY (display) ) {
- gchar* name = g_strdup_printf( "_ICC_PROFILE_%d", i );
- handle_property_change( screen, name );
- g_free(name);
- }
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
- }
- } else if ( numMonitors < (gint)tracked_screen->profiles->len ) {
- /* g_message("The count of monitors decreased, remove some"); */
-@@ -425,7 +425,7 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
- }
- }
-
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_X11
- GdkFilterReturn x11_win_filter(GdkXEvent *xevent,
- GdkEvent *event,
- gpointer data)
-@@ -618,7 +618,7 @@ static void set_profile( guint monitor, const guint8* data, guint len )
- }
- }
- }
--#endif /* GDK_WINDOWING_X11 */
-+#endif /* HAVE_X11 */
- /*
- Local Variables:
- mode:c++
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch
deleted file mode 100644
index 5ec18157384e..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 15ab83e02b07018c3ffd4952a2623393187659e0 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Wed, 2 Mar 2022 19:50:02 +0200
-Subject: [PATCH] Fix build with poppler 22.03.0
-
-PDFDoc's constructor now takes an std::unique_ptr as the filename and
-the rest of the parameters are std::optional and can be left out.
-
-Also, remove an obsolete comment regarding special handling on win32;
-the "ifndef _WIN32" it was referring to has been removed by commit
-ad8effaa6ec3 ("Fix PDF import with non-ASCII filename on Windows").
----
- src/extension/internal/pdfinput/pdf-input.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..63742d8c6d 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -686,10 +686,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- // PDFDoc is from poppler. PDFDoc is used for preview and for native import.
- std::shared_ptr<PDFDoc> pdf_doc;
-
-- // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-- // glib gstdio.c
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+ pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)); // TODO: Could ask for password
-+#else
- GooString *filename_goo = new GooString(uri);
-- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
-+ pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
-+#endif
-
- if (!pdf_doc->isOk()) {
- int error = pdf_doc->getErrorCode();
---
-GitLab
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/
@ 2023-06-23 21:29 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2023-06-23 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 809bf5e498251a3e2c905870f2f14eb4c33a6ab0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 13 16:44:15 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:28:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809bf5e4
media-gfx/inkscape: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31422
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/inkscape-1.2.1-poppler-22.09.0.patch | 73 ----------------------
1 file changed, 73 deletions(-)
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
deleted file mode 100644
index 80d071d51b0b..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://gitlab.com/inkscape/inkscape/-/merge_requests/4719
-
-From dce083204c62f1185ad079fc124f7fb40a1d0bb6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Sep 2022 06:21:28 +0100
-Subject: [PATCH] Fix build with Poppler 22.09.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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*)’
- 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*)’
- 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)’
- 700 | state->setLineDash(dash, length, args[1].getNum());
- | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-```
-
-Poppler changed the getLineDash interface:
-```
-- void getLineDash(double **dash, int *length, double *start)
-+ const std::vector<double> &getLineDash(double *start)
-```
-
-... and the setLineDash interface:
-````
-- void setLineDash(double *dash, int length, double start);
-+ void setLineDash(std::vector<double> &&dash, double start);
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- 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*/)
- _POPPLER_FREE(obj);
- }
- }
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
-+#else
- state->setLineDash(dash, length, args[1].getNum());
-+#endif
- builder->updateStyle(state);
- }
-
---- 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) {
- sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
-
- // Line dash
-- double *dash_pattern;
- int dash_length;
- double dash_start;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+ const double *dash_pattern;
-+ const std::vector<double> &dash = state->getLineDash(&dash_start);
-+ dash_pattern = dash.data();
-+ dash_length = dash.size();
-+#else
-+ double *dash_pattern;
- state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-+#endif
- if ( dash_length > 0 ) {
- Inkscape::CSSOStringStream os_array;
- for ( int i = 0 ; i < dash_length ; i++ ) {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-23 21:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-23 13:59 [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-09-02 5:52 Sam James
2022-10-15 19:34 Conrad Kostecki
2023-06-23 21:29 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox