diff options
| author | wiz <wiz> | 2014-04-15 16:47:25 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-04-15 16:47:25 +0000 |
| commit | ffcc34fdb1043e317ae1bd98ef9812498c862def (patch) | |
| tree | 2e238ff19beed0fe54c262a37a74c882d3ecb6c4 /x11 | |
| parent | 60c625062df43adeef40801f5ae9ee07d7e993c9 (diff) | |
| download | pkgsrc-ffcc34fdb1043e317ae1bd98ef9812498c862def.tar.gz | |
Fix compatibility with fontsproto-2.1.3 and depend on it.
Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libXfont/Makefile | 4 | ||||
| -rw-r--r-- | x11/libXfont/distinfo | 3 | ||||
| -rw-r--r-- | x11/libXfont/patches/patch-src_util_patcache.c | 24 |
3 files changed, 29 insertions, 2 deletions
diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile index 4dd02a30358..d6eecb9fada 100644 --- a/x11/libXfont/Makefile +++ b/x11/libXfont/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2014/01/07 20:09:18 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2014/04/15 16:47:25 wiz Exp $ DISTNAME= libXfont-1.4.7 +PKGREVISION= 1 CATEGORIES= x11 devel fonts MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -24,6 +25,7 @@ CONFIGURE_ARGS+= --disable-devel-docs .include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/fontcacheproto/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" +BUILDLINK_API_DEPENDS.fontsproto+= fontsproto>=2.1.3 .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" .include "../../x11/xtrans/buildlink3.mk" diff --git a/x11/libXfont/distinfo b/x11/libXfont/distinfo index beea638cabb..d87e32226af 100644 --- a/x11/libXfont/distinfo +++ b/x11/libXfont/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.21 2014/01/07 20:09:18 wiz Exp $ +$NetBSD: distinfo,v 1.22 2014/04/15 16:47:25 wiz Exp $ SHA1 (libXfont-1.4.7.tar.bz2) = 77f60d0a2190cb36c07c2217693f46d5e8942ca2 RMD160 (libXfont-1.4.7.tar.bz2) = 9ed172b89586d7f1b8342045c75f5aa861c6f661 Size (libXfont-1.4.7.tar.bz2) = 482851 bytes +SHA1 (patch-src_util_patcache.c) = 4b21d5fddae374e43e5ec37efd3da98171f1625d diff --git a/x11/libXfont/patches/patch-src_util_patcache.c b/x11/libXfont/patches/patch-src_util_patcache.c new file mode 100644 index 00000000000..27b55873e3c --- /dev/null +++ b/x11/libXfont/patches/patch-src_util_patcache.c @@ -0,0 +1,24 @@ +$NetBSD: patch-src_util_patcache.c,v 1.1 2014/04/15 16:47:26 wiz Exp $ + +Fix compatibility with fontsproto-2.1.3. + +--- src/util/patcache.c.orig 2014-01-07 16:25:08.000000000 +0000 ++++ src/util/patcache.c +@@ -128,7 +128,7 @@ Hash (const char *string, int len) + /* add entry */ + void + CacheFontPattern (FontPatternCachePtr cache, +- char *pattern, ++ const char *pattern, + int patlen, + FontPtr pFont) + { +@@ -174,7 +174,7 @@ CacheFontPattern (FontPatternCachePtr ca + /* find matching entry */ + FontPtr + FindCachedFontPattern (FontPatternCachePtr cache, +- char *pattern, ++ const char *pattern, + int patlen) + { + int hash; |