summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO29
-rw-r--r--PKGBUILD33
2 files changed, 42 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ddc5ea32125a..f32efac4494d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by mksrcinfo v8
-# Sun May 24 21:27:31 UTC 2020
pkgbase = poppler-git
- pkgver = 0.88.0.r34.g9429aac4
+ pkgver = 22.04.0.r43.g368465a8
pkgrel = 1
url = https://poppler.freedesktop.org/
arch = x86_64
@@ -19,6 +17,7 @@ pkgbase = poppler-git
makedepends = gobject-introspection
makedepends = icu
makedepends = qt5-base
+ makedepends = qt6-base
makedepends = git
makedepends = nss
makedepends = gtk-doc
@@ -30,6 +29,7 @@ pkgbase = poppler-git
options = !emptydirs
source = git://git.freedesktop.org/git/poppler/poppler
source = git://git.freedesktop.org/git/poppler/test
+ validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
md5sums = SKIP
md5sums = SKIP
sha256sums = SKIP
@@ -45,27 +45,34 @@ pkgname = poppler-git
depends = lcms2
depends = nss
depends = curl
- optdepends = poppler-data: encoding data to display PDF documents containing CJK characters
+ optdepends = poppler-data: highly recommended encoding data to display PDF documents with certain encodings and characters
provides = libpoppler.so
provides = libpoppler-cpp.so
- provides = poppler=0.88.0
- conflicts = poppler-qt3<0.88.0
- conflicts = poppler-qt4<0.88.0
+ provides = poppler=22.04.0
+ conflicts = poppler-qt3<22.04.0
+ conflicts = poppler-qt4<22.04.0
conflicts = poppler
pkgname = poppler-glib-git
pkgdesc = Poppler glib bindings
- depends = poppler=0.88.0
+ depends = poppler=22.04.0
depends = glib2
provides = libpoppler-glib.so
- provides = poppler-glib=0.88.0
+ provides = poppler-glib=22.04.0
conflicts = poppler-glib
pkgname = poppler-qt5-git
pkgdesc = Poppler Qt5 bindings
- depends = poppler=0.88.0
+ depends = poppler=22.04.0
depends = qt5-base
provides = libpoppler-qt5.so
- provides = poppler-qt5=0.88.0
+ provides = poppler-qt5=22.04.0
conflicts = poppler-qt5
+pkgname = poppler-qt6-git
+ pkgdesc = Poppler Qt6 bindings
+ depends = poppler=22.04.0
+ depends = qt6-base
+ provides = libpoppler-qt6.so
+ provides = poppler-qt6=22.04.0
+ conflicts = poppler-qt6
diff --git a/PKGBUILD b/PKGBUILD
index d9b6b6176ea3..b5fca1bb2e13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,18 +6,17 @@
set -u
pkgbase=poppler
pkgbase+='-git'
-pkgname=('poppler' 'poppler-glib' 'poppler-qt5')
+pkgname=('poppler' 'poppler-glib' 'poppler-qt5' 'poppler-qt6')
pkgname=("${pkgname[@]/%/-git}")
-pkgver=0.88.0.r34.g9429aac4
+pkgver=22.04.0.r43.g368465a8
_pkgver="${pkgver%%.r*}"
pkgrel=1
arch=(x86_64)
arch+=('i686' 'aarch64')
license=('GPL')
makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'pkgconfig' 'lcms2'
- 'gobject-introspection' 'icu' 'qt5-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data'
+ 'gobject-introspection' 'icu' 'qt5-base' 'qt6-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data'
'cmake' 'python' 'boost')
-#makedepends+=('openjpeg2')
options=('!emptydirs')
url="https://poppler.freedesktop.org/"
source=('git://git.freedesktop.org/git/poppler/poppler'
@@ -38,7 +37,7 @@ pkgver() {
prepare() {
set -u
cd 'poppler'
- mkdir build
+ mkdir -p build
set +u
}
@@ -68,7 +67,7 @@ package_poppler-git() {
set -u
pkgdesc="PDF rendering library based on xpdf 3.0"
depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'lcms2' 'nss' 'curl')
- optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
+ optdepends=('poppler-data: highly recommended encoding data to display PDF documents with certain encodings and characters')
provides=('libpoppler.so' 'libpoppler-cpp.so')
provides+=("poppler=${_pkgver}")
conflicts=("poppler-qt3<${_pkgver}" "poppler-qt4<${_pkgver}")
@@ -79,9 +78,9 @@ package_poppler-git() {
make DESTDIR="${pkgdir}" install
# cleanup for splitted build
- rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt5}
- rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt5}.*
- rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt5}.pc
+ rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt5,qt6}
+ rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt5,qt6}.*
+ 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
}
@@ -120,4 +119,20 @@ package_poppler-qt5-git() {
install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
set +u
}
+
+package_poppler-qt6-git() {
+ set -u
+ pkgdesc="Poppler Qt6 bindings"
+ depends=("poppler=${_pkgver}" 'qt6-base')
+ conflicts=('poppler-qt6')
+ provides=('libpoppler-qt6.so')
+ provides+=("poppler-qt6=${_pkgver}")
+
+ cd poppler
+ cd build
+ make -C qt6 DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+ install -m644 poppler-qt6.pc "${pkgdir}/usr/lib/pkgconfig/"
+ set +u
+}
set +u