summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2003-06-09 12:32:45 +0000
committertron <tron@pkgsrc.org>2003-06-09 12:32:45 +0000
commitf480c07e99aa15ab03428cf4b0358923c15d4384 (patch)
treef7321bb5b44ba374332f709d74f8fc370a40a81c /x11
parentcf6a11ae0efe61b4f157f4b2f2fdcdafdbf64efa (diff)
downloadpkgsrc-f480c07e99aa15ab03428cf4b0358923c15d4384.tar.gz
Add "Xft2" support. This provides antialiased fonts and fixes build
problems under XFree86 4.3.0 (and with it hopefully PR pkg/21828). Bump package revision to reflect changes.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt2-libs/Makefile7
-rw-r--r--x11/qt2-libs/distinfo3
-rw-r--r--x11/qt2-libs/patches/patch-am15
3 files changed, 22 insertions, 3 deletions
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index a04bc9ef656..637e379e9ac 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/03/09 19:28:17 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/09 12:32:45 tron Exp $
PKGNAME= qt2-libs-${QTVERSION}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= C++ X GUI toolkit
USE_BUILDLINK2= yes
@@ -9,6 +9,8 @@ USE_BUILDLINK2= yes
.include "../qt2-libs/Makefile.common"
CONFIGURE_ARGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+CONFIGURE_ARGS+= -I${LOCALBASE}/include/freetype2
+CONFIGURE_ARGS+= -I${X11BASE}/include/freetype2
CONFIGURE_ARGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
CONFIGURE_ENV+= QTDIR="${WRKSRC}"
@@ -27,6 +29,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
.include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../graphics/glu/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index 215fe17458e..c8cb189ca2f 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2003/02/07 02:10:40 dmcmahill Exp $
+$NetBSD: distinfo,v 1.12 2003/06/09 12:32:45 tron Exp $
SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
@@ -14,3 +14,4 @@ SHA1 (patch-ai) = 20a61cefe445fdc8cac90da9800d0836ac57caf8
SHA1 (patch-aj) = ed0cd262eca3ff190c221421a62ce2970121a4d4
SHA1 (patch-ak) = 3eac0d921f3535231aab9ff1f6738f9541b8b564
SHA1 (patch-al) = 32f6b13393b115c56a4ca75f62f5916034189174
+SHA1 (patch-am) = bc6fc455ca86df1e9b877bbd08ba226145de484f
diff --git a/x11/qt2-libs/patches/patch-am b/x11/qt2-libs/patches/patch-am
new file mode 100644
index 00000000000..c7d7dc2b03e
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2003/06/09 12:32:46 tron 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 @@
+ };
+
+
+-#ifndef _OS_OSF_
+-extern "C" char* getenv(char*);
+-#endif
+-
+ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFont &f, QByteArray& d)
+ {
+ psname = makePSFontName( f );