commit: 38e3e568bc36fcdf89277d6b68301472f34a04ee Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Mon Sep 9 11:11:42 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Sep 9 11:11:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e3e568
dev-java/rxtx: added missing include + scrubbed patches Closes: https://bugs.gentoo.org/927898 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch | 4 ---- dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch | 6 ------ dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch | 5 ----- dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch | 4 ++-- dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch | 10 ++++++++++ dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild | 3 ++- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch index 366bb78c2cba..9ed045fef250 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch @@ -16,10 +16,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9 Bug: https://bugs.gentoo.org/831394 ---- -Description: Fixes the build failure with Java 10 -Author: Emmanuel Bourg <[email protected]> -Forwarded: no --- a/Makefile.am +++ b/Makefile.am @@ -111,11 +111,6 @@ diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch index a00ed96f7e5a..b734ac7ffd25 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch @@ -5,12 +5,6 @@ Subject: [PATCH] Fix invalid Javadoc syntax that leads to errors Bug: https://bugs.gentoo.org/642030 Signed-off-by: Yuan Liao <[email protected]> ---- - src/gnu/io/RXTXPort.java | 50 ++++++++++++++++++++++------------------ - 1 file changed, 27 insertions(+), 23 deletions(-) - -diff --git a/src/gnu/io/RXTXPort.java b/src/gnu/io/RXTXPort.java -index 622a6a8..77a23ea 100644 --- a/src/gnu/io/RXTXPort.java +++ b/src/gnu/io/RXTXPort.java @@ -1732,7 +1732,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch index 1337cce3c546..2d060c338429 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch @@ -4,11 +4,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9 Bug: https://bugs.gentoo.org/550534 ---- -From: tony mancill <[email protected]> -Forwarded: no -Description: use format specifiers in fprintf statements for hardening flags - --- a/src/SerialImp.c +++ b/src/SerialImp.c @@ -5108,7 +5108,7 @@ diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch index 1e4ff4af57b7..9a69c64029db 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch @@ -1,5 +1,5 @@ ---- src/lfd/lockdaemon.c.orig 2007-04-26 06:26:07.000000000 +0100 -+++ src/lfd/lockdaemon.c 2016-02-17 20:41:09.137509089 +0000 +--- src/lfd/lockdaemon.c.orig ++++ src/lfd/lockdaemon.c @@ -69,6 +69,7 @@ #include <errno.h> #include <signal.h> diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch new file mode 100644 index 000000000000..b56fe43092d0 --- /dev/null +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch @@ -0,0 +1,10 @@ +--- a/src/SerialImp.c ++++ b/src/SerialImp.c +@@ -146,6 +146,7 @@ + #ifdef LIBLOCKDEV + #include <lockdev.h> + #endif /* LIBLOCKDEV */ ++#include <sys/sysmacros.h> + + extern int errno; + diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild index 2d39447cb63b..460474c3ba23 100644 --- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild +++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,6 +46,7 @@ src_prepare() { eapply "${FILESDIR}/${P}-format-security.patch" eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch" eapply "${FILESDIR}/${P}-fix-for-java-10+.patch" + eapply "${FILESDIR}/${P}-missing-include.patch" eapply_user rm acinclude.m4 || die
