diff options
| author | tv <tv@pkgsrc.org> | 2004-10-13 15:15:52 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-13 15:15:52 +0000 |
| commit | 257ee9c940016d684cf628eae087f86d17e939b6 (patch) | |
| tree | 7db8c968fdaea0704279b31ef2a426e3ef0d008f /x11/qt3-libs/patches | |
| parent | dd6e5ecb4c39577e2874ba437263adff94774e73 (diff) | |
| download | pkgsrc-257ee9c940016d684cf628eae087f86d17e939b6.tar.gz | |
Another Interix-only fix: add -ldb, and since Qt incorrectly #includes
system C headers without extern "C", add extern "C" protection.
Diffstat (limited to 'x11/qt3-libs/patches')
| -rw-r--r-- | x11/qt3-libs/patches/patch-ia | 7 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-ib | 4 |
2 files changed, 7 insertions, 4 deletions
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 |