Apply all Qt3.3.8d patches

NOTE: This will *likely* break compilation of TQt4
Please wait a few days for fixes to be committed as needed!

5 files changed, 208 insertions, 4 deletions

diff --git a/experimental/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf b/experimental/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf
index 6c4313307..5744d6a60 100644
--- a/experimental/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf
+++ b/experimental/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf
@@ -15,7 +15,7 @@ TQMAKE_LEX		= flex
 TQMAKE_LEXFLAGS		= 
 TQMAKE_YACC		= yacc
 TQMAKE_YACCFLAGS		= -d
-TQMAKE_CFLAGS		=
+TQMAKE_CFLAGS		= -pipe
 TQMAKE_CFLAGS_DEPS	= -M
 TQMAKE_CFLAGS_WARN_ON	= -Wall -W
 TQMAKE_CFLAGS_WARN_OFF	= -w
@@ -23,6 +23,7 @@ TQMAKE_CFLAGS_RELEASE	= -O2
 TQMAKE_CFLAGS_DEBUG	= -g
 TQMAKE_CFLAGS_SHLIB	= -fPIC
 TQMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+TQMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 TQMAKE_CXX		= g++
 TQMAKE_CXXFLAGS		= $$TQMAKE_CFLAGS
@@ -33,6 +34,7 @@ TQMAKE_CXXFLAGS_RELEASE	= $$TQMAKE_CFLAGS_RELEASE
 TQMAKE_CXXFLAGS_DEBUG	= $$TQMAKE_CFLAGS_DEBUG
 TQMAKE_CXXFLAGS_SHLIB	= $$TQMAKE_CFLAGS_SHLIB
 TQMAKE_CXXFLAGS_YACC	= $$TQMAKE_CFLAGS_YACC
+TQMAKE_CXXFLAGS_THREAD	= $$TQMAKE_CFLAGS_THREAD
 
 TQMAKE_INCDIR		=
 TQMAKE_LIBDIR		=
@@ -51,14 +53,19 @@ TQMAKE_LFLAGS_DEBUG	=
 TQMAKE_LFLAGS_SHLIB	= -shared
 TQMAKE_LFLAGS_PLUGIN	= $$TQMAKE_LFLAGS_SHLIB
 TQMAKE_LFLAGS_SONAME	= -Wl,-soname,
+TQMAKE_LFLAGS_THREAD	=
 
-TQMAKE_LIBS		=
+# The following trick (TQMAKE_LIBS{,_THREAD}) is needed at the moment
+TQMAKE_LIBS		= -lpthread
 TQMAKE_LIBS_DYNLOAD	= -ldl
 TQMAKE_LIBS_X11		= -lXext -lX11 -lm
+TQMAKE_LIBS_X11SM	= -lSM -lICE
+TQMAKE_LIBS_NIS		= -lnsl
 TQMAKE_LIBS_QT		= -lqt
-
+TQMAKE_LIBS_TQT_THREAD	= -lqt-mt
 TQMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 TQMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
+TQMAKE_LIBS_THREAD	= 
 
 TQMAKE_TQMOC		= $(TQTDIR)/bin/tqmoc
 TQMAKE_UIC		= $(TQTDIR)/bin/uic
