summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-06-06 07:05:52 +0000
committerwiz <wiz@pkgsrc.org>2014-06-06 07:05:52 +0000
commit91b0d917e17fb9e088c52e3c3503235b0520b5b1 (patch)
tree5944cde49343f45b633a5adaced466c4033a9a14 /x11
parenta3cbd913c8a730d39de352f263c1df38a4339c0a (diff)
downloadpkgsrc-91b0d917e17fb9e088c52e3c3503235b0520b5b1.tar.gz
Update to 2.3.2:
This release fixes a build issue with FreeType 2.5.1 & later, and fixes the prototypes in the man page for XftDrawString8 & XftDrawRect.
Diffstat (limited to 'x11')
-rw-r--r--x11/libXft/Makefile5
-rw-r--r--x11/libXft/distinfo9
-rw-r--r--x11/libXft/patches/patch-src_xftglyphs.c23
3 files changed, 6 insertions, 31 deletions
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index 76f7515642b..b8d61cf8a24 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2013/06/06 12:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/06 07:05:52 wiz Exp $
-DISTNAME= libXft-2.3.1
-PKGREVISION= 3
+DISTNAME= libXft-2.3.2
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/libXft/distinfo b/x11/libXft/distinfo
index 1e111b262dc..e68b17d862d 100644
--- a/x11/libXft/distinfo
+++ b/x11/libXft/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2014/03/15 09:20:31 richard Exp $
+$NetBSD: distinfo,v 1.10 2014/06/06 07:05:52 wiz Exp $
-SHA1 (libXft-2.3.1.tar.bz2) = c7ec1361e3d4f095910f8c58988ab42e32f314d9
-RMD160 (libXft-2.3.1.tar.bz2) = 81a29298af843dff03234a6f0068ae052e698380
-Size (libXft-2.3.1.tar.bz2) = 311556 bytes
-SHA1 (patch-src_xftglyphs.c) = 50bb8668ed1cd4555f55b63d23a4d90dba9bb2df
+SHA1 (libXft-2.3.2.tar.bz2) = e025d790a7b6c4d283a78d8df06615cb10278e2d
+RMD160 (libXft-2.3.2.tar.bz2) = 538536c5b10e2ae7696a2183a25bc3b59b5442b3
+Size (libXft-2.3.2.tar.bz2) = 335495 bytes
diff --git a/x11/libXft/patches/patch-src_xftglyphs.c b/x11/libXft/patches/patch-src_xftglyphs.c
deleted file mode 100644
index 5064565e927..00000000000
--- a/x11/libXft/patches/patch-src_xftglyphs.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_xftglyphs.c,v 1.1 2014/03/15 09:20:31 richard Exp $
-Use FT_*_H macros instead of including <freetype/*.h>
-http://lists.freedesktop.org/archives/xorg-devel/2013-December/039310.html
-and
-http://lists.freedesktop.org/archives/xorg-devel/2013-December/039311.html
-
---- src/xftglyphs.c.orig 2012-06-02 16:36:35.000000000 +0000
-+++ src/xftglyphs.c
-@@ -21,10 +21,10 @@
- */
-
- #include "xftint.h"
--#include <freetype/ftoutln.h>
--#include <freetype/ftlcdfil.h>
--
--#include <freetype/ftsynth.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_LCD_FILTER_H
-+#include FT_SYNTHESIS_H
-
- /*
- * Validate the memory info for a font