[arch-commits] Commit in sshfs/trunk (001-sshfs-3.3.0-meson.build.patch PKGBUILD)

[Giancarlo Razzolini]

    Date: Monday, September 25, 2017 @ 14:45:00
  Author: grazzolini
Revision: 260540

upgpkg: sshfs 3.3.0-3

Fixes #55711. Also properly separate the prepare phase
from the build phase.

Added:
  sshfs/trunk/001-sshfs-3.3.0-meson.build.patch
Modified:
  sshfs/trunk/PKGBUILD

-----------------------------------+
 001-sshfs-3.3.0-meson.build.patch |   12 ++++++++++++
 PKGBUILD                          |   18 +++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

Added: 001-sshfs-3.3.0-meson.build.patch
===================================================================
--- 001-sshfs-3.3.0-meson.build.patch	                        (rev 0)
+++ 001-sshfs-3.3.0-meson.build.patch	2017-09-25 14:45:00 UTC (rev 260540)
@@ -0,0 +1,12 @@
+diff -ura sshfs-3.3.0.orig/meson.build sshfs-3.3.0.new/meson.build
+--- sshfs-3.3.0.orig/meson.build	2017-09-20 14:08:27.000000000 -0300
++++ sshfs-3.3.0.new/meson.build	2017-09-25 11:19:19.946623793 -0300
+@@ -58,7 +58,7 @@
+ if rst2man.found()
+     custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ],
+                   command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true,
+-                  install_dir: join_paths(get_option('mandir'), '1'))
++                  install_dir: join_paths(get_option('mandir'), 'man1'))
+ else
+     message('rst2man not found, not building manual page.')
+ endif

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-25 14:09:44 UTC (rev 260539)
+++ PKGBUILD	2017-09-25 14:45:00 UTC (rev 260540)
@@ -5,7 +5,7 @@
 
 pkgname=sshfs
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="FUSE client based on the SSH File Transfer Protocol"
 arch=(x86_64 i686)
 url="http://github.com/libfuse/sshfs"
@@ -12,18 +12,26 @@
 license=(GPL)
 depends=(fuse3 glib2 openssh)
 makedepends=('meson' 'python-docutils')
-source=(https://github.com/libfuse/sshfs/releases/download/sshfs-$pkgver/sshfs-$pkgver.tar.xz{,.asc})
+source=(https://github.com/libfuse/sshfs/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
+        001-sshfs-3.3.0-meson.build.patch)
 sha256sums=('9ddfcc2564fafe002706b093b6295afbcb2cc0a3bc52bc805cc5361cb69ca51d'
-            'SKIP')
+            'SKIP'
+            'da928d31291ad86582ab616ea91619c345513dec00f6aafb5bac8f2929159e6b')
 validpgpkeys=('ED31791B2C5C1613AF388B8AD113FCAC3C4E599F') # Nikolaus Rath <Nikolaus at rath.org>
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
 
+  # patch meson.build
+  patch -p1 < ../001-sshfs-3.3.0-meson.build.patch
+  
   [[ $CARCH == 'i686' ]] && export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
   rm -rf build
   meson setup --prefix=/usr --sbindir=bin . build
-  cd build
+}
+
+build() {
+  cd $pkgname-$pkgver/build
   ninja
 }