[arch-commits] Commit in libfprint/repos/extra-x86_64 (PKGBUILD PKGBUILD fix.diff)

[Jan Steffens]

    Date: Tuesday, July 17, 2018 @ 19:52:58
  Author: heftig
Revision: 328912

archrelease: copy trunk to extra-x86_64

Added:
  libfprint/repos/extra-x86_64/PKGBUILD
    (from rev 328911, libfprint/trunk/PKGBUILD)
  libfprint/repos/extra-x86_64/fix.diff
    (from rev 328911, libfprint/trunk/fix.diff)
Deleted:
  libfprint/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   88 +++++++++++++++++++++++++++++++------------------------------
 fix.diff |   12 ++++++++
 2 files changed, 57 insertions(+), 43 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-17 19:52:05 UTC (rev 328911)
+++ PKGBUILD	2018-07-17 19:52:58 UTC (rev 328912)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgname=libfprint
-pkgver=0.8.1
-pkgrel=1
-pkgdesc="Library for fingerprint readers"
-arch=(x86_64)
-url="https://www.freedesktop.org/wiki/Software/fprint/libfprint"
-license=(LGPL)
-depends=(libusb nss pixman glib2)
-makedepends=(git meson gtk-doc)
-groups=(fprint)
-_commit=6f6127cbb640a8549eb971aa73d6fe8543d3c40b  # master~1
-source=("git+https://anongit.freedesktop.org/git/libfprint/libfprint#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^V_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  # Fixup missing tag
-  git tag -f V_0_8_1 6f6127cbb640a8549eb971aa73d6fe8543d3c40b
-}
-
-build() {
-  arch-meson $pkgname build -D x11-examples=false
-  ninja -C build
-}
-
-check() {
-  cd build
-  meson test
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-}

Copied: libfprint/repos/extra-x86_64/PKGBUILD (from rev 328911, libfprint/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-07-17 19:52:58 UTC (rev 328912)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgname=libfprint
+pkgver=0.8.2
+pkgrel=1
+pkgdesc="Library for fingerprint readers"
+arch=(x86_64)
+url="https://www.freedesktop.org/wiki/Software/fprint/libfprint"
+license=(LGPL)
+depends=(libusb nss pixman glib2)
+makedepends=(git meson gtk-doc)
+groups=(fprint)
+_commit=da95af0f48a247300457ecfe6be59e8284ce9df3  # tags/V_0_8_2^0
+source=("git+https://gitlab.freedesktop.org/libfprint/libfprint.git#commit=$_commit"
+        fix.diff)
+sha256sums=('SKIP'
+            'bc76b1cf42aeaee8e21ff24c40c44744b9ee2d601399b3c43dba7334ca20ce62')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^V_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  # https://github.com/mesonbuild/meson/issues/3892
+  patch -Np1 -i ../fix.diff
+}
+
+build() {
+  arch-meson $pkgname build -D x11-examples=false
+  ninja -C build
+}
+
+check() {
+  cd build
+  meson test
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}

Copied: libfprint/repos/extra-x86_64/fix.diff (from rev 328911, libfprint/trunk/fix.diff)
===================================================================
--- fix.diff	                        (rev 0)
+++ fix.diff	2018-07-17 19:52:58 UTC (rev 328912)
@@ -0,0 +1,12 @@
+diff --git i/doc/meson.build w/doc/meson.build
+index 48358c8..c2c1b77 100644
+--- i/doc/meson.build
++++ w/doc/meson.build
+@@ -54,7 +54,6 @@ gnome.gtkdoc('libfprint',
+              content_files: content_files,
+              expand_content_files: expand_content_files,
+              scan_args: [
+-               '--rebuild-types',
+                '--ignore-decorators=API_EXPORTED',
+                '--ignore-headers=' + ' '.join(private_headers),
+              ],