Sun Jul 13 23:41:02 2008 UTC ()
Update to libXft-2.1.13.  Bump BUILDLINK_ABI_DEPENDS, as the library
version is now 2.1.13 (from 2.1.2).  ChangeLog:

commit 19240d3605b5f1e88ca5509afffd48acdb7e1c5f

    Revert "Drop Requires, use Requires.private instead."

    This reverts commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab.

    Unfortunately this doesn't work on old pkg-config, which made
    Requires.private completely useless.  That's fixed in 0.22, but...

commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab

    Drop Requires, use Requires.private instead.

    Users of libXft don't need to link with fontconfig, freetype and
    Xrender directly if they don't use them.

commit 541c6194d986e7849ee9541a9fd60b0724647a44

    Bug #14232: Fix XftDrawRect when Render not supported.

commit 8a7f3d450c1f339f429dbce55df523d026c92375

    Register objects used by libXft.

    libXft uses XFT_MAX_GLYPH_MEMORY without first registering with
    fontconfig.

commit 8ae5ea8c75a7850fa0aca0acc3962b6263f55094

    XftFontOpenInfo: Use of uninitialised value of size 8 (bug 11200)

    This is due to XftFontInfoFill using the binary representation of the
    XftFontInfo to generate fi->hash.

    With 64-bit pointers there is padding between .hash and .file in struct
    _XftFontInfo.  This padding is not initialized, and the hash uses these
    bytes.

    This will interfere with finding "a matching previously opened font" in
    XftFontOpenInfo, and XftFontInfoEqual, which uses memcmp, will have
    similar problems.

    This fix makes no assumptions about the sizes and alignment of
    members of struct _XftFontInfo by using memset.  (It also makes
    no assumptions about what FcPatternGet* does to its output parameter
    when it returns FcResultNoMatch.)


(bjs)
diff -r1.6 -r1.7 pkgsrc/x11/libXft/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/libXft/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/x11/libXft/distinfo
diff -r1.1 -r0 pkgsrc/x11/libXft/patches/patch-aa
diff -r1.1 -r0 pkgsrc/x11/libXft/patches/patch-ab
diff -r1.1 -r0 pkgsrc/x11/libXft/patches/patch-ac
diff -r1.1 -r0 pkgsrc/x11/libXft/patches/patch-ad

cvs diff -r1.6 -r1.7 pkgsrc/x11/libXft/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXft/Makefile 2008/05/24 21:45:15 1.6
+++ pkgsrc/x11/libXft/Makefile 2008/07/13 23:41:02 1.7
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:15 tnn Exp $ 1# $NetBSD: Makefile,v 1.7 2008/07/13 23:41:02 bjs Exp $
2 2
3DISTNAME= libXft-2.1.12 3DISTNAME= libXft-2.1.13
4PKGREVISION= 1 
5CATEGORIES= fonts x11 4CATEGORIES= fonts x11
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://fontconfig.org/ 9HOMEPAGE= http://fontconfig.org/
11COMMENT= Library for configuring and customizing font access 10COMMENT= Library for configuring and customizing font access
12 11
13CONFLICTS+= Xft2-[0-9]* 12CONFLICTS+= Xft2-[0-9]*
14 13
15PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16

cvs diff -r1.2 -r1.3 pkgsrc/x11/libXft/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXft/buildlink3.mk 2006/11/05 16:55:28 1.2
+++ pkgsrc/x11/libXft/buildlink3.mk 2008/07/13 23:41:02 1.3
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2008/07/13 23:41:02 bjs Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" 5.if ${X11_TYPE} != "modular"
6.include "../../fonts/Xft2/buildlink3.mk" 6.include "../../fonts/Xft2/buildlink3.mk"
7.else 7.else
8 8
9BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 9BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
10LIBXFT_BUILDLINK3_MK:= ${LIBXFT_BUILDLINK3_MK}+ 10LIBXFT_BUILDLINK3_MK:= ${LIBXFT_BUILDLINK3_MK}+
11 11
12.if ${BUILDLINK_DEPTH} == "+" 12.if ${BUILDLINK_DEPTH} == "+"
13BUILDLINK_DEPENDS+= libXft 13BUILDLINK_DEPENDS+= libXft
14.endif 14.endif
15 15
16BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXft} 16BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXft}
17BUILDLINK_PACKAGES+= libXft 17BUILDLINK_PACKAGES+= libXft
18BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXft 18BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXft
19 19
20.if ${LIBXFT_BUILDLINK3_MK} == "+" 20.if ${LIBXFT_BUILDLINK3_MK} == "+"
21BUILDLINK_API_DEPENDS.libXft+= libXft>=2.1.10 21BUILDLINK_API_DEPENDS.libXft+= libXft>=2.1.10
 22BUILDLiNK_ABI_DEPENDS.libXft+= libXft>=2.1.13
22BUILDLINK_PKGSRCDIR.libXft?= ../../x11/libXft 23BUILDLINK_PKGSRCDIR.libXft?= ../../x11/libXft
23.endif # LIBXFT_BUILDLINK3_MK 24.endif # LIBXFT_BUILDLINK3_MK
24 25
25.include "../../fonts/fontconfig/buildlink3.mk" 26.include "../../fonts/fontconfig/buildlink3.mk"
26.include "../../graphics/freetype2/buildlink3.mk" 27.include "../../graphics/freetype2/buildlink3.mk"
27.include "../../x11/libXrender/buildlink3.mk" 28.include "../../x11/libXrender/buildlink3.mk"
28.include "../../x11/libX11/buildlink3.mk" 29.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/xproto/buildlink3.mk" 30.include "../../x11/xproto/buildlink3.mk"
30 31
31BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 32BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
32 33
33.endif 34.endif

cvs diff -r1.3 -r1.4 pkgsrc/x11/libXft/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libXft/distinfo 2008/01/29 04:18:44 1.3
+++ pkgsrc/x11/libXft/distinfo 2008/07/13 23:41:02 1.4
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.3 2008/01/29 04:18:44 bjs Exp $ 1$NetBSD: distinfo,v 1.4 2008/07/13 23:41:02 bjs Exp $
2 2
3SHA1 (libXft-2.1.12.tar.bz2) = c55fb1b79e6e8459a343e4986f0607a438eff340 3SHA1 (libXft-2.1.13.tar.bz2) = 7ce291fe4306de8e73e545ab9af2285cc1c26dce
4RMD160 (libXft-2.1.12.tar.bz2) = 98ee482a0bdb9d41bbea667ea84d00421e51424b 4RMD160 (libXft-2.1.13.tar.bz2) = f9cbfd6710a9999a12f49e2bb23b8061eee01e9e
5Size (libXft-2.1.12.tar.bz2) = 260437 bytes 5Size (libXft-2.1.13.tar.bz2) = 268153 bytes
6SHA1 (patch-aa) = aa6f081596084e97e3767ce2b1d4648cf7917a6c 6SHA1 (patch-aa) = aa6f081596084e97e3767ce2b1d4648cf7917a6c
7SHA1 (patch-ab) = e275990e6469819724d76b393d8a451cca778f9a 7SHA1 (patch-ab) = e275990e6469819724d76b393d8a451cca778f9a
8SHA1 (patch-ac) = d00925dcc3ad35933036c6708626d9b745712119 8SHA1 (patch-ac) = d00925dcc3ad35933036c6708626d9b745712119
9SHA1 (patch-ad) = 6257e56f6347a898fd6208d131a41581d900d6cb 9SHA1 (patch-ad) = 6257e56f6347a898fd6208d131a41581d900d6cb
10SHA1 (patch-ae) = 09d00a1cda14b6a7a2e6a38597b538948889179a 10SHA1 (patch-ae) = 09d00a1cda14b6a7a2e6a38597b538948889179a

File Deleted: pkgsrc/x11/libXft/patches/Attic/patch-aa

File Deleted: pkgsrc/x11/libXft/patches/Attic/patch-ab

File Deleted: pkgsrc/x11/libXft/patches/Attic/patch-ac

File Deleted: pkgsrc/x11/libXft/patches/Attic/patch-ad