diff --git a/experimental/tqtinterface/qt4/mkspecs/linux-g++-sparc/qmake.conf b/experimental/tqtinterface/qt4/mkspecs/linux-g++-sparc/qmake.conf
new file mode 100644
index 000000000..0ce5f93fb
--- /dev/null
+++ b/experimental/tqtinterface/qt4/mkspecs/linux-g++-sparc/qmake.conf
@@ -0,0 +1,89 @@
+#
+#
+# qmake configuration for linux-g++
+#
+
+MAKEFILE_GENERATOR	= UNIX
+TEMPLATE		= app
+CONFIG			+= qt warn_on release incremental link_prl thread
+TQMAKE_INCREMENTAL_STYLE = sublib
+
+TQMAKE_CC		= gcc
+TQMAKE_LEX		= flex
+TQMAKE_LEXFLAGS		= 
+TQMAKE_YACC		= yacc
+TQMAKE_YACCFLAGS		= -d
+TQMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+TQMAKE_YACC_HEADER       = $base.tab.h
+TQMAKE_YACC_SOURCE       = $base.tab.c
+TQMAKE_CFLAGS		= -pipe -g
+TQMAKE_CFLAGS_DEPS	= -M
+TQMAKE_CFLAGS_WARN_ON	= -Wall -W
+TQMAKE_CFLAGS_WARN_OFF	= -w
+TQMAKE_CFLAGS_RELEASE	= -O1
+TQMAKE_CFLAGS_DEBUG	= -O0
+TQMAKE_CFLAGS_SHLIB	= -fPIC
+TQMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+TQMAKE_CFLAGS_THREAD	= -D_REENTRANT
+
+TQMAKE_CXX		= g++
+TQMAKE_CXXFLAGS		= $$TQMAKE_CFLAGS
+TQMAKE_CXXFLAGS_DEPS	= $$TQMAKE_CFLAGS_DEPS
+TQMAKE_CXXFLAGS_WARN_ON	= $$TQMAKE_CFLAGS_WARN_ON
+TQMAKE_CXXFLAGS_WARN_OFF	= $$TQMAKE_CFLAGS_WARN_OFF
+TQMAKE_CXXFLAGS_RELEASE	= $$TQMAKE_CFLAGS_RELEASE
+TQMAKE_CXXFLAGS_DEBUG	= $$TQMAKE_CFLAGS_DEBUG
+TQMAKE_CXXFLAGS_SHLIB	= $$TQMAKE_CFLAGS_SHLIB
+TQMAKE_CXXFLAGS_YACC	= $$TQMAKE_CFLAGS_YACC
+TQMAKE_CXXFLAGS_THREAD	= $$TQMAKE_CFLAGS_THREAD
+
+TQMAKE_INCDIR		=
+TQMAKE_LIBDIR		=
+TQMAKE_INCDIR_X11	= /usr/X11R6/include
+TQMAKE_LIBDIR_X11	= /usr/X11R6/lib
+TQMAKE_INCDIR_QT		= $(TQTDIR)/include
+TQMAKE_LIBDIR_QT		= $(TQTDIR)/lib
+TQMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+TQMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+
+TQMAKE_LINK		= g++
+TQMAKE_LINK_SHLIB	= g++
+TQMAKE_LFLAGS		=
+TQMAKE_LFLAGS_RELEASE	=
+TQMAKE_LFLAGS_DEBUG	=
+TQMAKE_LFLAGS_SHLIB	= -shared
+TQMAKE_LFLAGS_PLUGIN	= $$TQMAKE_LFLAGS_SHLIB
+TQMAKE_LFLAGS_SONAME	= -Wl,-soname,
+TQMAKE_LFLAGS_THREAD	=
+TQMAKE_RPATH		=
+
+TQMAKE_LIBS		=
+TQMAKE_LIBS_DYNLOAD	= -ldl
+TQMAKE_LIBS_X11		= -lXext -lX11 -lm
+TQMAKE_LIBS_X11SM	= -lSM -lICE
+TQMAKE_LIBS_NIS		= -lnsl
+TQMAKE_LIBS_QT		= -lqt
+TQMAKE_LIBS_TQT_THREAD	= -lqt-mt
+TQMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
+TQMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
+TQMAKE_LIBS_THREAD	= -lpthread
+
+TQMAKE_TQMOC		= $(TQTDIR)/bin/tqmoc
+TQMAKE_UIC		= $(TQTDIR)/bin/uic
+
+TQMAKE_AR		= ar cqs
+TQMAKE_RANLIB		=
+
+TQMAKE_TAR		= tar -cf
+TQMAKE_GZIP		= gzip -9f
+
+TQMAKE_COPY		= cp -f
+TQMAKE_COPY_FILE         = $(COPY)
+TQMAKE_COPY_DIR          = $(COPY) -r
+TQMAKE_MOVE		= mv -f
+TQMAKE_DEL_FILE		= rm -f
+TQMAKE_DEL_DIR		= rmdir
+TQMAKE_STRIP             =
+TQMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+TQMAKE_CHK_DIR_EXISTS	= test -d
+TQMAKE_MKDIR		= mkdir -p
diff --git a/experimental/tqtinterface/qt4/mkspecs/linux-g++-sparc/qplatformdefs.h b/experimental/tqtinterface/qt4/mkspecs/linux-g++-sparc/qplatformdefs.h
new file mode 100644
index 000000000..c6212e779
--- /dev/null
+++ b/experimental/tqtinterface/qt4/mkspecs/linux-g++-sparc/qplatformdefs.h
@@ -0,0 +1,107 @@
+#ifndef TQPLATFORMDEFS_H
+#define TQPLATFORMDEFS_H
+
+// Get TQt defines/settings
+
+#include "tqglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef TQT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// Header files <netinet/in.h> and <arpa/nameser.h> are not included
+// by <resolv.h> on older versions of the GNU C library. Note that
+// <arpa/nameser.h> must be included before <resolv.h>.
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+
+#if !defined(TQT_NO_COMPAT)
+#define TQT_STATBUF		struct stat
+#define TQT_STATBUF4TSTAT	struct stat
+#define TQT_STAT			::stat
+#define TQT_FSTAT		::fstat
+#define TQT_STAT_REG		S_IFREG
+#define TQT_STAT_DIR		S_IFDIR
+#define TQT_STAT_MASK		S_IFMT
+#define TQT_STAT_LNK		S_IFLNK
+#define TQT_FILENO		fileno
+#define TQT_OPEN			::open
+#define TQT_CLOSE		::close
+#define TQT_LSEEK		::lseek
+#define TQT_READ			::read
+#define TQT_WRITE		::write
+#define TQT_ACCESS		::access
+#define TQT_GETCWD		::getcwd
+#define TQT_CHDIR		::chdir
+#define TQT_MKDIR		::mkdir
+#define TQT_RMDIR		::rmdir
+#define TQT_OPEN_RDONLY		O_RDONLY
+#define TQT_OPEN_WRONLY		O_WRONLY
+#define TQT_OPEN_RDWR		O_RDWR
+#define TQT_OPEN_CREAT		O_CREAT
+#define TQT_OPEN_TRUNC		O_TRUNC
+#define TQT_OPEN_APPEND		O_APPEND
+#endif
+
+#define TQT_SIGNAL_RETTYPE	void
+#define TQT_SIGNAL_ARGS		int
+#define TQT_SIGNAL_IGNORE	SIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#define TQT_SOCKLEN_T		socklen_t
+#else
+#define TQT_SOCKLEN_T		int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define TQT_SNPRINTF		::snprintf
+#define TQT_VSNPRINTF		::vsnprintf
+#endif
+
+#define TQT_MITSHM
+
+#endif // TQPLATFORMDEFS_H
diff --git a/experimental/tqtinterface/qt4/mkspecs/linux-g++/qmake.conf b/experimental/tqtinterface/qt4/mkspecs/linux-g++/qmake.conf
index dfd63a593..2ce3d73c3 100644
--- a/experimental/tqtinterface/qt4/mkspecs/linux-g++/qmake.conf
+++ b/experimental/tqtinterface/qt4/mkspecs/linux-g++/qmake.conf
@@ -5,7 +5,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
-CONFIG			+= qt warn_on release incremental link_prl
+CONFIG			+= qt warn_on release incremental link_prl thread
 TQMAKE_INCREMENTAL_STYLE = sublib
 
 TQMAKE_CC		= gcc
diff --git a/experimental/tqtinterface/qt4/mkspecs/linux-g++/tqplatformdefs.h b/experimental/tqtinterface/qt4/mkspecs/linux-g++/tqplatformdefs.h
index 1732994d6..c6212e779 100644
--- a/experimental/tqtinterface/qt4/mkspecs/linux-g++/tqplatformdefs.h
+++ b/experimental/tqtinterface/qt4/mkspecs/linux-g++/tqplatformdefs.h
@@ -102,5 +102,6 @@
 #define TQT_VSNPRINTF		::vsnprintf
 #endif
 
+#define TQT_MITSHM
 
 #endif // TQPLATFORMDEFS_H