From 6912a01f1c9dea973e69d1e4bb95ad704950b366 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Wed, 2 Jun 2021 18:54:09 +0300 Subject: [PATCH] nnn: update to 4.1 --- srcpkgs/nnn/patches/no_atomic.patch | 15 +++++++++++++++ srcpkgs/nnn/template | 16 +++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/nnn/patches/no_atomic.patch diff --git a/srcpkgs/nnn/patches/no_atomic.patch b/srcpkgs/nnn/patches/no_atomic.patch new file mode 100644 index 000000000000..2218275d2c98 --- /dev/null +++ b/srcpkgs/nnn/patches/no_atomic.patch @@ -0,0 +1,15 @@ +diff --git src/nnn.c src/nnn.c +index d83d7f6..ebd2985 100644 + +https://github.com/jarun/nnn/commit/ccce80a1e91b99c58d1a4e1453b5238036e84f22 +--- src/nnn.c ++++ src/nnn.c +@@ -452,7 +452,7 @@ static pthread_mutex_t running_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_mutex_t hardlink_mutex = PTHREAD_MUTEX_INITIALIZER; + static ulong_t *core_files; + static blkcnt_t *core_blocks; +-static _Atomic volatile ulong_t num_files; ++static ulong_t num_files; + + typedef struct { + char path[PATH_MAX]; diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template index 7d905198b749..c1a41dec0ab1 100644 --- a/srcpkgs/nnn/template +++ b/srcpkgs/nnn/template @@ -1,7 +1,7 @@ # Template file for 'nnn' pkgname=nnn -version=4.0 -revision=2 +version=4.1 +revision=1 build_style=gnu-makefile make_install_target="install install-desktop" hostmakedepends="pkg-config" @@ -12,7 +12,17 @@ license="BSD-2-Clause" homepage="https://github.com/jarun/nnn" changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG" distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz" -checksum=a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754 +checksum=8549ac5f3007337da4841e62da696507e753035f36ac4e0537502e261ce701e6 + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-fts-devel" +fi + +pre_build() { + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + export LDLIBS=-lfts + fi +} post_install() { vinstall misc/auto-completion/bash/nnn-completion.bash 644 \