haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

vifm, bump version, fix build (#6372)

Browse Source
This commit is contained in:
Schrijvers Luc
2021-11-07 14:40:14 +01:00
committed by GitHub
parent 4981f51164
commit 7167d086e8
2 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app-misc/vifm/patches/vifm-0.12.patchset Normal file
View File

@@ -0,0 +1,35 @@
From 3fbb54681eaf71422517364eb3778daaeb8830c1 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 7 Nov 2021 08:39:42 +0000
Subject: Fix build
diff --git a/configure.ac b/configure.ac
index 9b958ff..fd94d05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,7 +135,7 @@ fi
AC_CHECK_FUNC([execve], [], [AC_MSG_ERROR([execve() function not found.])])
AC_CHECK_FUNC([execvp], [], [AC_MSG_ERROR([execvp() function not found.])])
AC_CHECK_FUNC([exit], [], [AC_MSG_ERROR([exit() function not found.])])
-AC_CHECK_FUNC([fdatasync], [], [AC_MSG_ERROR([fdatasync() function not found.])])
+AC_CHECK_FUNC([fsync], [], [AC_MSG_ERROR([fsync() function not found.])])
AC_CHECK_FUNC([fclose], [], [AC_MSG_ERROR([fclose() function not found.])])
AC_CHECK_FUNC([fdopen], [], [AC_MSG_ERROR([fdopen() function not found.])])
AC_CHECK_FUNC([feof], [], [AC_MSG_ERROR([feof() function not found.])])
diff --git a/src/compat/os.c b/src/compat/os.c
index c3d5d09..a0be0e6 100644
--- a/src/compat/os.c
+++ b/src/compat/os.c
@@ -357,7 +357,7 @@ os_fdatasync(int fd)
/* OS X system might not have fdatasync(). */
return fcntl(fd, F_FULLFSYNC);
#else
- return fdatasync(fd);
+ return fsync(fd);
#endif
}
--
2.30.2

28
app-misc/vifm/vifm-0.9.1.recipe → app-misc/vifm/vifm-0.12.recipe
View File

@@ -6,21 +6,31 @@ having to learn a new set of commands."
HOMEPAGE="https://vifm.info/"
COPYRIGHT="2018 ksteen xaizek"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/vifm/vifm/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="f208cdcd912348df8e18214078ab2455831d05190078ab5af507bd9789ea8b04"
CHECKSUM_SHA256="f145896c1a4237d6aa160e8616f4c600f276729a17958b6a1cf5186276815395"
SOURCE_DIR="vifm-$portVersion"
PATCHES="vifm-$portVersion.patchset"
ADDITIONAL_FILES="vifm.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandBinDir=$binDir
commandSuffix=$secondaryArchSuffix
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
GLOBAL_WRITABLE_FILES="settings/vifm/colors/Default-256.vifm keep-old"
PROVIDES="
vifm$secondaryArchSuffix = $portVersion
cmd:vifm$secondaryArchSuffix = $portVersion
cmd:vifm_convert_dircolors$secondaryArchSuffix = $portVersion
cmd:vifm_pause$secondaryArchSuffix = $portVersion
cmd:vifm_screen_split$secondaryArchSuffix = $portVersion
cmd:vifm$commandSuffix = $portVersion
cmd:vifm_convert_dircolors$commandSuffix = $portVersion
cmd:vifm_pause$commandSuffix = $portVersion
cmd:vifm_screen_split$commandSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -45,7 +55,9 @@ BUILD_PREREQUIRES="
BUILD()
{
runConfigure ./configure
autoreconf -vfi
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir
make $jobArgs
}
@@ -65,5 +77,5 @@ INSTALL()
-e "s|@LONG_INFO@|$LONG_INFO|" \
$portDir/additional-files/vifm.rdef.in > vifm.rdef
addResourcesToBinaries vifm.rdef $binDir/vifm
addResourcesToBinaries vifm.rdef $commandBinDir/vifm
}