pkgsrc/x11/qt3-libs/patches/patch-ad

$NetBSD: patch-ad,v 1.8 2005/04/13 21:58:05 bouyer Exp $

--- src/tools/qglobal.h.orig	Fri Jan 21 18:16:04 2005
+++ src/tools/qglobal.h	Fri Apr  8 21:19:49 2005
@@ -63,6 +63,7 @@
      NETBSD	- NetBSD
      OPENBSD	- OpenBSD
      BSDI	- BSD/OS
+     INTERIX	- Interix
      IRIX	- SGI Irix
      OSF	- HP Tru64 UNIX
      SCO	- SCO OpenServer 5
@@ -82,9 +83,9 @@
 #if defined(__DARWIN_X11__)
 #  define Q_OS_DARWIN
 #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__))
-#  define Q_OS_MACX
+#  define Q_OS_DARWIN
 #elif defined(__MACOSX__)
-#  define Q_OS_MACX
+#  define Q_OS_DARWIN
 #elif defined(macintosh)
 #  define Q_OS_MAC9
 #elif defined(__CYGWIN__)
@@ -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
qt3 build system makes a difference between MacOS X and Darwin: it will build with X11 support on Darwin and MacOS X native interface on MacOS X. But the Free qt3 only includes X11 support, and so the build fails on MacOS X. Change the build defines to use the same options on MacOS X and Darwin. 2005-04-13 23:58:05 +02:00			$NetBSD: patch-ad,v 1.8 2005/04/13 21:58:05 bouyer Exp $
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.) 2004-10-13 04:08:43 +02:00
qt3 build system makes a difference between MacOS X and Darwin: it will build with X11 support on Darwin and MacOS X native interface on MacOS X. But the Free qt3 only includes X11 support, and so the build fails on MacOS X. Change the build defines to use the same options on MacOS X and Darwin. 2005-04-13 23:58:05 +02:00			`--- src/tools/qglobal.h.orig Fri Jan 21 18:16:04 2005`
			`+++ src/tools/qglobal.h Fri Apr 8 21:19:49 2005`
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.) 2004-10-13 04:08:43 +02:00			`@@ -63,6 +63,7 @@`
			`NETBSD - NetBSD`
			`OPENBSD - OpenBSD`
			`BSDI - BSD/OS`
			`+ INTERIX - Interix`
			`IRIX - SGI Irix`
			`OSF - HP Tru64 UNIX`
			`SCO - SCO OpenServer 5`
qt3 build system makes a difference between MacOS X and Darwin: it will build with X11 support on Darwin and MacOS X native interface on MacOS X. But the Free qt3 only includes X11 support, and so the build fails on MacOS X. Change the build defines to use the same options on MacOS X and Darwin. 2005-04-13 23:58:05 +02:00			`@@ -82,9 +83,9 @@`
			`#if defined(__DARWIN_X11__)`
			`# define Q_OS_DARWIN`
			`#elif defined(__APPLE__) && (defined(__GNUC__) \|\| defined(__xlC__))`
			`-# define Q_OS_MACX`
			`+# define Q_OS_DARWIN`
			`#elif defined(__MACOSX__)`
			`-# define Q_OS_MACX`
			`+# define Q_OS_DARWIN`
			`#elif defined(macintosh)`
			`# define Q_OS_MAC9`
			`#elif defined(__CYGWIN__)`
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.) 2004-10-13 04:08:43 +02:00			`@@ -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`