commit: 8f278bcd4fa99f047e60643f06f28d38ace9bea9 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Sep 18 12:20:40 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Sep 18 12:21:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f278bcd
dev-java/rxtx: restored *.diff files/patches Closes: https://bugs.gentoo.org/743325 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff | 14 +++++ dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff | 90 +++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff new file mode 100644 index 00000000000..496d732ae2f --- /dev/null +++ b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff @@ -0,0 +1,14 @@ +--- src/lfd/lockdaemon.c.orig 2004-10-12 10:59:28.000000000 +0200 ++++ src/lfd/lockdaemon.c 2006-10-29 22:46:58.000000000 +0100 +@@ -248,9 +248,8 @@ + + if ( check_group_uucp() ) + { +- syslog( LOG_INFO, "check_lock_status: No permission to create lock file. +- +- please see: How can I use Lock Files with rxtx? in INSTALL\n" ); ++ syslog( LOG_INFO, "check_lock_status: No permission to create lock file.\n\n" ++ "please see: How can I use Lock Files with rxtx? in INSTALL\n" ); + return 1; + } + diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff new file mode 100644 index 00000000000..fb05955c65f --- /dev/null +++ b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff @@ -0,0 +1,90 @@ +--- src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200 ++++ src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200 +@@ -87,6 +87,7 @@ + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ + #if defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +@@ -98,6 +99,7 @@ + fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); + getchar(); + } ++#endif + #endif /* __linux__ */ + #endif /* WIN32 */ + } +--- src/RawImp.c.orig 2004-10-16 18:20:35.000000000 +0200 ++++ src/RawImp.c 2006-10-26 21:25:59.000000000 +0200 +@@ -231,6 +231,7 @@ + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ + #if defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +@@ -242,6 +243,7 @@ + fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); + getchar(); + } ++#endif + #endif /* __linux__ */ + #endif /* WIN32 */ + } +--- src/RS485Imp.c.orig 2004-10-16 18:20:35.000000000 +0200 ++++ src/RS485Imp.c 2006-10-26 21:26:23.000000000 +0200 +@@ -87,6 +87,7 @@ + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ + #if defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +@@ -98,6 +99,7 @@ + fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); + getchar(); + } ++#endif + #endif /* __linux__ */ + #endif /* WIN32 */ + } +--- src/SerialImp.c.orig 2006-01-29 23:19:04.000000000 +0100 ++++ src/SerialImp.c 2006-10-26 21:26:59.000000000 +0200 +@@ -280,6 +280,7 @@ + gettimeofday(&seloop, NULL); + #endif /* DEBUG_TIMING */ + #if defined(DEBUG) && defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +@@ -295,6 +296,7 @@ + getchar(); + } + LEAVE( "RXTXPort:Initialize" ); ++#endif + #endif /* DEBUG && __linux__ */ + } + +--- src/SerialImp.cpp.orig 2004-10-12 10:59:27.000000000 +0200 ++++ src/SerialImp.cpp 2006-10-26 21:27:44.000000000 +0200 +@@ -102,6 +102,7 @@ + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ + #ifdef DEBUG ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +@@ -114,6 +115,7 @@ + name.release); + getchar(); + } ++#endif + #endif /* DEBUG */ + #endif /* __BEOS__ */ + #endif /* WIN32 */
