[gentoo-commits] repo/gentoo:master commit in: sys-fs/inotify-tools/, sys-fs/inotify-tools/files/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/inotify-tools/, sys-fs/inotify-tools/files/

[Lars Wendler]

commit:     9cf0bcbd6170b6f95579c217cf445d1b9ad3779e
Author:     Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Sun Feb 23 17:48:46 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 08:58:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf0bcbd

sys-fs/inotify-tools: removed unused command line argument

as result we get successful compilation with clang

Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/14755
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch        | 11 +++++++++++
 sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild              |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch b/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch
new file mode 100644
index 00000000000..8c4f6f510e2
--- /dev/null
+++ b/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch
@@ -0,0 +1,11 @@
+--- inotify-tools-3.20.1/src/Makefile.am
++++ inotify-tools-3.20.1/src/Makefile.am
+@@ -2,7 +2,7 @@
+ inotifywait_SOURCES = inotifywait.c common.c common.h
+ inotifywatch_SOURCES = inotifywatch.c common.c common.h
+ 
+-AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src -L../libinotifytools/src
++AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src
+ AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src
+ LDADD = ../libinotifytools/src/libinotifytools.la
+ 

diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
index 596dc81c50b..34e25a33f64 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
@@ -17,6 +17,8 @@ IUSE="doc"
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
+PATCHES=( "${FILESDIR}/${P}-rm-unused-cmd-arg.patch" )
+
 src_prepare() {
 	default
 	eautoreconf

[gentoo-commits] repo/gentoo:master commit in: sys-fs/inotify-tools/, sys-fs/inotify-tools/files/

[Ionen Wolkens]

commit:     26182e7ab5f7af2be41774b98905855fe251b7bf
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 16:53:00 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 17:22:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26182e7a

sys-fs/inotify-tools: fix build with musl

Closes: https://bugs.gentoo.org/831976
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/inotify-tools-3.22.6.0-musl.patch        | 26 ++++++++++++++++++++++
 sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild |  4 ++++
 2 files changed, 30 insertions(+)

diff --git a/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch b/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch
new file mode 100644
index 000000000000..435adc2e797a
--- /dev/null
+++ b/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch
@@ -0,0 +1,26 @@
+Former fix[1] for musl that got reverted[2] for possibly(?) wrong
+reasons[3]. Should be harmless to include here until sorted out.
+https://bugs.gentoo.org/831976
+
+[1] https://github.com/inotify-tools/inotify-tools/commit/b7889c8d
+[2] https://github.com/inotify-tools/inotify-tools/commit/cbab7c0b
+[3] https://github.com/inotify-tools/inotify-tools/issues/155
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 3 Jan 2022 04:42:50 -0800
+Subject: [PATCH] libinotifytools: Bridge differences between musl/glibc/kernel
+ fnotify.h (#154)
+--- a/libinotifytools/src/inotifytools.c
++++ b/libinotifytools/src/inotifytools.c
+@@ -54,6 +54,12 @@ struct fanotify_event_fid {
+ 	struct fanotify_event_info_fid info;
+ 	struct file_handle handle;
+ };
++
++#ifndef __GLIBC__
++#define val __val
++#define __kernel_fsid_t fsid_t
++#endif
++
+ #endif
+ 
+ /**

diff --git a/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild
index 2d25f84ae71b..6a270595ec4e 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild
@@ -16,6 +16,10 @@ IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+)
+
 src_prepare() {
 	default