diff --git a/poppler/.SRCINFO b/poppler/.SRCINFO index 5441f15254..5b53599ae5 100644 --- a/poppler/.SRCINFO +++ b/poppler/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = poppler - pkgver = 24.09.0 - pkgrel = 4 + pkgver = 24.11.0 + pkgrel = 2 url = https://poppler.freedesktop.org/ arch = x86_64 arch = powerpc64le @@ -36,13 +36,15 @@ pkgbase = poppler makedepends = boost makedepends = glib2-devel options = !emptydirs - source = https://poppler.freedesktop.org/poppler-24.09.0.tar.xz - source = https://poppler.freedesktop.org/poppler-24.09.0.tar.xz.sig + source = https://poppler.freedesktop.org/poppler-24.11.0.tar.xz + source = https://poppler.freedesktop.org/poppler-24.11.0.tar.xz.sig source = test::git+https://gitlab.freedesktop.org/poppler/test.git#commit=ff3133cdb6cb496ee1d2c3231bfa35006a5e8410 + source = add_removed_headers_back.patch validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 - sha256sums = ebd857987e2395608c69fdc44009692d5906f13b612c5280beff65a0b75dc255 + sha256sums = 7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58 sha256sums = SKIP sha256sums = SKIP + sha256sums = 3face2bc5303d0c2af0b48685595a988a8a185c4b3726347ffd19563faf9ab50 pkgname = poppler pkgdesc = PDF rendering library based on xpdf 3.0 @@ -64,12 +66,12 @@ pkgname = poppler optdepends = poppler-data: highly recommended encoding data to display PDF documents with certain encodings and characters provides = libpoppler.so provides = libpoppler-cpp.so - conflicts = poppler-qt3<24.09.0 - conflicts = poppler-qt4<24.09.0 + conflicts = poppler-qt3<24.11.0 + conflicts = poppler-qt4<24.11.0 pkgname = poppler-glib pkgdesc = Poppler glib bindings - depends = poppler=24.09.0 + depends = poppler=24.11.0 depends = glib2 depends = gcc-libs depends = freetype2 @@ -79,7 +81,7 @@ pkgname = poppler-glib pkgname = poppler-qt5 pkgdesc = Poppler Qt5 bindings - depends = poppler=24.09.0 + depends = poppler=24.11.0 depends = qt5-base depends = lcms2 depends = freetype2 @@ -89,7 +91,7 @@ pkgname = poppler-qt5 pkgname = poppler-qt6 pkgdesc = Poppler Qt6 bindings - depends = poppler=24.09.0 + depends = poppler=24.11.0 depends = qt6-base depends = lcms2 depends = freetype2 diff --git a/poppler/PKGBUILD b/poppler/PKGBUILD index 4d2e13aadd..bffa28b0c9 100644 --- a/poppler/PKGBUILD +++ b/poppler/PKGBUILD @@ -1,11 +1,12 @@ # POWER Maintainer: Alexander Baldeck # Maintainer: AndyRTR +# Maintainer: Robin Candau # Contributor: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt5' 'poppler-qt6') -pkgver=24.09.0 -pkgrel=4 +pkgver=24.11.0 +pkgrel=2 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) license=('GPL-2.0-only' 'GPL-3.0-or-later' @@ -21,14 +22,23 @@ options=('!emptydirs') url="https://poppler.freedesktop.org/" # https://gitlab.freedesktop.org/poppler/poppler source=(https://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz{,.sig} - # test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=ff3133cdb6cb496ee1d2c3231bfa35006a5e8410 test::git+https://gitlab.freedesktop.org/poppler/test.git#commit=ff3133cdb6cb496ee1d2c3231bfa35006a5e8410 + add_removed_headers_back.patch ) -sha256sums=('ebd857987e2395608c69fdc44009692d5906f13b612c5280beff65a0b75dc255' +sha256sums=('7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58' 'SKIP' - 'SKIP') + 'SKIP' + '3face2bc5303d0c2af0b48685595a988a8a185c4b3726347ffd19563faf9ab50') validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # Albert Astals Cid +prepare() { + cd "$pkgname-$pkgver" + # Temporary patch to add back removed headers in 24.11.0 + # that are still needed by scribus. + # Those headers should be added back in 24.12.0 + patch -Np1 < "$srcdir/add_removed_headers_back.patch" +} + build() { cmake -B build -S "$pkgname-$pkgver" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ diff --git a/poppler/add_removed_headers_back.patch b/poppler/add_removed_headers_back.patch new file mode 100644 index 0000000000..ff829a2e39 --- /dev/null +++ b/poppler/add_removed_headers_back.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb1c73a..7ad1a05 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -675,11 +675,13 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS) + poppler/Array.h + poppler/CachedFile.h + poppler/Catalog.h ++ poppler/CharCodeToUnicode.h + poppler/DateInfo.h + poppler/Dict.h + poppler/Error.h + poppler/FILECacheLoader.h + poppler/FileSpec.h ++ poppler/FontEncodingTables.h + poppler/FontInfo.h + poppler/Form.h + poppler/Function.h +@@ -720,6 +722,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS) + poppler/UnicodeCClassTables.h + poppler/UnicodeCompTables.h + poppler/UnicodeDecompTables.h ++ poppler/ViewerPreferences.h + poppler/XRef.h + poppler/CharTypes.h + poppler/ErrorCodes.h +@@ -755,6 +758,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS) + splash/SplashBitmap.h + splash/SplashClip.h + splash/SplashErrorCodes.h ++ splash/SplashFont.h + splash/SplashFontEngine.h + splash/SplashFontFile.h + splash/SplashFontFileID.h