inkscape: revbump for libpoppler
This commit is contained in:
Mateusz Sylwestrzak
Đoàn Trần Công Danh
parent
4b3b94fe00
commit
8c02ea6490
|
|
@ -0,0 +1,12 @@
|
|||
diff '--color=auto' -ur a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
|
||||
--- a/src/ui/dialog/filter-effects-dialog.cpp 2023-11-16 20:05:21.000000000 +0100
|
||||
+++ b/src/ui/dialog/filter-effects-dialog.cpp 2024-05-31 00:52:13.179734092 +0200
|
||||
@@ -202,7 +202,7 @@
|
||||
template< typename T> class ComboWithTooltip : public Gtk::EventBox
|
||||
{
|
||||
public:
|
||||
- ComboWithTooltip<T>(T default_value, const Util::EnumDataConverter<T>& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr)
|
||||
+ ComboWithTooltip(T default_value, const Util::EnumDataConverter<T>& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr)
|
||||
{
|
||||
if (tip_text) {
|
||||
set_tooltip_text(tip_text);
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
From 1798e9c13b786f3d077ba0132592c4d5c1d1fb9b Mon Sep 17 00:00:00 2001
|
||||
From: Tavmjong Bah <tavmjong@free.fr>
|
||||
Date: Tue, 26 Sep 2023 19:23:27 +0000
|
||||
Subject: [PATCH] Up C++ version to C++20.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
_clang-format | 2 +-
|
||||
src/ui/knot/knot-holder-entity.cpp | 2 +-
|
||||
src/ui/tools/pencil-tool.cpp | 9 ++++++---
|
||||
4 files changed, 10 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index fe6b10cda24..de2680bd651 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -18,9 +18,9 @@ message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}")
|
||||
# -----------------------------------------------------------------------------
|
||||
# CMake Configuration
|
||||
# -----------------------------------------------------------------------------
|
||||
-set(CMAKE_CXX_STANDARD 17)
|
||||
+set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
-# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++17 instead of -std=gnu++17
|
||||
+# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++20 instead of -std=gnu++20
|
||||
# TODO: build currently fails with it as we actually depend on GNU compiler extensions...
|
||||
# mostly use of the non-Standard M_PI et al. TODO: C++20: Use the <numbers> header.
|
||||
|
||||
diff --git a/_clang-format b/_clang-format
|
||||
index 39396fad65a..48de4d2bd88 100644
|
||||
--- a/_clang-format
|
||||
+++ b/_clang-format
|
||||
@@ -103,7 +103,7 @@ SpacesInContainerLiterals: false
|
||||
SpacesInCStyleCastParentheses: false
|
||||
SpacesInParentheses: false
|
||||
SpacesInSquareBrackets: false
|
||||
-Standard: c++17
|
||||
+Standard: c++20
|
||||
StatementMacros: []
|
||||
TypenameMacros: []
|
||||
TabWidth: 4
|
||||
diff --git a/src/ui/knot/knot-holder-entity.cpp b/src/ui/knot/knot-holder-entity.cpp
|
||||
index 8703f5975f7..add66d2fa29 100644
|
||||
--- a/src/ui/knot/knot-holder-entity.cpp
|
||||
+++ b/src/ui/knot/knot-holder-entity.cpp
|
||||
@@ -315,7 +315,7 @@ void PatternKnotHolderEntityScale::knot_set(Geom::Point const &p, Geom::Point co
|
||||
double scale_x = std::clamp(new_extent[X] / _cached_diagonal[X], _cached_min_scale, 1e9);
|
||||
double scale_y = std::clamp(new_extent[Y] / _cached_diagonal[Y], _cached_min_scale, 1e9);
|
||||
|
||||
- Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale(lerp(0.5, scale_x, scale_y))
|
||||
+ Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale((scale_x + scale_y) * 0.5)
|
||||
: Scale(scale_x, scale_y);
|
||||
|
||||
// 2. Calculate offset to keep pattern origin aligned
|
||||
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
|
||||
index fd2d08cad0c..7324f7c8515 100644
|
||||
--- a/src/ui/tools/pencil-tool.cpp
|
||||
+++ b/src/ui/tools/pencil-tool.cpp
|
||||
@@ -17,7 +17,11 @@
|
||||
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
|
||||
*/
|
||||
|
||||
-#include <numeric> // For std::accumulate
|
||||
+#include "pencil-tool.h"
|
||||
+
|
||||
+#include <cmath> // std::lerp
|
||||
+#include <numeric> // std::accumulate
|
||||
+
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <glibmm/i18n.h>
|
||||
|
||||
@@ -26,7 +30,6 @@
|
||||
#include <2geom/sbasis-to-bezier.h>
|
||||
#include <2geom/svg-path-parser.h>
|
||||
|
||||
-#include "pencil-tool.h"
|
||||
|
||||
#include "context-fns.h"
|
||||
#include "desktop.h"
|
||||
@@ -806,7 +809,7 @@ void PencilTool::_addFreehandPoint(Geom::Point const &p, guint /*state*/, bool l
|
||||
min = max;
|
||||
}
|
||||
double dezoomify_factor = 0.05 * 1000 / _desktop->current_zoom();
|
||||
- double const pressure_shrunk = pressure * (max - min) + min; // C++20 -> use std::lerp()
|
||||
+ double const pressure_shrunk = std::lerp(min, max, pressure);
|
||||
double pressure_computed = std::abs(pressure_shrunk * dezoomify_factor);
|
||||
double pressure_computed_scaled = std::abs(pressure_computed * _desktop->getDocument()->getDocumentScale().inverse()[Geom::X]);
|
||||
if (p != p_array[_npoints - 1]) {
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
--- a/src/extension/internal/pdfinput/svg-builder.cpp 2023-11-25 13:17:23.000000000 +0100
|
||||
+++ b/src/extension/internal/pdfinput/svg-builder.cpp 2024-08-23 18:27:43.504605248 +0200
|
||||
@@ -1158,9 +1158,13 @@
|
||||
#define INT_EPSILON 8
|
||||
bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
|
||||
_POPPLER_CONST Function *func) {
|
||||
- int type = func->getType();
|
||||
+ auto type = func->getType();
|
||||
auto space = shading->getColorSpace();
|
||||
+#if POPPLER_CHECK_VERSION(24, 3, 0)
|
||||
+ if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) { // Sampled or exponential function
|
||||
+#else
|
||||
if ( type == 0 || type == 2 ) { // Sampled or exponential function
|
||||
+#endif
|
||||
GfxColor stop1, stop2;
|
||||
if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) {
|
||||
return false;
|
||||
@@ -1168,7 +1172,11 @@
|
||||
_addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
|
||||
_addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
|
||||
}
|
||||
- } else if ( type == 3 ) { // Stitching
|
||||
+#if POPPLER_CHECK_VERSION(24, 3, 0)
|
||||
+ } else if ( type == Function::Type::Stitching ) { // Stitching
|
||||
+#else
|
||||
+ } else if ( type == 3 ) { // Stitching
|
||||
+#endif
|
||||
auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
|
||||
const double *bounds = stitchingFunc->getBounds();
|
||||
const double *encode = stitchingFunc->getEncode();
|
||||
@@ -1183,7 +1191,11 @@
|
||||
for ( int i = 0 ; i < num_funcs ; i++ ) {
|
||||
svgGetShadingColor(shading, bounds[i + 1], &color);
|
||||
// Add stops
|
||||
+#if POPPLER_CHECK_VERSION(24, 3, 0)
|
||||
+ if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) { // process exponential fxn
|
||||
+#else
|
||||
if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn
|
||||
+#endif
|
||||
double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
|
||||
if (expE > 1.0) {
|
||||
expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
From 96ca7a6c215aa14336b52753f56244dc8796ec43 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Becker <mail@heiko-becker.de>
|
||||
Date: Fri, 3 May 2024 14:52:00 +0200
|
||||
Subject: [PATCH] Fix build with poppler >= 24.05.0
|
||||
|
||||
GooString::hasUnicodeMarkerLE and GooString::hasUnicodeMarker were
|
||||
rename and moved to UTF.h [1][2]
|
||||
|
||||
[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/98fabb298b0e8eaef9193bbce68c99c85473a314
|
||||
[2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/1f06dca08c32ed18c3030530d98a0e30d41dd7a2
|
||||
---
|
||||
src/extension/internal/pdfinput/poppler-transition-api.h | 9 +++++++++
|
||||
src/extension/internal/pdfinput/poppler-utils.cpp | 6 ++++--
|
||||
2 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
|
||||
index 58aa1ec921d..481aefadf46 100644
|
||||
--- a/src/extension/internal/pdfinput/poppler-transition-api.h
|
||||
+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
|
||||
@@ -13,6 +13,15 @@
|
||||
#define SEEN_POPPLER_TRANSITION_API_H
|
||||
|
||||
#include <glib/poppler-features.h>
|
||||
+#include <poppler/UTF.h>
|
||||
+
|
||||
+#if POPPLER_CHECK_VERSION(24, 5, 0)
|
||||
+#define _POPPLER_HAS_UNICODE_BOM(value) (hasUnicodeByteOrderMark(value->toStr()))
|
||||
+#define _POPPLER_HAS_UNICODE_BOMLE(value) (hasUnicodeByteOrderMarkLE(value->toStr()))
|
||||
+#else
|
||||
+#define _POPPLER_HAS_UNICODE_BOM(value) (value->hasUnicodeMarker())
|
||||
+#define _POPPLER_HAS_UNICODE_BOMLE(value) (value->hasUnicodeMarkerLE())
|
||||
+#endif
|
||||
|
||||
#if POPPLER_CHECK_VERSION(24, 3, 0)
|
||||
#define _POPPLER_FUNCTION_TYPE_SAMPLED Function::Type::Sampled
|
||||
diff --git a/src/extension/internal/pdfinput/poppler-utils.cpp b/src/extension/internal/pdfinput/poppler-utils.cpp
|
||||
index 78d90c66c9d..c02815f64b9 100644
|
||||
--- a/src/extension/internal/pdfinput/poppler-utils.cpp
|
||||
+++ b/src/extension/internal/pdfinput/poppler-utils.cpp
|
||||
@@ -12,6 +12,8 @@
|
||||
|
||||
#include "poppler-utils.h"
|
||||
|
||||
+#include <poppler/UTF.h>
|
||||
+
|
||||
#include "2geom/affine.h"
|
||||
#include "GfxFont.h"
|
||||
#include "GfxState.h"
|
||||
@@ -563,10 +565,10 @@ std::string getDictString(Dict *dict, const char *key)
|
||||
*/
|
||||
std::string getString(const GooString *value)
|
||||
{
|
||||
- if (value->hasUnicodeMarker()) {
|
||||
+ if (_POPPLER_HAS_UNICODE_BOM(value)) {
|
||||
return g_convert(value->getCString () + 2, value->getLength () - 2,
|
||||
"UTF-8", "UTF-16BE", NULL, NULL, NULL);
|
||||
- } else if (value->hasUnicodeMarkerLE()) {
|
||||
+ } else if (_POPPLER_HAS_UNICODE_BOMLE(value)) {
|
||||
return g_convert(value->getCString () + 2, value->getLength () - 2,
|
||||
"UTF-8", "UTF-16LE", NULL, NULL, NULL);
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'inkscape'
|
||||
pkgname=inkscape
|
||||
version=1.3.2
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=cmake
|
||||
make_check_target="check"
|
||||
hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel
|
||||
|
|
@ -11,7 +11,7 @@ makedepends="aspell-devel cairomm-devel double-conversion-devel gc-devel
|
|||
hunspell-devel libatomic_ops-devel libcdr-devel libgomp-devel
|
||||
libvisio-devel libwpd-devel libwpd-devel libwpg-devel libxslt-devel pango-devel
|
||||
poppler-devel poppler-glib-devel potrace-devel gtest-devel gtksourceview4-devel
|
||||
boost-devel lib2geom-devel popt-devel readline-devel libxml2-devel"
|
||||
boost-devel lib2geom-devel popt-devel readline-devel libxml2-devel libsoup-devel"
|
||||
depends="desktop-file-utils hicolor-icon-theme python3-Pillow python3-appdirs
|
||||
python3-cssselect python3-lxml python3-numpy python3-requests python3-scour"
|
||||
checkdepends="$depends GraphicsMagick ImageMagick cantarell-fonts gtest-devel"
|
||||
|
|
@ -37,11 +37,4 @@ post_patch() {
|
|||
# since inkscape uses NULL instead of nullptr
|
||||
vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake
|
||||
fi
|
||||
# disable glyph tests that fail due to different hinting
|
||||
vsed -e \
|
||||
"s/add_subdirectory(rendering_tests)/# & - skipped due to hinting issues/" \
|
||||
-i testfiles/CMakeLists.txt
|
||||
# https://gitlab.com/inkscape/inkscape/-/commit/73c83ef9b8dc3e3dfd0fe24c75356623e7390ebd
|
||||
: >src/io/http.cpp 2>src/io/http.h
|
||||
vsed -i '/libsoup-2.4/d' CMakeScripts/DefineDependsandFlags.cmake
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue