update to 2.10.91
changes unknown (while the version number suggests an unstable release, it is needed by the last stable pango)
This commit is contained in:
drochner
parent
5dc320ef0f
commit
a6edad6d42
6 changed files with 31 additions and 52 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.78 2012/12/16 11:16:38 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.79 2013/03/14 19:32:31 drochner Exp $
|
||||
|
||||
DISTNAME= fontconfig-2.10.2
|
||||
DISTNAME= fontconfig-2.10.91
|
||||
CATEGORIES= fonts
|
||||
MASTER_SITES= http://www.fontconfig.org/release/
|
||||
|
||||
|
|
@ -53,8 +53,9 @@ CONF_FILES+= ${EGDIR}/conf.d/README ${PKG_SYSCONFDIR}/conf.d/README
|
|||
TMPLDIR= ${PREFIX}/share/fontconfig/conf.avail
|
||||
MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d
|
||||
# following list from ${WRKSRC}/conf.d/Makefile.am
|
||||
FC_STDCONF= 20-unhint-small-vera.conf 30-metric-aliases.conf 30-urw-aliases.conf \
|
||||
40-nonlatin.conf 45-latin.conf 49-sansserif.conf 50-user.conf 51-local.conf \
|
||||
FC_STDCONF= 10-scale-bitmap-fonts.conf 20-unhint-small-vera.conf \
|
||||
30-metric-aliases.conf 30-urw-aliases.conf 40-nonlatin.conf \
|
||||
45-latin.conf 49-sansserif.conf 50-user.conf 51-local.conf \
|
||||
60-latin.conf 65-fonts-persian.conf 65-nonlatin.conf 69-unifont.conf \
|
||||
80-delicious.conf 90-synthetic.conf
|
||||
# pkgsrc addition
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.21 2012/07/31 18:12:28 drochner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.22 2013/03/14 19:32:32 drochner Exp $
|
||||
bin/fc-cache
|
||||
bin/fc-cat
|
||||
bin/fc-list
|
||||
|
|
@ -6,6 +6,7 @@ bin/fc-match
|
|||
bin/fc-pattern
|
||||
bin/fc-query
|
||||
bin/fc-scan
|
||||
bin/fc-validate
|
||||
include/fontconfig/fcfreetype.h
|
||||
include/fontconfig/fcprivate.h
|
||||
include/fontconfig/fontconfig.h
|
||||
|
|
@ -18,6 +19,7 @@ man/man1/fc-match.1
|
|||
man/man1/fc-pattern.1
|
||||
man/man1/fc-query.1
|
||||
man/man1/fc-scan.1
|
||||
man/man1/fc-validate.1
|
||||
man/man3/FcAtomicCreate.3
|
||||
man/man3/FcAtomicDeleteNew.3
|
||||
man/man3/FcAtomicDestroy.3
|
||||
|
|
@ -121,6 +123,7 @@ man/man3/FcInitReinitialize.3
|
|||
man/man3/FcIsLower.3
|
||||
man/man3/FcIsUpper.3
|
||||
man/man3/FcLangGetCharSet.3
|
||||
man/man3/FcLangNormalize.3
|
||||
man/man3/FcLangSetAdd.3
|
||||
man/man3/FcLangSetCompare.3
|
||||
man/man3/FcLangSetContains.3
|
||||
|
|
@ -308,6 +311,7 @@ share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html
|
|||
share/doc/fontconfig/fontconfig-devel/fcislower.html
|
||||
share/doc/fontconfig/fontconfig-devel/fcisupper.html
|
||||
share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html
|
||||
share/doc/fontconfig/fontconfig-devel/fclangnormalize.html
|
||||
share/doc/fontconfig/fontconfig-devel/fclangsetadd.html
|
||||
share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html
|
||||
share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html
|
||||
|
|
@ -401,6 +405,7 @@ share/examples/fontconfig/conf.d/README
|
|||
share/examples/fontconfig/fonts.conf
|
||||
share/fontconfig/conf.avail/10-autohint.conf
|
||||
share/fontconfig/conf.avail/10-no-sub-pixel.conf
|
||||
share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
|
||||
share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
|
||||
share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
|
||||
share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
$NetBSD: distinfo,v 1.37 2012/12/16 11:16:38 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.38 2013/03/14 19:32:32 drochner Exp $
|
||||
|
||||
SHA1 (fontconfig-2.10.2.tar.gz) = 3999fc8a850c3bd07c71837f0579ec66378e1ebf
|
||||
RMD160 (fontconfig-2.10.2.tar.gz) = 9601c470378021f6c810fdbe5400d6194d7a7aab
|
||||
Size (fontconfig-2.10.2.tar.gz) = 1711102 bytes
|
||||
SHA1 (patch-aa) = fe0608917aea58ec43d51986d888fc7c38ae6aa3
|
||||
SHA1 (fontconfig-2.10.91.tar.gz) = ad6f0b59a60717c71941a65d49e06a74d5205d29
|
||||
RMD160 (fontconfig-2.10.91.tar.gz) = aafb1e0176296168c54904e6151465f77d99fcf0
|
||||
Size (fontconfig-2.10.91.tar.gz) = 1793107 bytes
|
||||
SHA1 (patch-aa) = c0e2e282383e8fab643d0a10fa47e42ebb4e8ae8
|
||||
SHA1 (patch-ab) = 71925f19d55a0daf382f4ac31c5010180173ae50
|
||||
SHA1 (patch-ac) = c4f9904842c43246321cb982af78c1a61d06ad75
|
||||
SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769
|
||||
SHA1 (patch-af) = becdaa40180fd8aaa828faf3776ccd70d460e67e
|
||||
SHA1 (patch-src_fcstat.c) = 2e8a5a7106f70a7bc1b5dd223600692c29eedb07
|
||||
SHA1 (patch-src_fcstat.c) = 3b8443b92f9fca5c02e21301da55ada3a0b20536
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
$NetBSD: patch-aa,v 1.15 2012/07/31 18:12:28 drochner Exp $
|
||||
$NetBSD: patch-aa,v 1.16 2013/03/14 19:32:32 drochner Exp $
|
||||
|
||||
--- Makefile.in.orig 2012-07-27 02:24:51.000000000 +0000
|
||||
--- Makefile.in.orig 2013-01-10 08:59:03.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -317,6 +317,7 @@ top_build_prefix = @top_build_prefix@
|
||||
@@ -357,6 +357,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
xmldir = $(XMLDIR)
|
||||
+egdir = $(prefix)/share/examples/fontconfig
|
||||
SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src \
|
||||
fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
|
||||
conf.d $(DOCSRC) test
|
||||
@@ -340,6 +341,7 @@ pkgconfig_DATA = fontconfig.pc
|
||||
xml_DATA = fonts.dtd
|
||||
SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src fc-cache fc-cat \
|
||||
fc-list fc-match fc-pattern fc-query fc-scan fc-validate \
|
||||
conf.d test $(am__append_1)
|
||||
@@ -383,6 +384,7 @@ xml_DATA = fonts.dtd
|
||||
@CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
|
||||
@CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
|
||||
DISTCHECK_CONFIGURE_FLAGS =
|
||||
+RUN_FC_CACHE_TEST = false
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@@ -932,17 +934,13 @@ fonts.conf: fonts.conf.in Makefile
|
||||
@@ -974,17 +976,13 @@ fonts.conf: fonts.conf.in Makefile
|
||||
mv $@.tmp $@
|
||||
|
||||
install-data-local: fonts.conf
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.8 2007/11/30 22:31:17 wiz Exp $
|
||||
|
||||
--- src/fcint.h.orig 2007-11-13 23:23:39.000000000 +0000
|
||||
+++ src/fcint.h
|
||||
@@ -35,6 +35,21 @@
|
||||
#include <inttypes.h>
|
||||
#elif defined(HAVE_STDINT_H)
|
||||
#include <stdint.h>
|
||||
+#elif defined(__INTERIX)
|
||||
+
|
||||
+/* limits.h has a definition for ALIGN() that conflicts with the one below */
|
||||
+# include <limits.h>
|
||||
+# undef ALIGN
|
||||
+/* Interix 3.x has a gcc that shadows this. */
|
||||
+# ifndef _INTPTR_T_DEFINED
|
||||
+ typedef long intptr_t;
|
||||
+# define _INTPTR_T_DEFINED
|
||||
+# endif
|
||||
+# ifndef _UINTPTR_T_DEFINED
|
||||
+ typedef unsigned long uintptr_t;
|
||||
+# define _UINTPTR_T_DEFINED
|
||||
+# endif
|
||||
+
|
||||
#else
|
||||
#error missing C99 integer data types
|
||||
#endif
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD: patch-src_fcstat.c,v 1.1 2012/10/03 12:11:22 bsiegert Exp $
|
||||
$NetBSD: patch-src_fcstat.c,v 1.2 2013/03/14 19:32:33 drochner Exp $
|
||||
|
||||
The argument types to scandir(3) differ between different OSes.
|
||||
OpenBSD seems to be still different. I used the provided alphasort
|
||||
instead of rewriting the equivalent sorter function.
|
||||
statvfs and fstatvfs need another include file, at least on MirBSD.
|
||||
--- src/fcstat.c.orig Wed Sep 26 08:58:18 2012
|
||||
--- src/fcstat.c.orig 2013-01-08 06:42:23.000000000 +0000
|
||||
+++ src/fcstat.c
|
||||
@@ -42,6 +42,9 @@
|
||||
#ifdef HAVE_SYS_MOUNT_H
|
||||
|
|
@ -15,8 +15,8 @@ statvfs and fstatvfs need another include file, at least on MirBSD.
|
|||
+#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
@@ -161,7 +164,11 @@ Adler32Finish (struct Adler32 *ctx)
|
||||
#ifdef __GNUC__
|
||||
@@ -158,7 +161,11 @@ Adler32Finish (struct Adler32 *ctx)
|
||||
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
|
||||
/* dirent.d_type can be relied upon on FAT filesystem */
|
||||
static FcBool
|
||||
|
|
@ -28,7 +28,7 @@ statvfs and fstatvfs need another include file, at least on MirBSD.
|
|||
{
|
||||
return entry->d_type != DT_DIR;
|
||||
}
|
||||
@@ -191,7 +198,11 @@ FcDirChecksum (const FcChar8 *dir, time_
|
||||
@@ -189,7 +196,11 @@ FcDirChecksum (const FcChar8 *dir, time_
|
||||
#else
|
||||
NULL,
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue