42.1-1

PKGBUILD

 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=evince
-pkgver=41.4
+pkgbase=evince
+pkgname=(evince evince-lib-docs)
+pkgver=42.1
 pkgrel=1
 pkgdesc="Document viewer (PDF, PostScript, XPS, djvu, dvi, tiff, cbr, cbz, cb7, cbt)"
 url="https://wiki.gnome.org/Apps/Evince"
@@ -11,12 +12,10 @@ license=(GPL)
 depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre t1lib dconf libsecret libsynctex
          gsettings-desktop-schemas gnome-desktop libarchive gst-plugins-base-libs gspell libhandy
          gvfs)
-makedepends=(libnautilus-extension texlive-bin gobject-introspection docbook-xsl python gtk-doc git
-             meson appstream-glib yelp-tools)
-optdepends=('texlive-bin: DVI support')
-provides=(libev{document,view}3.so)
-groups=(gnome)
-_commit=27a1be1b599ac8e6021622739f79a25f24dfe635  # tags/41.4^0
+makedepends=(libnautilus-extension texlive-bin gobject-introspection gi-docgen git meson
+             appstream-glib yelp-tools)
+options=(debug)
+_commit=67084a4f4ec10445bf8f3ef2cf98cb0ccaabcb19  # tags/42.1^0
 source=("git+https://gitlab.gnome.org/GNOME/evince.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -27,9 +26,6 @@ pkgver() {
 
 prepare() {
   cd evince
-
-  # Fix build with Meson 0.61
-  git cherry-pick -n 1060b24d051607f14220f148d2f7723b29897a54
 }
   
 build() {
@@ -41,6 +37,31 @@ check() {
   meson test -C build --print-errorlogs
 }
 
-package() {
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_evince() {
+  provides=(libev{document,view}3.so)
+  optdepends=('texlive-bin: DVI support')
+  groups=(gnome)
+
   meson install -C build --destdir "$pkgdir"
+
+  _pick lib-docs "$pkgdir"/usr/share/doc/lib*
 }
+
+package_evince-lib-docs() {
+  pkgdesc+=" (library API documentation)"
+  depends=()
+
+  mv lib-docs/* "$pkgdir"
+}
+
+# vim:set sw=2 et: