File tumbleweed_build_fix_624.patch of Package magic

diff -dura magic-8.3.624.orig/commands/Makefile magic-8.3.624/commands/Makefile
--- magic-8.3.624.orig/commands/Makefile	2026-03-17 15:42:16.000000000 +0000
+++ magic-8.3.624/commands/Makefile	2026-03-18 13:32:37.662876672 +0000
@@ -10,7 +10,7 @@
 # Force the module to regenerate the symbolic link in the readline
 # directory, as it may be needed by CmdFI.c (in the non-Tcl compile)
 
-module: ${MAGICDIR}/readline/readline lib${MODULE}.o
+module: lib${MODULE}.o
 
 # Delegate this task to the readline/Makefile
 ${MAGICDIR}/readline/readline:
diff -dura magic-8.3.624.orig/database/DBio.c magic-8.3.624/database/DBio.c
--- magic-8.3.624.orig/database/DBio.c	2026-03-17 15:42:16.000000000 +0000
+++ magic-8.3.624/database/DBio.c	2026-03-18 13:51:19.223511453 +0000
@@ -3619,7 +3619,7 @@
 	}
 	return (*ggcf == 1) ? 1 : 0;
     }
-    else
+    //else
         /* Only PROPERTY_TYPE_PLANE and PROPERTY_TYPE_DIMENSION get handled */
 	return 0;
 }
diff -dura magic-8.3.624.orig/textio/txInput.c magic-8.3.624/textio/txInput.c
--- magic-8.3.624.orig/textio/txInput.c	2026-03-17 15:42:16.000000000 +0000
+++ magic-8.3.624/textio/txInput.c	2026-03-18 13:32:59.682901663 +0000
@@ -1225,7 +1225,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(CYGWIN)
 
 void
 txGetTermState(
@@ -1234,7 +1234,7 @@
     ioctl( fileno( stdin ), TCGETA, buf);
 }
 
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined (__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
 
 void
 txGetTermState(
@@ -1273,18 +1273,18 @@
 
 void
 txSetTermState(
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(CYGWIN)
     struct termio *buf
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined (__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
     struct termios *buf
 #else
     txTermState *buf
 #endif /* SYSV */
     )
 {
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(CYGWIN)
     ioctl( fileno(stdin), TCSETAF, buf );
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined (__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
     (void) tcsetattr( fileno(stdin), TCSANOW, buf );
 #else
     /* set the current terminal characteristics */
@@ -1313,16 +1313,16 @@
 
 void
 txInitTermRec(
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(CYGWIN)
     struct termio *buf
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined (__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
     struct termios *buf
 #else
     txTermState *buf
 #endif /* SYSV */
     )
 {
-#if defined(SYSV) || defined(CYGWIN) || defined(__OpenBSD__) || defined(EMSCRIPTEN)
+#if defined(CYGWIN) || defined(__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
     buf->c_lflag = ISIG;    /* raw: no echo and no processing, allow signals */
     buf->c_cc[ VMIN ] = 1;
     buf->c_cc[ VTIME ] = 0;
@@ -1337,9 +1337,9 @@
 
 
 
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(CYGWIN)
 struct termio closeTermState;
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined (__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
 struct termios closeTermState;
 #else
 static txTermState closeTermState;
@@ -1366,14 +1366,14 @@
 void
 txSaveTerm(void)
 {
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(CYGWIN)
     ioctl( fileno( stdin ), TCGETA, &closeTermState);
     txEraseChar = closeTermState.c_cc[VERASE];
     txKillChar =  closeTermState.c_cc[VKILL];
     TxEOFChar = closeTermState.c_cc[VEOF];
     TxInterruptChar = closeTermState.c_cc[VINTR];
     haveCloseState = TRUE;
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined (__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
     (void) tcgetattr( fileno( stdin ), &closeTermState);
     txEraseChar = closeTermState.c_cc[VERASE];
     txKillChar =  closeTermState.c_cc[VKILL];
@@ -1414,9 +1414,9 @@
 void
 TxSetTerminal(void)
 {
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(CYGWIN)
     struct termio buf;
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined (__OpenBSD__) || defined(EMSCRIPTEN) || defined(SYSV)
     struct termios buf;
 #else
     txTermState buf;
diff -dura magic-8.3.624.orig/utils/magsgtty.h magic-8.3.624/utils/magsgtty.h
--- magic-8.3.624.orig/utils/magsgtty.h	2026-03-17 15:42:16.000000000 +0000
+++ magic-8.3.624/utils/magsgtty.h	2026-03-18 13:33:06.572878139 +0000
@@ -22,7 +22,7 @@
 #define _MAGIC__UTILS__MAGSGTTY_H
 
 /* maybe this can be #ifndef HAVE_TERMIO_H */
-#if !defined(SYSV) && !defined(CYGWIN)
+#if !defined(CYGWIN)
 
 # ifdef	ALPHA
 # undef MAX
openSUSE Build Service is sponsored by