From 5d45a6568f6bd25c7153dfc5bb05261bfeb32ff6 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 1f38a12db30ac957e6c95fb30df85b160718590b 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.04.0. --- common/shlibs | 2 +- srcpkgs/poppler/template | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index ddd0a3266a36..338e5ec84ea7 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.127 libpoppler-23.04.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 a23634907e14..2d806cfb0477 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=22.12.0 +version=23.04.0 revision=1 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435 create_wrksrc=yes @@ -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="b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1 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 1052473db66cbab559964c110b6256fecfeb9ffe 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.04.0. --- srcpkgs/poppler-qt5/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index 7c9d935d1a61..1517add3f5dc 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 +version=23.04.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=b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1 # 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 ee7a70a00b0332ffb61852bd9a2bdc0308e29a8d Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 2 Apr 2023 22:56:48 +0100 Subject: [PATCH 4/9] calligra: revbump for poppler-23.04.0. --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index daf927aeb06a..de15d03cc0ad 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=11 +revision=12 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From 15f8365830ad12752e5fa0396acaeefc882ce188 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 2 Apr 2023 22:56:48 +0100 Subject: [PATCH 5/9] inkscape: revbump for poppler-23.04.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 653b6be1d235ca167fd03b11f1356ab367bb711a Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 2 Apr 2023 22:56:48 +0100 Subject: [PATCH 6/9] ipe: revbump for poppler-23.04.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 89daac3c61ffcd4132e5f57dc3ceff7705e7ff54 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 2 Apr 2023 22:56:49 +0100 Subject: [PATCH 7/9] kitinerary: revbump for poppler-23.04.0. --- srcpkgs/kitinerary/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template index 11e33c45ebfe..ad0a8100e072 100644 --- a/srcpkgs/kitinerary/template +++ b/srcpkgs/kitinerary/template @@ -1,7 +1,7 @@ # Template file for 'kitinerary' pkgname=kitinerary version=22.12.1 -revision=1 +revision=2 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 From 665bc5931264101ff50c184d4d9e7ce43e0bd851 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 2 Apr 2023 22:56:49 +0100 Subject: [PATCH 8/9] pdf2djvu: revbump for poppler-23.04.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 548d0e6acf3907d1374edeaa87af1ad6866caac4 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 2 Apr 2023 22:56:49 +0100 Subject: [PATCH 9/9] scribus: revbump for poppler-23.04.0. --- srcpkgs/scribus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index 63cefeb7693d..856a43e43aa5 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus version=1.5.8 -revision=5 +revision=6 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"