summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-06-11 23:05:52 -0500
committerZach van Rijn <me@zv.io>2022-10-21 18:34:01 -0500
commit3506160b155883cbcbbd8a1b2fc4adda77eaa571 (patch)
tree84d6d8f0badf32cb53fd957b0b0dc13c85c42773
parent37b22f2d880e0ed979e5f1a5bd628706135f4720 (diff)
downloadpackages-3506160b155883cbcbbd8a1b2fc4adda77eaa571.tar.gz
packages-3506160b155883cbcbbd8a1b2fc4adda77eaa571.tar.bz2
packages-3506160b155883cbcbbd8a1b2fc4adda77eaa571.tar.xz
packages-3506160b155883cbcbbd8a1b2fc4adda77eaa571.zip
user/poppler: Update to 22.06.0
-rw-r--r--user/poppler-qt5/APKBUILD24
-rw-r--r--user/poppler/APKBUILD20
2 files changed, 16 insertions, 28 deletions
diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD
index 9bbc093a9..8c6be0745 100644
--- a/user/poppler-qt5/APKBUILD
+++ b/user/poppler-qt5/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=poppler-qt5
_realname=poppler
-pkgver=0.83.0
+pkgver=22.06.0
pkgrel=0
_testver=01c92874
pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)"
@@ -10,13 +10,13 @@ arch="all"
license="GPL-2.0+"
depends=""
depends_dev="$makedepends"
-makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev
+makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev boost-dev
qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev cmake"
subpackages="$pkgname-dev"
source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz
https://distfiles.adelielinux.org/source/poppler-test-$_testver.tar.gz
"
-builddir="$srcdir"/$_realname-$pkgver/build
+builddir="$srcdir"/$_realname-$pkgver
# secfixes: poppler
# 0.77.0-r0:
@@ -31,19 +31,14 @@ builddir="$srcdir"/$_realname-$pkgver/build
# - CVE-2019-9959
# - CVE-2019-14494
-prepare() {
- default_prepare
- mkdir "$builddir"
-}
-
build() {
- cmake \
+ cmake -Bbuild \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DTESTDATADIR="$srcdir/poppler-test-$_testver" \
- ..
- make
+ .
+ make -C build
}
check() {
@@ -57,10 +52,9 @@ check() {
}
package() {
- install -D -m644 poppler-qt5.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt5.pc
- cd qt5
- make DESTDIR="$pkgdir" install
+ install -D -m644 build/poppler-qt5.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt5.pc
+ make -C build/qt5 DESTDIR="$pkgdir" install
}
-sha512sums="bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713 poppler-0.83.0.tar.xz
+sha512sums="79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3 poppler-22.06.0.tar.xz
5275541ffa0fef9c55a0c02411947c610b2e7eb621f0a0fa9529810f8b09e2b0194c1da4b64eb9641b2c3af7b099e6bb7d1212b9087a21cf3af893090a10506b poppler-test-01c92874.tar.gz"
diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD
index 5ea8219f3..25ad9b820 100644
--- a/user/poppler/APKBUILD
+++ b/user/poppler/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer:
pkgname=poppler
-pkgver=0.83.0
+pkgver=22.06.0
pkgrel=0
pkgdesc="PDF rendering library based on xpdf 3.0"
url="https://poppler.freedesktop.org/"
@@ -11,10 +11,9 @@ depends=""
depends_dev="cairo-dev glib-dev"
makedepends="$depends_dev libjpeg-turbo-dev cairo-dev libxml2-dev openjpeg-dev
fontconfig-dev gobject-introspection-dev lcms2-dev libpng-dev tiff-dev
- zlib-dev cmake"
+ zlib-dev boost-dev cmake"
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-glib"
source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
-builddir="$srcdir"/$pkgname-$pkgver/build
# secfixes:
# 0.77.0-r0:
@@ -29,23 +28,18 @@ builddir="$srcdir"/$pkgname-$pkgver/build
# - CVE-2019-9959
# - CVE-2019-14494
-prepare() {
- default_prepare
- mkdir "$builddir"
-}
-
build() {
- cmake \
+ cmake -Bbuild \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
- ..
- make
+ .
+ make -C build
}
package() {
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
}
utils() {
@@ -63,4 +57,4 @@ glib() {
"$subpkgdir"/usr/lib/
}
-sha512sums="bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713 poppler-0.83.0.tar.xz"
+sha512sums="79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3 poppler-22.06.0.tar.xz"