From 227f63ba581c677dadf3cd455aaf73dc5acfb175 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 13 Oct 2004 02:08:43 +0000 Subject: Add Interix 3.5 support. (Will be contributed back to Trolltech as well.) --- x11/qt3-libs/Makefile.common | 7 +++- x11/qt3-libs/distinfo | 8 +++- x11/qt3-libs/patches/patch-ad | 22 +++++++++++ x11/qt3-libs/patches/patch-ag | 13 +++++++ x11/qt3-libs/patches/patch-ah | 22 +++++++++++ x11/qt3-libs/patches/patch-ai | 14 +++++++ x11/qt3-libs/patches/patch-ia | 87 +++++++++++++++++++++++++++++++++++++++++++ x11/qt3-libs/patches/patch-ib | 85 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 x11/qt3-libs/patches/patch-ad create mode 100644 x11/qt3-libs/patches/patch-ag create mode 100644 x11/qt3-libs/patches/patch-ah create mode 100644 x11/qt3-libs/patches/patch-ai create mode 100644 x11/qt3-libs/patches/patch-ia create mode 100644 x11/qt3-libs/patches/patch-ib (limited to 'x11/qt3-libs') diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index ddcafd04b1a..cef00ff7bfc 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2004/08/27 18:44:11 jlam Exp $ +# $NetBSD: Makefile.common,v 1.35 2004/10/13 02:08:43 tv Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -54,6 +54,11 @@ CONFIGURE_ARGS+= -platform solaris-g++ CONFIGURE_ARGS+= -platform solaris-cc . endif SYS_LIBS= -lresolv -lsocket -lnsl -lrt +.elif ${OPSYS} == "Interix" +CONFIGURE_ARGS+= -platform interix-g++ +CFLAGS+= -I/usr/local/include/bind +LDFLAGS+= -L/usr/local/lib/bind -lbind +BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind .endif .if !exists(${X11BASE}/lib/libXinerama.so) diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 5e64ef837f2..b8fc3795eb3 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,13 +1,19 @@ -$NetBSD: distinfo,v 1.24 2004/08/24 12:38:18 markd Exp $ +$NetBSD: distinfo,v 1.25 2004/10/13 02:08:43 tv Exp $ SHA1 (qt-x11-free-3.3.3.tar.bz2) = b9737d8dc0c440a7d28f1f0a164e49f7bd242585 Size (qt-x11-free-3.3.3.tar.bz2) = 14424812 bytes SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52 +SHA1 (patch-ad) = 09afcc6c8a3a2f93131fdbf4be50d3e313792374 SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7 SHA1 (patch-af) = dde2d3cd4fa9eab0105ee097182a172756002347 +SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913 +SHA1 (patch-ah) = aa34fde5c1ef71ebb35a00b376236acffb04fc16 +SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802 SHA1 (patch-bb) = df300b77d0adb653eaa16c97f995ed2def8e7d87 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = 0493bc7a0e9b9fa3c88f77b6fc89f77a3e4e3481 +SHA1 (patch-ia) = c02d328458c49f6070e86b56de84bce776cfce1f +SHA1 (patch-ib) = 5744905e7a2b97d951f30f2da01a0de64ac26b7e diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad new file mode 100644 index 00000000000..bf9cac5d3c9 --- /dev/null +++ b/x11/qt3-libs/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.7 2004/10/13 02:08:43 tv Exp $ + +--- src/tools/qglobal.h.orig Thu Aug 5 10:41:56 2004 ++++ src/tools/qglobal.h +@@ -63,6 +63,7 @@ + NETBSD - NetBSD + OPENBSD - OpenBSD + BSDI - BSD/OS ++ INTERIX - Interix + IRIX - SGI Irix + OSF - HP Tru64 UNIX + SCO - SCO OpenServer 5 +@@ -119,6 +120,9 @@ + # define Q_OS_BSD4 + #elif defined(__NetBSD__) + # define Q_OS_NETBSD ++# define Q_OS_BSD4 ++#elif defined(__INTERIX) ++# define Q_OS_INTERIX + # define Q_OS_BSD4 + #elif defined(__OpenBSD__) + # define Q_OS_OPENBSD diff --git a/x11/qt3-libs/patches/patch-ag b/x11/qt3-libs/patches/patch-ag new file mode 100644 index 00000000000..924fd22a0df --- /dev/null +++ b/x11/qt3-libs/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.5 2004/10/13 02:08:43 tv Exp $ + +--- src/kernel/qlock.cpp.orig Tue Oct 12 15:27:34 2004 ++++ src/kernel/qlock.cpp +@@ -43,7 +43,7 @@ + #else + #include + #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \ +- || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI) ++ || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI) || defined(Q_OS_INTERIX) + /* union semun is defined by including */ + #else + /* according to X/OPEN we have to define it ourselves */ diff --git a/x11/qt3-libs/patches/patch-ah b/x11/qt3-libs/patches/patch-ah new file mode 100644 index 00000000000..110f51cb882 --- /dev/null +++ b/x11/qt3-libs/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.5 2004/10/13 02:08:43 tv Exp $ + +--- src/tools/qdatastream.cpp.orig Thu Aug 5 10:41:57 2004 ++++ src/tools/qdatastream.cpp +@@ -484,6 +484,8 @@ void QDataStream::setByteOrder( int bo ) + + #if defined(Q_OS_HPUX) && !defined(__LP64__) + extern "C" long long __strtoll( const char *, char**, int ); ++#elif defined(Q_OS_INTERIX) ++extern "C" long long strtoq( const char *, char**, int ); + #endif + + static Q_INT64 read_int_ascii( QDataStream *s ) +@@ -508,7 +510,7 @@ static Q_INT64 read_int_ascii( QDataStre + return _atoi64( buf ); + # elif defined(Q_OS_HPUX) + return __strtoll( buf, (char**)0, 10 ); +-# elif defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020 ++# elif (defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020) || defined(Q_OS_INTERIX) + return strtoq( buf, (char**)0, 10 ); + # else + return strtoll( buf, (char**)0, 10 ); // C99 function diff --git a/x11/qt3-libs/patches/patch-ai b/x11/qt3-libs/patches/patch-ai new file mode 100644 index 00000000000..28cf6b1886e --- /dev/null +++ b/x11/qt3-libs/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.1 2004/10/13 02:08:43 tv Exp $ + +--- src/codecs/qtextcodec.cpp.orig Tue Oct 12 16:12:27 2004 ++++ src/codecs/qtextcodec.cpp +@@ -82,7 +82,9 @@ + #include + #endif + #if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) ++extern "C" { + #include ++}; + #endif + + static QValueList *all = 0; diff --git a/x11/qt3-libs/patches/patch-ia b/x11/qt3-libs/patches/patch-ia new file mode 100644 index 00000000000..bd97b10c5ac --- /dev/null +++ b/x11/qt3-libs/patches/patch-ia @@ -0,0 +1,87 @@ +$NetBSD: patch-ia,v 1.1 2004/10/13 02:08:43 tv Exp $ + +--- mkspecs/interix-g++/qplatformdefs.h.orig Tue Oct 12 16:43:29 2004 ++++ mkspecs/interix-g++/qplatformdefs.h +@@ -0,0 +1,82 @@ ++#ifndef QPLATFORMDEFS_H ++#define QPLATFORMDEFS_H ++ ++// Get Qt defines/settings ++ ++#include "qglobal.h" ++ ++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs ++ ++#include ++ ++ ++// We are hot - unistd.h should have turned on the specific APIs we requested ++ ++ ++#ifdef QT_THREAD_SUPPORT ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++// DNS header files are not fully covered by X/Open specifications. ++// In particular nothing is said about res_* :/ ++// On BSDs header files and are not ++// included by . Note that must be included ++// before . ++#include ++#include ++#include ++#include ++ ++ ++#if !defined(QT_NO_COMPAT) ++#define QT_STATBUF struct stat ++#define QT_STATBUF4TSTAT struct stat ++#define QT_STAT ::stat ++#define QT_FSTAT ::fstat ++#define QT_STAT_REG S_IFREG ++#define QT_STAT_DIR S_IFDIR ++#define QT_STAT_MASK S_IFMT ++#define QT_STAT_LNK S_IFLNK ++#define QT_FILENO fileno ++#define QT_OPEN ::open ++#define QT_CLOSE ::close ++#define QT_LSEEK ::lseek ++#define QT_READ ::read ++#define QT_WRITE ::write ++#define QT_ACCESS ::access ++#define QT_GETCWD ::getcwd ++#define QT_CHDIR ::chdir ++#define QT_MKDIR ::mkdir ++#define QT_RMDIR ::rmdir ++#define QT_OPEN_RDONLY O_RDONLY ++#define QT_OPEN_WRONLY O_WRONLY ++#define QT_OPEN_RDWR O_RDWR ++#define QT_OPEN_CREAT O_CREAT ++#define QT_OPEN_TRUNC O_TRUNC ++#define QT_OPEN_APPEND O_APPEND ++#endif ++ ++#define QT_SIGNAL_RETTYPE void ++#define QT_SIGNAL_ARGS int ++#define QT_SIGNAL_IGNORE SIG_IGN ++#define QT_SOCKLEN_T int ++#define QT_SNPRINTF ::snprintf ++#define QT_VSNPRINTF ::vsnprintf ++ ++#endif // QPLATFORMDEFS_H diff --git a/x11/qt3-libs/patches/patch-ib b/x11/qt3-libs/patches/patch-ib new file mode 100644 index 00000000000..0b36f82e74a --- /dev/null +++ b/x11/qt3-libs/patches/patch-ib @@ -0,0 +1,85 @@ +$NetBSD: patch-ib,v 1.1 2004/10/13 02:08:43 tv Exp $ + +--- mkspecs/interix-g++/qmake.conf.orig Tue Oct 12 16:51:42 2004 ++++ mkspecs/interix-g++/qmake.conf +@@ -0,0 +1,80 @@ ++# ++# qmake configuration for interix-g++ ++# ++ ++MAKEFILE_GENERATOR = UNIX ++TEMPLATE = app ++CONFIG += qt warn_on release link_prl ++ ++QMAKE_CC = gcc ++QMAKE_LEX = lex ++QMAKE_LEXFLAGS = ++QMAKE_YACC = yacc ++QMAKE_YACCFLAGS = -d ++QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS_DEPS = -M ++QMAKE_CFLAGS_WARN_ON = -Wall -W ++QMAKE_CFLAGS_WARN_OFF = -w ++QMAKE_CFLAGS_RELEASE = -O2 ++QMAKE_CFLAGS_DEBUG = -g ++QMAKE_CFLAGS_SHLIB = # nothing ++QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses ++QMAKE_CFLAGS_THREAD = -D_REENTRANT ++ ++QMAKE_CXX = g++ ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS ++QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS ++QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON ++QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF ++QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE ++QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG ++QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB ++QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC ++QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD ++ ++QMAKE_INCDIR = /usr/local/include ++QMAKE_LIBDIR = /usr/local/lib ++QMAKE_INCDIR_X11 = /usr/X11R6/include ++QMAKE_LIBDIR_X11 = /usr/X11R6/lib ++QMAKE_INCDIR_QT = $(QTDIR)/include ++QMAKE_LIBDIR_QT = $(QTDIR)/lib ++QMAKE_INCDIR_OPENGL = /usr/X11R6/include ++QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++ ++QMAKE_LINK = g++ ++QMAKE_LINK_SHLIB = g++ ++QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) ++QMAKE_LFLAGS = ++QMAKE_LFLAGS_RELEASE = ++QMAKE_LFLAGS_DEBUG = ++QMAKE_LFLAGS_SHLIB = -shared ++QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB ++QMAKE_LFLAGS_SONAME = -Wl,-soname, ++QMAKE_LFLAGS_THREAD = -lpthread ++QMAKE_RPATH = -Wl,-rpath, ++ ++QMAKE_LIBS = ++QMAKE_LIBS_DYNLOAD = ++QMAKE_LIBS_X11 = -lXext -lX11 -lm ++QMAKE_LIBS_X11SM = -lSM -lICE ++QMAKE_LIBS_QT = -lqt ++QMAKE_LIBS_QT_THREAD = -lqt-mt ++QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu ++QMAKE_LIBS_OPENGL_QT = -lGL -lXmu ++QMAKE_LIBS_THREAD = ++ ++QMAKE_MOC = $(QTDIR)/bin/moc ++QMAKE_UIC = $(QTDIR)/bin/uic ++ ++QMAKE_AR = ar cqs ++QMAKE_RANLIB = ranlib ++ ++QMAKE_TAR = tar -cf ++QMAKE_GZIP = gzip -9f ++ ++QMAKE_COPY = cp -f ++QMAKE_MOVE = mv -f ++QMAKE_DEL_FILE = rm -f ++QMAKE_DEL_DIR = rmdir ++QMAKE_CHK_DIR_EXISTS = test -d ++QMAKE_MKDIR = mkdir -p -- cgit v1.2.3