diff options
| author | joerg <joerg@pkgsrc.org> | 2007-01-23 15:20:08 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-01-23 15:20:08 +0000 |
| commit | 78355f72a17b394ea3537387ae600f7baaa73e25 (patch) | |
| tree | e26f2c3466b4ad019a1b2ef819fae2f8d0b19aff /x11/libXft | |
| parent | 8f48521e55454dc5be69f190240e43d15dbdde5f (diff) | |
| download | pkgsrc-78355f72a17b394ea3537387ae600f7baaa73e25.tar.gz | |
On second thought, update to libXft-2.1.12. This fixes a memory leak and
other minor errors. In contrast to upstream, keep XftNameUnparse public
for now until the tree has been evaluated.
Diffstat (limited to 'x11/libXft')
| -rw-r--r-- | x11/libXft/Makefile | 6 | ||||
| -rw-r--r-- | x11/libXft/distinfo | 10 | ||||
| -rw-r--r-- | x11/libXft/patches/patch-aa | 14 | ||||
| -rw-r--r-- | x11/libXft/patches/patch-ab | 17 |
4 files changed, 39 insertions, 8 deletions
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile index 6cf4682e6ed..90842ab08e5 100644 --- a/x11/libXft/Makefile +++ b/x11/libXft/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2007/01/23 14:57:39 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/23 15:20:08 joerg Exp $ -# Do NOT update to 2.1.12 as XftNameUnparse is removed again, but -# referenced in other packages. -DISTNAME= libXft-2.1.10 +DISTNAME= libXft-2.1.12 CATEGORIES= fonts x11 MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/libXft/distinfo b/x11/libXft/distinfo index 53eb0a4157a..5b0e232cdc3 100644 --- a/x11/libXft/distinfo +++ b/x11/libXft/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/11/03 21:26:36 joerg Exp $ +$NetBSD: distinfo,v 1.2 2007/01/23 15:20:08 joerg Exp $ -SHA1 (libXft-2.1.10.tar.bz2) = a5d661544c5605c44d22ccd76383344dee03254b -RMD160 (libXft-2.1.10.tar.bz2) = 41fa35fff3ff5c8e9d9402c73b2b9971283acbc3 -Size (libXft-2.1.10.tar.bz2) = 252786 bytes +SHA1 (libXft-2.1.12.tar.bz2) = c55fb1b79e6e8459a343e4986f0607a438eff340 +RMD160 (libXft-2.1.12.tar.bz2) = 98ee482a0bdb9d41bbea667ea84d00421e51424b +Size (libXft-2.1.12.tar.bz2) = 260437 bytes +SHA1 (patch-aa) = aa6f081596084e97e3767ce2b1d4648cf7917a6c +SHA1 (patch-ab) = e275990e6469819724d76b393d8a451cca778f9a diff --git a/x11/libXft/patches/patch-aa b/x11/libXft/patches/patch-aa new file mode 100644 index 00000000000..d40062773a1 --- /dev/null +++ b/x11/libXft/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1 2007/01/23 15:20:08 joerg Exp $ + +--- include/X11/Xft/Xft.h.orig 2006-12-07 11:20:30.000000000 +0100 ++++ include/X11/Xft/Xft.h +@@ -447,6 +447,9 @@ XftListFonts (Display *dpy, + FcPattern + *XftNameParse (_Xconst char *name); + ++FcBool ++XftNameUnparse (FcPattern *pat, char *dest, int len); ++ + /* xftrender.c */ + void + XftGlyphRender (Display *dpy, diff --git a/x11/libXft/patches/patch-ab b/x11/libXft/patches/patch-ab new file mode 100644 index 00000000000..b24760b0423 --- /dev/null +++ b/x11/libXft/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.1 2007/01/23 15:20:08 joerg Exp $ + +--- configure.orig 2007-01-23 16:04:17.000000000 +0100 ++++ configure +@@ -2269,10 +2269,10 @@ AMSHOWCMDSAT='' + AMDEPSHOWCMDSAT='' + AMPRETTYECHO=true + AMCMDECHO=echo +-if test "x$enable_pretty_cmds" == xyes; ++if test "x$enable_pretty_cmds" = xyes; + then + AMSHOWCMDSAT='@' +- test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@' ++ test x$enable_dependency_tracking = xno && AMDEPSHOWCMDSAT='@' + AMPRETTYECHO=echo + AMCMDECHO=true + LT_QUIET='--quiet' |