[arch-commits] Commit in fuse3/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Friday, August 11, 2017 @ 23:18:37
  Author: anatolik
Revision: 301956

upgpkg: fuse3 3.1.1-1

Meson became the default build system

Modified:
  fuse3/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-11 23:07:22 UTC (rev 301955)
+++ PKGBUILD	2017-08-11 23:18:37 UTC (rev 301956)
@@ -5,16 +5,16 @@
 
 pkgbase=fuse3
 pkgname=(fuse-common fuse3)
-pkgver=3.1.0
+pkgver=3.1.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='https://github.com/libfuse/libfuse'
 license=('GPL2')
-makedepends=('pkg-config')
+makedepends=('pkg-config' 'meson' 'udev')
 options=(!emptydirs)
 source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz{,.asc}
 	'fuse.conf')
-sha1sums=('081ca79d03b5e401fb567c203a5044f35e67284a'
+sha1sums=('2544da3b7719f96f66672d3b5cc3624e58852f5c'
           'SKIP'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
 validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath <Nikolaus at rath.org>
@@ -22,9 +22,10 @@
 build() {
   cd fuse-$pkgver
 
-  export MOUNT_FUSE_PATH=/usr/bin
-  ./configure --prefix=/usr --libdir=/usr/lib --enable-lib --enable-util --disable-example
-  make
+  rm -rf build
+  meson --prefix=/usr --sbindir=bin . build
+  cd build
+  ninja
 }
 
 package_fuse-common() {
@@ -31,8 +32,8 @@
   pkgdesc="Common files for fuse2/3 packages"
   backup=(etc/fuse.conf)
 
-  cd fuse-$pkgver
-  make DESTDIR=${pkgdir} install
+  cd fuse-$pkgver/build
+  DESTDIR=${pkgdir} ninja install
 
   install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
 
@@ -41,10 +42,13 @@
 
   # Remove init script in wrong path
   # Don't add our own for now, as fusectl fs oopses on 2.6.18
-  rm -r ${pkgdir}/usr/etc/init.d
+  rm -r ${pkgdir}/etc/init.d
 
   # part of fuse3 package
-  rm -r ${pkgdir}/usr/{bin,include,lib/{pkgconfig,libfuse3.so*,*.a},share/man/man1/fusermount3.1}
+  rm -r ${pkgdir}/usr/{bin,include,lib/{pkgconfig,libfuse3.so*},share/man/man1/fusermount3.1.gz}
+
+  # workaround bug in fuse meson script
+  mv ${pkgdir}/usr/lib/udev/rules.d/udev/rules.d/99-fuse3.rules ${pkgdir}/usr/lib/udev/rules.d/99-fuse3.rules
 }
 
 package_fuse3() {
@@ -51,13 +55,13 @@
   pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
   depends=('glibc' 'fuse-common')
 
-  cd fuse-$pkgver
+  cd fuse-$pkgver/build
 
-  make DESTDIR=${pkgdir} install
+  DESTDIR=${pkgdir} ninja install
 
   # Remove init script in wrong path
   # Don't add our own for now, as fusectl fs oopses on 2.6.18
-  rm -r ${pkgdir}/usr/etc/init.d
+  rm -r ${pkgdir}/etc/init.d
 
   # static device nodes are handled by udev
   rm -r ${pkgdir}/dev
@@ -64,5 +68,5 @@
 
   # part of fuse-common package
   rm -r ${pkgdir}/usr/lib/udev/rules.d
-  rm ${pkgdir}/usr/share/man/man8/mount.fuse.8
+  rm ${pkgdir}/usr/share/man/man8/mount.fuse.8.gz
 }