libnih: include upstream revisions
This commit is contained in:
parent
1840f8a4bc
commit
14f9ba9a0a
2 changed files with 21 additions and 10 deletions
|
@ -1,11 +1,20 @@
|
||||||
--- nih/signal.c.orig 2015-05-28 07:43:36.187018255 +0200
|
commit 3537454e66c3d9466d9d574467573e4ba4333293
|
||||||
+++ nih/signal.c 2015-05-28 07:44:15.098421531 +0200
|
Author: Cameron Nemo <camerontnorman@gmail.com>
|
||||||
@@ -87,7 +87,7 @@ static const SignalName signal_names[] =
|
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" },
|
{ SIGSTKFLT, "STKFLT" },
|
||||||
#endif
|
#endif
|
||||||
{ SIGCHLD, "CHLD" },
|
{ SIGCHLD, "CHLD" },
|
||||||
- { SIGCLD, "CLD" },
|
+#ifdef SIGCLD
|
||||||
+ { SIGCHLD, "CLD" },
|
{ SIGCLD, "CLD" },
|
||||||
|
+#endif
|
||||||
{ SIGCONT, "CONT" },
|
{ SIGCONT, "CONT" },
|
||||||
{ SIGSTOP, "STOP" },
|
{ SIGSTOP, "STOP" },
|
||||||
{ SIGTSTP, "TSTP" },
|
{ SIGTSTP, "TSTP" },
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
# Template file for 'libnih'
|
# Template file for 'libnih'
|
||||||
pkgname=libnih
|
pkgname=libnih
|
||||||
version=1.0.3
|
version=1.0.3
|
||||||
revision=4
|
revision=5
|
||||||
|
_commit=ecf8f37376524f40a6f3fbf9cc4d5b6fc8892c19
|
||||||
|
wrksrc="${pkgname}-${_commit}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-threading"
|
configure_args="--enable-threading"
|
||||||
hostmakedepends="automake libtool gettext-devel pkg-config"
|
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>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="GPL-2.0-only"
|
license="GPL-2.0-only"
|
||||||
homepage="https://github.com/keybuk/${pkgname}"
|
homepage="https://github.com/keybuk/${pkgname}"
|
||||||
distfiles="${homepage}/archive/${version}.tar.gz"
|
distfiles="${homepage}/archive/${_commit}.tar.gz"
|
||||||
checksum=d330f767cd4c0e3dd9ca28480394b96b93ffc0e021fbf0a69358cce919bc5aef
|
checksum=bd1ce78c9e4808fd02e06edaf581eb2b70fa43d7baae051848dfdbaf5b4d1a1c
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
hostmakedepends+=" nih-devel"
|
hostmakedepends+=" nih-devel"
|
||||||
|
@ -24,19 +26,19 @@ pre_configure() {
|
||||||
|
|
||||||
libnih-devel_package() {
|
libnih-devel_package() {
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
depends="${sourcepkg}-${version}_${revision}"
|
depends="${sourcepkg}-${version}_${revision} dbus-devel"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
vmove "usr/lib/*.a"
|
vmove "usr/lib/*.a"
|
||||||
vmove "usr/lib/*.so"
|
vmove "usr/lib/*.so"
|
||||||
vmove usr/lib/pkgconfig
|
vmove usr/lib/pkgconfig
|
||||||
vmove usr/share/aclocal
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nih-devel_package() {
|
nih-devel_package() {
|
||||||
short_desc+=" - development tools"
|
short_desc+=" - development tools"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
|
vmove usr/share/aclocal
|
||||||
vmove usr/bin/nih-dbus-tool
|
vmove usr/bin/nih-dbus-tool
|
||||||
vmove usr/share/man/man1/nih-dbus-tool.1
|
vmove usr/share/man/man1/nih-dbus-tool.1
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue