git » poppler.git » commit 101a3ab

diff --git a/.SRCINFO b/.SRCINFO
index 9fe0e8b..68ca429 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,12 @@
 pkgbase = poppler
-	pkgver = 24.01.0
+	pkgver = 24.03.0
 	pkgrel = 1
 	url = https://poppler.freedesktop.org/
 	arch = x86_64
-	license = GPL
+	license = GPL-2.0-only
+	license = GPL-3.0-or-later
+	license = MIT
+	license = HPND-sell-variant
 	makedepends = libjpeg
 	makedepends = gcc-libs
 	makedepends = cairo
@@ -26,11 +29,11 @@ pkgbase = poppler
 	makedepends = python
 	makedepends = boost
 	options = !emptydirs
-	source = https://poppler.freedesktop.org/poppler-24.01.0.tar.xz
-	source = https://poppler.freedesktop.org/poppler-24.01.0.tar.xz.sig
+	source = https://poppler.freedesktop.org/poppler-24.03.0.tar.xz
+	source = https://poppler.freedesktop.org/poppler-24.03.0.tar.xz.sig
 	source = test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1
 	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
-	sha256sums = c7def693a7a492830f49d497a80cc6b9c85cb57b15e9be2d2d615153b79cae08
+	sha256sums = bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
 	sha256sums = SKIP
 	sha256sums = SKIP
 
@@ -54,12 +57,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.01.0
-	conflicts = poppler-qt4<24.01.0
+	conflicts = poppler-qt3<24.03.0
+	conflicts = poppler-qt4<24.03.0
 
 pkgname = poppler-glib
 	pkgdesc = Poppler glib bindings
-	depends = poppler=24.01.0
+	depends = poppler=24.03.0
 	depends = glib2
 	depends = gcc-libs
 	depends = freetype2
@@ -69,7 +72,7 @@ pkgname = poppler-glib
 
 pkgname = poppler-qt5
 	pkgdesc = Poppler Qt5 bindings
-	depends = poppler=24.01.0
+	depends = poppler=24.03.0
 	depends = qt5-base
 	depends = lcms2
 	depends = freetype2
@@ -79,7 +82,7 @@ pkgname = poppler-qt5
 
 pkgname = poppler-qt6
 	pkgdesc = Poppler Qt6 bindings
-	depends = poppler=24.01.0
+	depends = poppler=24.03.0
 	depends = qt6-base
 	depends = lcms2
 	depends = freetype2
diff --git a/PKGBUILD b/PKGBUILD
index cfeaa46..3685921 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,13 @@
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt5' 'poppler-qt6')
-pkgver=24.01.0
+pkgver=24.03.0
 pkgrel=1
 arch=(x86_64)
-license=('GPL')
+license=('GPL-2.0-only'
+         'GPL-3.0-or-later'
+         'MIT'
+         'HPND-sell-variant')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 
              'gtk3' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu'
              'qt5-base' 'qt6-base' 'git' 'nss' 'gpgme' 'gtk-doc' 'curl' 'poppler-data'
@@ -16,29 +19,22 @@ 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=400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1)
-sha256sums=('c7def693a7a492830f49d497a80cc6b9c85cb57b15e9be2d2d615153b79cae08'
+sha256sums=('bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446'
             'SKIP'
             'SKIP')
 validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # Albert Astals Cid <aacid@kde.org>
 
-prepare() {
-  mkdir build
-}
-
 build() {
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
+  cmake -B build -S "$pkgname-$pkgver" \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
     -DENABLE_GTK_DOC=ON
-  make
+  cmake --build build
 }
 
 check() {
-  cd build
-  LANG=en_US.UTF8 make test
+  LANG=en_US.UTF8 ctest --test-dir build --output-on-failure
 }
 
 package_poppler() {
@@ -50,8 +46,7 @@ package_poppler() {
   provides=('libpoppler.so' 'libpoppler-cpp.so')
   conflicts=("poppler-qt3<${pkgver}" "poppler-qt4<${pkgver}")
 
-  cd build
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build
 
   # cleanup for splitted build
   rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt5,qt6}
@@ -59,6 +54,10 @@ package_poppler() {
   rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt5,qt6}.pc
   rm -vrf "${pkgdir}"/usr/{lib,share}/gir*
   rm -vrf "${pkgdir}"/usr/share/gtk-doc
+
+  # license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 "${srcdir}"/${pkgname}-${pkgver}/{COPYING,COPYING3,README-XPDF,README.contributors} "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
 
 package_poppler-glib() {
@@ -73,6 +72,10 @@ package_poppler-glib() {
   install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
   rm -vf "${pkgdir}"/usr/lib/libpoppler.*
   rm -vf "${pkgdir}/usr/bin/poppler-glib-demo"
+
+  # license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 "${srcdir}"/${pkgbase}-${pkgver}/{COPYING,COPYING3,README-XPDF,README.contributors} "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
 
 package_poppler-qt5() {
@@ -84,6 +87,10 @@ package_poppler-qt5() {
   make -C qt5 DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
+
+  # license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 "${srcdir}"/${pkgbase}-${pkgver}/{COPYING,COPYING3,README-XPDF,README.contributors} "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
 
 package_poppler-qt6() {
@@ -95,4 +102,8 @@ package_poppler-qt6() {
   make -C qt6 DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m644 poppler-qt6.pc "${pkgdir}/usr/lib/pkgconfig/"
+
+  # license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 "${srcdir}"/${pkgbase}-${pkgver}/{COPYING,COPYING3,README-XPDF,README.contributors} "${pkgdir}"/usr/share/licenses/${pkgname}/
 }