libnih: include upstream revisions

This commit is contained in:
Cameron Nemo 2018-10-28 01:43:10 -07:00 committed by maxice8
parent 1840f8a4bc
commit 14f9ba9a0a
2 changed files with 21 additions and 10 deletions

View File

@ -1,11 +1,20 @@
--- nih/signal.c.orig 2015-05-28 07:43:36.187018255 +0200
+++ nih/signal.c 2015-05-28 07:44:15.098421531 +0200
@@ -87,7 +87,7 @@ static const SignalName signal_names[] =
commit 3537454e66c3d9466d9d574467573e4ba4333293
Author: Cameron Nemo <camerontnorman@gmail.com>
Date: Sun Oct 28 01:59:05 2018 -0700
nih/signal.c: only support SIGCLD if it has libc support
diff --git nih/signal.c nih/signal.c
index a241df9..6a263fa 100644
--- nih/signal.c
+++ nih/signal.c
@@ -87,7 +87,9 @@ static const SignalName signal_names[] = {
{ SIGSTKFLT, "STKFLT" },
#endif
{ SIGCHLD, "CHLD" },
- { SIGCLD, "CLD" },
+ { SIGCHLD, "CLD" },
+#ifdef SIGCLD
{ SIGCLD, "CLD" },
+#endif
{ SIGCONT, "CONT" },
{ SIGSTOP, "STOP" },
{ SIGTSTP, "TSTP" },

View File

@ -1,7 +1,9 @@
# Template file for 'libnih'
pkgname=libnih
version=1.0.3
revision=4
revision=5
_commit=ecf8f37376524f40a6f3fbf9cc4d5b6fc8892c19
wrksrc="${pkgname}-${_commit}"
build_style=gnu-configure
configure_args="--enable-threading"
hostmakedepends="automake libtool gettext-devel pkg-config"
@ -10,8 +12,8 @@ short_desc="Small library for C application development"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2.0-only"
homepage="https://github.com/keybuk/${pkgname}"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=d330f767cd4c0e3dd9ca28480394b96b93ffc0e021fbf0a69358cce919bc5aef
distfiles="${homepage}/archive/${_commit}.tar.gz"
checksum=bd1ce78c9e4808fd02e06edaf581eb2b70fa43d7baae051848dfdbaf5b4d1a1c
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" nih-devel"
@ -24,19 +26,19 @@ pre_configure() {
libnih-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
depends="${sourcepkg}-${version}_${revision} dbus-devel"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
vmove usr/share/aclocal
}
}
nih-devel_package() {
short_desc+=" - development tools"
pkg_install() {
vmove usr/share/aclocal
vmove usr/bin/nih-dbus-tool
vmove usr/share/man/man1/nih-dbus-tool.1
}