libxt: fix build errors

This commit is contained in:
Leonid Pliushch 2019-06-29 23:42:38 +03:00 committed by Yaksh Bariya
parent 86b09ea2fc
commit d84f2bf3d7
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
3 changed files with 86 additions and 0 deletions

View File

@ -0,0 +1,60 @@
diff -uNr libXt-1.2.0/configure libXt-1.2.0.mod/configure
--- libXt-1.2.0/configure 2019-06-22 02:30:06.000000000 +0300
+++ libXt-1.2.0.mod/configure 2019-06-29 23:10:33.160835538 +0300
@@ -19231,56 +19231,6 @@
fi
-# Check for flag to avoid builtin definitions - assumes unix is predefined,
-# which is not the best choice for supporting other OS'es, but covers most
-# of the ones we need for now.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5
-$as_echo_n "checking if $RAWCPP requires -undef... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-Does cpp redefine unix ?
-_ACEOF
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- RAWCPPFLAGS=-undef
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- # under Cygwin unix is still defined even with -undef
- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- RAWCPPFLAGS="-undef -ansi"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5
-$as_echo "yes, with -ansi" >&6; }
- else
- as_fn_error $? "${RAWCPP} defines unix with or without -undef. I don't know what to do." "$LINENO" 5
- fi
-fi
-rm -f conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5
-$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-Does cpp preserve "whitespace"?
-_ACEOF
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- TRADITIONALCPPFLAGS="-traditional"
- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- as_fn_error $? "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5
- fi
-fi
-rm -f conftest.$ac_ext
-
-

View File

@ -0,0 +1,13 @@
diff -uNr libXt-1.2.0/include/X11/InitialI.h libXt-1.2.0.mod/include/X11/InitialI.h
--- libXt-1.2.0/include/X11/InitialI.h 2019-06-22 02:29:53.000000000 +0300
+++ libXt-1.2.0.mod/include/X11/InitialI.h 2019-06-29 23:39:02.027977057 +0300
@@ -271,9 +271,7 @@
_XtBoolean /* ignoreInputs */,
_XtBoolean /* ignoreSignals */,
_XtBoolean /* block */,
-#ifdef XTHREADS
_XtBoolean /* drop_lock */,
-#endif
unsigned long* /* howlong */
);

View File

@ -0,0 +1,13 @@
diff -uNr libXt-1.2.0/src/Shell.c libXt-1.2.0.mod/src/Shell.c
--- libXt-1.2.0/src/Shell.c 2019-06-22 02:29:55.000000000 +0300
+++ libXt-1.2.0.mod/src/Shell.c 2019-06-29 23:41:30.634530801 +0300
@@ -1961,9 +1961,7 @@
if (_XtWaitForSomething (app,
FALSE, TRUE, TRUE, TRUE,
TRUE,
-#ifdef XTHREADS
FALSE,
-#endif
&timeout) != -1) {
while (XCheckIfEvent(XtDisplay(w),event,isMine,(char*)&q)) {
if (q.done) return TRUE;