Another Interix-only fix: add -ldb, and since Qt incorrectly #includes

system C headers without extern "C", add extern "C" protection.

4 files changed, 12 insertions, 9 deletions

diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index b4c5335698a..d3083c87996 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2004/10/13 12:06:36 tv Exp $
+# $NetBSD: Makefile.common,v 1.37 2004/10/13 15:15:52 tv Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -59,7 +59,7 @@ 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
-SYS_LIBS=		-lbind -ldl
+SYS_LIBS=		-lbind -ldb -ldl
 .endif
 
 .if !exists(${X11BASE}/lib/libXinerama.so)
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index e6b7341ca60..71567e6437b 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2004/10/13 12:06:36 tv Exp $
+$NetBSD: distinfo,v 1.27 2004/10/13 15:15:52 tv Exp $
 
 SHA1 (qt-x11-free-3.3.3.tar.bz2) = b9737d8dc0c440a7d28f1f0a164e49f7bd242585
 Size (qt-x11-free-3.3.3.tar.bz2) = 14424812 bytes
@@ -15,5 +15,5 @@ SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = df300b77d0adb653eaa16c97f995ed2def8e7d87
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
 SHA1 (patch-bd) = 0493bc7a0e9b9fa3c88f77b6fc89f77a3e4e3481
-SHA1 (patch-ia) = c02d328458c49f6070e86b56de84bce776cfce1f
-SHA1 (patch-ib) = 81a901ee3bcee6525d9bcd064aab70d4fe0afb8d
+SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
+SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
diff --git a/x11/qt3-libs/patches/patch-ia b/x11/qt3-libs/patches/patch-ia
index bd97b10c5ac..a3edeb76cea 100644
--- a/x11/qt3-libs/patches/patch-ia
+++ b/x11/qt3-libs/patches/patch-ia
@@ -1,8 +1,8 @@
-$NetBSD: patch-ia,v 1.1 2004/10/13 02:08:43 tv Exp $
+$NetBSD: patch-ia,v 1.2 2004/10/13 15:15:53 tv Exp $
 
 --- mkspecs/interix-g++/qplatformdefs.h.orig	Tue Oct 12 16:43:29 2004
 +++ mkspecs/interix-g++/qplatformdefs.h
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,85 @@
 +#ifndef QPLATFORMDEFS_H
 +#define QPLATFORMDEFS_H
 +
@@ -10,6 +10,8 @@ $NetBSD: patch-ia,v 1.1 2004/10/13 02:08:43 tv Exp $
 +
 +#include "qglobal.h"
 +
++extern "C" { // it is nonstandard to include C headers without protection!
++
 +// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
 +
 +#include <unistd.h>
@@ -48,6 +50,7 @@ $NetBSD: patch-ia,v 1.1 2004/10/13 02:08:43 tv Exp $
 +#include <arpa/nameser.h>
 +#include <resolv.h>
 +
++}; // extern "C"
 +
 +#if !defined(QT_NO_COMPAT)
 +#define QT_STATBUF		struct stat
diff --git a/x11/qt3-libs/patches/patch-ib b/x11/qt3-libs/patches/patch-ib
index dc83e913734..824dfe6a0b4 100644
--- a/x11/qt3-libs/patches/patch-ib
+++ b/x11/qt3-libs/patches/patch-ib
@@ -1,4 +1,4 @@
-$NetBSD: patch-ib,v 1.2 2004/10/13 12:06:36 tv Exp $
+$NetBSD: patch-ib,v 1.3 2004/10/13 15:15:53 tv Exp $
 
 --- mkspecs/interix-g++/qmake.conf.orig	Tue Oct 12 16:51:42 2004
 +++ mkspecs/interix-g++/qmake.conf
@@ -60,7 +60,7 @@ $NetBSD: patch-ib,v 1.2 2004/10/13 12:06:36 tv Exp $
 +
 +QMAKE_LIBS		=
 +QMAKE_LIBS_DYNLOAD	=
-+QMAKE_LIBS_X11		= -lXext -lX11 -lm -ldl -lbind
++QMAKE_LIBS_X11		= -lXext -lX11 -lm -lbind -ldb -ldl
 +QMAKE_LIBS_X11SM	= -lSM -lICE
 +QMAKE_LIBS_QT		= -lqt
 +QMAKE_LIBS_QT_THREAD	= -lqt-mt