From cd0abc1d5c24b670fc9f3014d314770747c845b7 Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Tue, 13 Dec 2022 21:57:00 +0100 Subject: [PATCH 1/8] poppler: update to 22.12.0. --- common/shlibs | 2 +- srcpkgs/poppler/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8fafa638e86e..9a92510fdb3f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -352,7 +352,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.122 libpoppler-22.06.0_1 +libpoppler.so.126 libpoppler-22.12.0_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 1bb3ff0720f3..a23634907e14 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,8 +3,8 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=22.07.0 -revision=2 +version=22.12.0 +revision=1 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435 create_wrksrc=yes build_style=cmake @@ -24,7 +24,7 @@ homepage="https://poppler.freedesktop.org" changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS" distfiles="${homepage}/${pkgname}-${version}.tar.xz https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz" -checksum="420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428 +checksum="d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900" build_options="gir boost" From d9ba66a0d5d172d6c7fa19dda3b0d0993d338889 Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Tue, 13 Dec 2022 21:57:09 +0100 Subject: [PATCH 2/8] poppler-qt5: update to 22.12.0. --- srcpkgs/poppler-qt5/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index f368d9c4e1e7..7c9d935d1a61 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -4,8 +4,8 @@ # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5. # pkgname=poppler-qt5 -version=22.07.0 -revision=2 +version=22.12.0 +revision=1 build_style=cmake configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF @@ -19,7 +19,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://poppler.freedesktop.org" changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS" distfiles="${homepage}/poppler-${version}.tar.xz" -checksum=420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428 +checksum=d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 # fails to find a bunch of files make_check=no From 8fe6fc988ec2e07062c26897e85e0314c3800def Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Mon, 12 Dec 2022 16:27:55 +0100 Subject: [PATCH 3/8] inkscape: rebuild for poppler-22.12.0 --- .../inkscape-1.2.1-poppler-22.09.0.patch | 53 +++++++++++++++++++ srcpkgs/inkscape/template | 2 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch diff --git a/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch b/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch new file mode 100644 index 000000000000..36d4192c862f --- /dev/null +++ b/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch @@ -0,0 +1,53 @@ +From 2f3101417a04721c42b6b101dde07fa961a56f1b Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 6 Sep 2022 10:10:25 +0000 +Subject: [PATCH] Fix build with Poppler 22.09.0 + +Adapt to changes in Poppler's getLineDash/setLineDash interface to allow building with Poppler 22.09.0. +--- + 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*/) + _POPPLER_FREE(obj); + } + } ++#if POPPLER_CHECK_VERSION(22, 9, 0) ++ state->setLineDash(std::vector (dash, dash + length), args[1].getNum()); ++#else + state->setLineDash(dash, length, args[1].getNum()); ++#endif + 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 +@@ -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 +- double *dash_pattern; + int dash_length; + double dash_start; ++#if POPPLER_CHECK_VERSION(22, 9, 0) ++ const double *dash_pattern; ++ const std::vector &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++ ) { +-- +GitLab + diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 003d2170baf3..3d239f62f896 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1.1 -revision=5 +revision=6 build_style=cmake # builds executables then runs checks # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 From df2b4b897f0da5dea4bc18e029efe798aba4ecff Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Mon, 12 Dec 2022 18:32:03 +0100 Subject: [PATCH 4/8] ipe: rebuild for poppler-22.12.0 --- srcpkgs/ipe/patches/poppler-22.09.0-fix.patch | 26 +++++++++++++++++++ srcpkgs/ipe/template | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ipe/patches/poppler-22.09.0-fix.patch diff --git a/srcpkgs/ipe/patches/poppler-22.09.0-fix.patch b/srcpkgs/ipe/patches/poppler-22.09.0-fix.patch new file mode 100644 index 000000000000..5bce0f13555a --- /dev/null +++ b/srcpkgs/ipe/patches/poppler-22.09.0-fix.patch @@ -0,0 +1,26 @@ +Taken from https://github.com/otfried/ipe-tools/pull/55/commits/65586fcd9cc39e482ae5a9abdb6f4932d9bb88c4 + +diff --git a/pdftoipe/xmloutputdev.cpp b/pdftoipe/xmloutputdev.cpp +index 291eb5f..17bac2a 100644 +--- a/ipe-tools/pdftoipe/xmloutputdev.cpp ++++ b/ipe-tools/pdftoipe/xmloutputdev.cpp +@@ -149,15 +149,15 @@ void XmlOutputDev::stroke(GfxState *state) + writeColor("getTransformedLineWidth()); + +- double *dash; + double start; +- int length, i; ++ std::vector dash = state->getLineDash(&start); ++ int length = dash.size(); ++ int i; + +- state->getLineDash(&dash, &length, &start); + if (length) { + writePS(" dash=\"["); + for (i = 0; i < length; ++i) +- writePSFmt("%g%s", state->transformWidth(dash[i]), ++ writePSFmt("%g%s", state->transformWidth(dash.at(i)), + (i == length-1) ? "" : " "); + writePSFmt("] %g\"", state->transformWidth(start)); + } diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index 9f9428f870a6..a0c14e3548c2 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe version=7.2.26 -revision=7 +revision=8 _tools_commit=v7.2.24.1 create_wrksrc=yes hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools" From 707bd9e1cd62e746e862af8672dd87378424957a Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Mon, 12 Dec 2022 18:32:06 +0100 Subject: [PATCH 5/8] scribus: rebuild for poppler-22.12.0 --- .../patches/0004-poppler-22.09.0-fix.patch | 20 +++++++++++++++++++ srcpkgs/scribus/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch diff --git a/srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch b/srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch new file mode 100644 index 000000000000..106a6f5162b6 --- /dev/null +++ b/srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch @@ -0,0 +1,20 @@ +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3741,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState *state) + break; + } + double lw = state->getLineWidth(); +- double *dashPattern; + int dashLength; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0) ++ const double *dashPattern; ++ const std::vector &dash = state->getLineDash(&DashOffset); ++ dashPattern = dash.data(); ++ dashLength = dash.size(); ++#else ++ double *dashPattern; + state->getLineDash(&dashPattern, &dashLength, &DashOffset); ++#endif + QVector pattern(dashLength); + for (int i = 0; i < dashLength; ++i) + { diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index e914a8e10eda..63cefeb7693d 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus version=1.5.8 -revision=4 +revision=5 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON" From 62eccd3a98048a8750e3f933e63d66e6bf25ea5e Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Mon, 12 Dec 2022 18:32:09 +0100 Subject: [PATCH 6/8] libreoffice: rebuild for poppler-22.12.0 --- srcpkgs/libreoffice/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 7d1004672fa3..69779030648b 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=7.4.2.3 -revision=2 +revision=3 build_style=meta make_build_target="build" nocross="Several dependencies are nocross=yes" From 8372811215aa4c9a44ce05165a9a6e9940215464 Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Mon, 12 Dec 2022 18:32:19 +0100 Subject: [PATCH 7/8] calligra: rebuild for poppler-22.12.0 --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index ba3d66ea745a..3ba8ef8f9dbb 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=9 +revision=10 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From 064fd46cb71fae4734b7742e30b9f0069e66e23b Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Mon, 12 Dec 2022 18:32:27 +0100 Subject: [PATCH 8/8] kitinerary: rebuild for poppler-22.12.0 --- srcpkgs/kitinerary/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template index ed9bd13c6fbb..18ea3ed9f3f2 100644 --- a/srcpkgs/kitinerary/template +++ b/srcpkgs/kitinerary/template @@ -1,7 +1,7 @@ # Template file for 'kitinerary' pkgname=kitinerary version=22.08.2 -revision=2 +revision=3 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel" makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel