From 107a564c3fa19cbb104810cd085bbc17387ac525 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 16 Feb 2023 21:03:29 +0000 Subject: [PATCH 1/9] poppler-data: update to 0.4.12. --- srcpkgs/poppler-data/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/poppler-data/template b/srcpkgs/poppler-data/template index 4b6e956b7b72..b348ddb8debd 100644 --- a/srcpkgs/poppler-data/template +++ b/srcpkgs/poppler-data/template @@ -1,13 +1,13 @@ # Template file for 'poppler-data' pkgname=poppler-data -version=0.4.11 +version=0.4.12 revision=1 short_desc="Encoding data for the poppler PDF rendering library" maintainer="Orphaned " license="MIT, GPL-2.0-or-later, BSD-3-Clause" homepage="https://poppler.freedesktop.org/" -distfiles="https://poppler.freedesktop.org/${pkgname}-${version}.tar.gz" -checksum=2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c +distfiles="https://poppler.freedesktop.org/poppler-data-${version}.tar.gz" +checksum=c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 do_install() { make prefix=/usr DESTDIR=${DESTDIR} install From e10c4c3af053eaa1752fcf8c35ffac7637812bf5 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 16 Feb 2023 21:03:42 +0000 Subject: [PATCH 2/9] poppler: update to 23.05.0. --- common/shlibs | 2 +- srcpkgs/poppler/template | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3f37bcd7614e..4de54c946e9e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -349,7 +349,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.126 libpoppler-22.12.0_1 +libpoppler.so.128 libpoppler-23.05.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 88d1e4b8d972..d1b58130a7c7 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.12.0 -revision=2 +version=23.05.0 +revision=1 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435 create_wrksrc=yes build_style=cmake @@ -22,14 +22,18 @@ maintainer="Orphaned " 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}/${pkgname}-${version}.tar.xz +distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz" -checksum="d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 +checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990 ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900" build_options="gir boost" build_options_default="gir boost" +if [ -z "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_MANUAL_TESTS=OFF -DBUILD_CPP_TESTS=OFF" +fi + post_extract() { mv poppler-*/* . mv test-${_testVersion} testdatadir From 88b9f37fe1b94f5c09a5e7f08b6e4f022f5dbfc4 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 16 Feb 2023 21:03:36 +0000 Subject: [PATCH 3/9] poppler-qt5: update to 23.05.0. --- srcpkgs/poppler-qt5/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index 49b4f34e9c4c..7772805ac31b 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -4,12 +4,13 @@ # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5. # pkgname=poppler-qt5 -version=22.12.0 -revision=2 +version=23.05.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 - -DENABLE_QT6=ON -DQT_HOST_PATH=/usr" + -DENABLE_QT6=ON -DQT_HOST_PATH=/usr -DBUILD_MANUAL_TESTS=OFF + -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF" hostmakedepends="pkg-config qt5-devel qt6-base-devel" makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel" @@ -18,8 +19,8 @@ maintainer="Orphaned " 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=d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 +distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz" +checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990 # fails to find a bunch of files make_check=no @@ -52,7 +53,7 @@ poppler-qt5-devel_package() { poppler-qt6_package() { short_desc="${short_desc/Qt5/Qt6}" pkg_install() { - vmove usr/lib/libpoppler-qt6.so.* + vmove "usr/lib/libpoppler-qt6.so.*" } } From 4285fefb01d1dc88b5abbe58dac0ffa4b521dfd2 Mon Sep 17 00:00:00 2001 From: triallax Date: Fri, 5 May 2023 18:07:21 +0300 Subject: [PATCH 4/9] calligra: revbump for poppler-23.05.0. --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index fa2d3a09c3dd..d0bdd2fec265 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=12 +revision=13 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From f1b23832e70c66608b34098b6f0c422c66a7f8b6 Mon Sep 17 00:00:00 2001 From: triallax Date: Fri, 5 May 2023 18:07:31 +0300 Subject: [PATCH 5/9] inkscape: revbump for poppler-23.05.0. --- srcpkgs/inkscape/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 2e434be00841..870a4512a8e0 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1.1 -revision=7 +revision=8 build_style=cmake # builds executables then runs checks # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 From 91032c828d999cf18ee9d938581465ff1449f10b Mon Sep 17 00:00:00 2001 From: triallax Date: Fri, 5 May 2023 18:07:32 +0300 Subject: [PATCH 6/9] ipe: revbump for poppler-23.05.0. --- srcpkgs/ipe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index a0c14e3548c2..721db5304b02 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe version=7.2.26 -revision=8 +revision=9 _tools_commit=v7.2.24.1 create_wrksrc=yes hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools" From 6f1da3f552dfe90c9ed3b763cfc548c697e45ed3 Mon Sep 17 00:00:00 2001 From: triallax Date: Fri, 5 May 2023 18:07:34 +0300 Subject: [PATCH 7/9] pdf2djvu: revbump for poppler-23.05.0. --- srcpkgs/pdf2djvu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template index 7dea06057f9a..0c76cd60dde7 100644 --- a/srcpkgs/pdf2djvu/template +++ b/srcpkgs/pdf2djvu/template @@ -1,7 +1,7 @@ # Template file for 'pdf2djvu' pkgname=pdf2djvu version=0.9.19 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config djvulibre gettext" makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel" From b433d50de1b9ab30c2635bdf4c7af55c439403e1 Mon Sep 17 00:00:00 2001 From: triallax Date: Fri, 5 May 2023 18:07:38 +0300 Subject: [PATCH 8/9] scribus: revbump for poppler-23.05.0. --- srcpkgs/scribus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index d782ee4fd9bf..7794c71b0e6c 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus version=1.5.8 -revision=7 +revision=8 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON" From 6fffb3553ba6243761e89104cc6e10bceefaa45b Mon Sep 17 00:00:00 2001 From: triallax Date: Sat, 6 May 2023 01:26:21 +0300 Subject: [PATCH 9/9] kitinerary: revbump for poppler-23.05.0. --- srcpkgs/kitinerary/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template index ff90a2306793..f15756816e34 100644 --- a/srcpkgs/kitinerary/template +++ b/srcpkgs/kitinerary/template @@ -1,7 +1,7 @@ # Template file for 'kitinerary' pkgname=kitinerary version=23.04.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"