summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2004-01-09 22:33:35 +0000
committeragc <agc>2004-01-09 22:33:35 +0000
commit6f4af62a54b677aaebf038e304b0795531e0e87a (patch)
tree6341fa4771da7b39662d052f3b4adee8390d6197
parent69e6c9b002b053c2b90e5f86f261db0f60b34af8 (diff)
downloadpkgsrc-6f4af62a54b677aaebf038e304b0795531e0e87a.tar.gz
Pull up portability fix to the pkgsrc-2003Q4 branch, requested by Dan
McMahill. Committed By: dmcmahill Date: Tue Nov 25 23:05:24 UTC 2003 Modified Files: pkgsrc/x11/qt2-libs: distinfo pkgsrc/x11/qt2-libs/patches: patch-am Log Message: include stdlib.h to get a prototype for getenv(). Fixes recently noted bulk build problems on alpha.
-rw-r--r--x11/qt2-libs/distinfo4
-rw-r--r--x11/qt2-libs/patches/patch-am23
2 files changed, 18 insertions, 9 deletions
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index c8cb189ca2f..4a653db8c74 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2003/06/09 12:32:45 tron Exp $
+$NetBSD: distinfo,v 1.12.2.1 2004/01/09 22:33:35 agc Exp $
SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
@@ -14,4 +14,4 @@ SHA1 (patch-ai) = 20a61cefe445fdc8cac90da9800d0836ac57caf8
SHA1 (patch-aj) = ed0cd262eca3ff190c221421a62ce2970121a4d4
SHA1 (patch-ak) = 3eac0d921f3535231aab9ff1f6738f9541b8b564
SHA1 (patch-al) = 32f6b13393b115c56a4ca75f62f5916034189174
-SHA1 (patch-am) = bc6fc455ca86df1e9b877bbd08ba226145de484f
+SHA1 (patch-am) = ebbc184b095e2adcf81461472f4723d515167a9e
diff --git a/x11/qt2-libs/patches/patch-am b/x11/qt2-libs/patches/patch-am
index c7d7dc2b03e..083b1654340 100644
--- a/x11/qt2-libs/patches/patch-am
+++ b/x11/qt2-libs/patches/patch-am
@@ -1,15 +1,24 @@
-$NetBSD: patch-am,v 1.1 2003/06/09 12:32:46 tron Exp $
+$NetBSD: patch-am,v 1.1.2.1 2004/01/09 22:33:35 agc Exp $
---- src/kernel/qpsprinter.cpp.orig 2001-06-13 10:53:46.000000000 +0200
-+++ src/kernel/qpsprinter.cpp 2003-06-09 14:16:18.000000000 +0200
-@@ -2771,10 +2771,6 @@
- };
+--- src/kernel/qpsprinter.cpp.orig Wed Jun 13 08:53:46 2001
++++ src/kernel/qpsprinter.cpp
+@@ -92,6 +92,8 @@
+ #include <unistd.h>
+ #endif
+
++#include <stdlib.h>
++
+ #ifdef _WS_X11_
+ #include "qt_x11.h"
+ #ifdef None
+@@ -2770,10 +2772,6 @@ private:
+ };
+-
-#ifndef _OS_OSF_
-extern "C" char* getenv(char*);
-#endif
--
+
QPSPrinterFontTTF::QPSPrinterFontTTF(const QFont &f, QByteArray& d)
{
- psname = makePSFontName( f );