diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-10-01 02:55:13 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-10-01 02:55:13 +0800 |
commit | 81e24aa1e33f54d267767f322d90cfea08fd4535 (patch) | |
tree | 95468ed31d0d096d59529b5d9cd0f9e37ceb2bb6 | |
parent | 0e63d8a0e227ed7fa4b75187d1f4bd42695c4aab (diff) | |
download | marcuscom-ports-81e24aa1e33f54d267767f322d90cfea08fd4535.tar.gz marcuscom-ports-81e24aa1e33f54d267767f322d90cfea08fd4535.tar.zst marcuscom-ports-81e24aa1e33f54d267767f322d90cfea08fd4535.zip |
Fontconfig was merged into ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18763 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | x11-fonts/fontconfig/Makefile | 76 | ||||
-rw-r--r-- | x11-fonts/fontconfig/distinfo | 2 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/fc-cache.1 | 75 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/fc-cat.1 | 44 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/fc-list.1 | 61 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/fc-match.1 | 51 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/fc-query.1 | 57 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/fc-scan.1 | 52 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/patch-Makefile.in | 31 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/patch-src_fcfreetype.c | 65 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/patch-src_fcxml.c | 48 | ||||
-rw-r--r-- | x11-fonts/fontconfig/files/pkg-install.in | 10 | ||||
-rw-r--r-- | x11-fonts/fontconfig/pkg-descr | 16 | ||||
-rw-r--r-- | x11-fonts/fontconfig/pkg-plist | 70 |
14 files changed, 0 insertions, 658 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile deleted file mode 100644 index 6f0b95237..000000000 --- a/x11-fonts/fontconfig/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD: head/x11-fonts/fontconfig/Makefile 327781 2013-09-20 23:51:14Z bapt $ -# $MCom$ - -PORTNAME= fontconfig -PORTVERSION= 2.10.95 -PORTREVISION?= 0 -PORTEPOCH?= 1 -CATEGORIES= x11-fonts -MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/ - -MAINTAINER= gnome@FreeBSD.org -COMMENT= XML-based font configuration API for X Windows - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libexpat.so:${PORTSDIR}/textproc/expat2 - -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool -USES= gmake pathfix pkgconfig -USE_GNOME= ltverhack -CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \ - --with-templatedir=${PREFIX}/etc/fonts/conf.avail \ - --with-xmldir=${PREFIX}/etc/fonts \ - --with-expat-includes=${LOCALBASE}/include \ - --with-expat-lib=${LOCALBASE}/lib \ - --with-default-fonts=${PREFIX}/share/fonts \ - --with-add-fonts=${LOCALBASE}/lib/X11/fonts \ - --with-cache-dir=/var/db/fontconfig \ - --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ - --disable-docs -MAKE_ENV= LC_ALL=C -PKGINSTALL= ${WRKDIR}/pkg-install - -MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1 -MAN5= fonts-conf.5 -PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt - -NO_STAGE= yes -.include <bsd.port.options.mk> - -# work around fc-cache crash on arm platform -.if ${ARCH} == arm || ${ARCH} == armv6 -USE_GCC= any -.endif - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} -.endif - ${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5 -.for manpage in ${MAN1} - ${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1 -.endfor - if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \ - ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \ - ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ - else \ - ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ - fi - @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ - s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \ - > ${PKGINSTALL} -.if !defined(PACKAGE_BUILDING) - -@${LDCONFIG} -m ${PREFIX}/lib - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - -.include <bsd.port.mk> - -.endif diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo deleted file mode 100644 index b98b2960a..000000000 --- a/x11-fonts/fontconfig/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (fontconfig-2.10.95.tar.bz2) = abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b -SIZE (fontconfig-2.10.95.tar.bz2) = 1529849 diff --git a/x11-fonts/fontconfig/files/fc-cache.1 b/x11-fonts/fontconfig/files/fc-cache.1 deleted file mode 100644 index 3d77bd59c..000000000 --- a/x11-fonts/fontconfig/files/fc-cache.1 +++ /dev/null @@ -1,75 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-CACHE" "1" "05 May 2008" "" "" - -.SH NAME -fc-cache \- build font information cache files -.SH SYNOPSIS - -\fBfc-cache\fR [ \fB-fsvV?\fR ] [ \fB--force\fR ] [ \fB--system-only\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBfc-cache\fR scans the font directories on -the system and builds font information cache files for -applications using fontconfig for their font handling. -.PP -If directory arguments are not given, -\fBfc-cache\fR uses each directory in the -current font configuration. Each directory is scanned for -font files readable by FreeType. A cache is created which -contains properties of each font and the associated filename. -This cache is used to speed up application startup when using -the fontconfig library. -.PP -Note that \fBfc-cache\fR must be executed -once per architecture to generate font information customized -for that architecture. On a subsequent run, -\fBfc-cache\fR will augment the cache -information files with the information for the new -architecture. -.SH "OPTIONS" -.PP -This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of -options is included below. -.TP -\fB-f --force \fR -Force re-generation of apparently up-to-date cache files, -overriding the timestamp checking. -.TP -\fB-s --system-only \fR -Only scan system-wide directories, omitting the places -located in the user's home directory. -.TP -\fB-v --verbose \fR -Display status information while busy. -.TP -\fB-? --help \fR -Show summary of options. -.TP -\fB-V --version \fR -Show version of the program and exit. -.TP -\fB\fIdirs\fB \fR -A list of directories to scan for fonts. -.SH "FILES" -.TP -\fB\fIfonts.cache-2\fB\fR -These files are generated by \fBfc-cache\fR -and contain maps from file names to font properties. They are -read by the fontconfig library at application startup to locate -appropriate fonts. -.SH "SEE ALSO" -.PP -\fBfc-list\fR (1). -.PP -The fontconfig user's guide, in HTML format: -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. -.SH "AUTHOR" -.PP -This manual page was written by Keith Packard -<keithp@keithp.com> and Josselin Mouette <joss@debian.org>\&. diff --git a/x11-fonts/fontconfig/files/fc-cat.1 b/x11-fonts/fontconfig/files/fc-cat.1 deleted file mode 100644 index b025d7c5e..000000000 --- a/x11-fonts/fontconfig/files/fc-cat.1 +++ /dev/null @@ -1,44 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-CAT" "1" "05 May 2008" "" "" - -.SH NAME -fc-cat \- read font information cache files -.SH SYNOPSIS - -\fBfc-cat\fR [ \fB-rvV?\fR ] [ \fB--recurse\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfonts-cache-2-files\fB\fR ] [ \fB\fIdirs\fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBfc-cat\fR reads the font information from -cache files or related to font directories -and emits it in ASCII form. -.SH "OPTIONS" -.PP -This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of -options is included below. -.TP -\fB-r --recurse \fR -Recurse into subdirectories. -.TP -\fB-v --verbose \fR -Be verbose. -.TP -\fB-? --help \fR -Show summary of options. -.TP -\fB-V --version \fR -Show version of the program and exit. -.SH "SEE ALSO" -.PP -\fBfc-cache\fR (1). -.PP -The fontconfig user's guide, in HTML format: -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. -.SH "AUTHOR" -.PP -This manual page was written by Patrick Lam <plam@mit.edu>\&. diff --git a/x11-fonts/fontconfig/files/fc-list.1 b/x11-fonts/fontconfig/files/fc-list.1 deleted file mode 100644 index 6a0145db1..000000000 --- a/x11-fonts/fontconfig/files/fc-list.1 +++ /dev/null @@ -1,61 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-LIST" "1" "05 May 2008" "" "" - -.SH NAME -fc-list \- list available fonts -.SH SYNOPSIS - -\fBfc-list\fR [ \fB-vV?\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIpattern\fB\fR ] [ \fB\fIelement\fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBfc-list\fR lists fonts and styles -available on the system for applications using fontconfig. -.SH "OPTIONS" -.PP -This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of -options is included below. -.TP -\fB-v --verbose \fR -Display status information while busy. -.TP -\fB-? --help \fR -Show summary of options. -.TP -\fB-V --version \fR -Show version of the program and exit. -.TP -\fB\fIpattern\fB \fR -If this argument is set, only fonts matching -\fIpattern\fR are displayed. -.TP -\fB\fIelement\fB \fR -If set, the \fIelement\fR property -is displayed for matching fonts. -.SH "EXAMPLES" -.TP -\fBfc-list\fR -Lists all font faces. -.TP -\fBfc-list :lang=hi\fR -Lists font faces that cover Hindi. -.TP -\fBfc-list : family style file spacing \fR -Lists the filename and spacing value for each font -face. ``:'' is an empty pattern that matches all -fonts. -.SH "SEE ALSO" -.PP -\fBfc-cache\fR (1). -.PP -The fontconfig user's guide, in HTML format: -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. -.SH "AUTHOR" -.PP -This manual page was written by Keith Packard -<keithp@keithp.com> and Josselin Mouette <joss@debian.org>\&. diff --git a/x11-fonts/fontconfig/files/fc-match.1 b/x11-fonts/fontconfig/files/fc-match.1 deleted file mode 100644 index 06f7aa3cb..000000000 --- a/x11-fonts/fontconfig/files/fc-match.1 +++ /dev/null @@ -1,51 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-MATCH" "1" "05 May 2008" "" "" - -.SH NAME -fc-match \- match available fonts -.SH SYNOPSIS - -\fBfc-match\fR [ \fB-svV?\fR ] [ \fB--sort\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfont-pattern\fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBfc-match\fR matches font-pattern (empty -pattern by default) using the normal fontconfig matching rules to find -the best font available. If --sort is given, the sorted list of best -matching fonts is displayed. With --verbose, the whole font pattern -for each match is printed, otherwise only the file, family and style -are printed.. -.SH "OPTIONS" -.PP -This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of -options is included below. -.TP -\fB-v --verbose \fR -Print whole font pattern for each match. -.TP -\fB-? --help \fR -Show summary of options. -.TP -\fB-V --version \fR -Show version of the program and exit. -.TP -\fB-s --sort \fR -Displays sorted list of best matching fonts. -.TP -\fB\fIfont-pattern\fB \fR -Displays fonts matching -\fIfont-pattern\fR (uses empty pattern by default). -.SH "SEE ALSO" -.PP -\fBfc-list\fR (1). -.PP -The fontconfig user's guide, in HTML format: -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. -.SH "AUTHOR" -.PP -This manual page was updated by Patrick Lam <plam@csail.mit.edu>\&. diff --git a/x11-fonts/fontconfig/files/fc-query.1 b/x11-fonts/fontconfig/files/fc-query.1 deleted file mode 100644 index e36622a5b..000000000 --- a/x11-fonts/fontconfig/files/fc-query.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\\" auto-generated by docbook2man-spec $Revision: 1.5 $ -.TH "FC-QUERY" "1" "Aug 13, 2008" "" "" -.SH NAME -fc-query \- query font files -.SH SYNOPSIS -.sp -\fBfc-query\fR [ \fB-Vh\fR ] - - [ \fB [ -i \fIindex\fB ] [ --index \fIindex\fB ] \fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfont-file\fB\fR\fI...\fR -.SH "DESCRIPTION" -.PP -\fBfc-query\fR queries -\fIfont-file\fR(s) using the normal fontconfig -rules and prints out font pattern for each face found. -If \fB--index\fR is given, only one face of each file is -queried, otherwise all faces are queried. -.SH "OPTIONS" -.PP -This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of -options is included below. -.TP -\fB-i\fR -Only query face indexed \fIindex\fR of -each file. -.TP -\fB-f\fR -Format output according to the format specifier -\fIformat\fR. -.TP -\fB-V\fR -Show version of the program and exit. -.TP -\fB-h\fR -Show summary of options. -.TP -\fB\fIfont-file\fB\fR -Query \fIfont-file\fR for font faces. -.SH "RETURN CODES" -.PP -\fBfc-query\fR returns error code 0 for successful parsing, -or 1 if any errors occured or if at least one font face could not be opened. -.SH "SEE ALSO" -.PP -\fBfc-scan\fR(1) -\fBFcFreeTypeQuery\fR(3) -\fBFcPatternFormat\fR(3) -\fBfc-cat\fR(1) -\fBfc-cache\fR(1) -\fBfc-list\fR(1) -\fBfc-match\fR(1) -.PP -The fontconfig user's guide, in HTML format: -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR. -.SH "AUTHOR" -.PP -This manual page was updated by Behdad Esfahbod <behdad@behdad.org>. diff --git a/x11-fonts/fontconfig/files/fc-scan.1 b/x11-fonts/fontconfig/files/fc-scan.1 deleted file mode 100644 index c2bd1ed54..000000000 --- a/x11-fonts/fontconfig/files/fc-scan.1 +++ /dev/null @@ -1,52 +0,0 @@ -.\\" auto-generated by docbook2man-spec $Revision: 1.5 $ -.TH "FC-SCAN" "1" "Jan 15, 2009" "" "" -.SH NAME -fc-scan \- scan font files or directories -.SH SYNOPSIS -.sp -\fBfc-scan\fR [ \fB-Vh\fR ] - - [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfile\fB\fR\fI...\fR -.SH "DESCRIPTION" -.PP -\fBfc-scan\fR scans -\fIfile\fR(s) recursively -and prints out font pattern for each face found. -.SH "OPTIONS" -.PP -This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of -options is included below. -.TP -\fB-f\fR -Format output according to the format specifier -\fIformat\fR. -.TP -\fB-V\fR -Show version of the program and exit. -.TP -\fB-h\fR -Show summary of options. -.TP -\fB\fIfile\fB\fR -Scan \fIfile\fR recursively for font faces. -.SH "RETURN CODES" -.PP -\fBfc-scan\fR returns error code 0 if at least one font -was found or 1 otherwise. -.SH "SEE ALSO" -.PP -\fBfc-query\fR(1) -\fBFcFileScan\fR(3) -\fBFcDirScan\fR(3) -\fBFcPatternFormat\fR(3) -\fBfc-cat\fR(1) -\fBfc-cache\fR(1) -\fBfc-list\fR(1) -\fBfc-match\fR(1) -.PP -The fontconfig user's guide, in HTML format: -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR. -.SH "AUTHOR" -.PP -This manual page was updated by Behdad Esfahbod <behdad@behdad.org>. diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in deleted file mode 100644 index 8c8b6784e..000000000 --- a/x11-fonts/fontconfig/files/patch-Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.in.orig 2012-11-01 10:55:40.000000000 +0000 -+++ Makefile.in 2012-11-01 10:56:37.000000000 +0000 -@@ -932,28 +932,6 @@ - mv $@.tmp $@ - - install-data-local: fonts.conf -- $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir) -- if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \ -- echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ -- mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \ -- fi -- if [ -f $(srcdir)/fonts.conf ]; then \ -- echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ -- $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \ -- else if [ -f fonts.conf ]; then \ -- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ -- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \ -- fi; fi -- @(if $(RUN_FC_CACHE_TEST); then \ -- echo "fc-cache$(EXEEXT) -s -f -v"; \ -- fc-cache/fc-cache$(EXEEXT) -s -f -v; \ -- else \ -- echo "***"; \ -- echo "*** Warning: fonts.cache not built"; \ -- echo "***"; \ -- echo "*** Generate this file manually on host system using fc-cache"; \ -- echo "***"; \ -- fi) - - uninstall-local: - if [ -f $(srcdir)/fonts.conf ]; then \ diff --git a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c b/x11-fonts/fontconfig/files/patch-src_fcfreetype.c deleted file mode 100644 index bf22c090f..000000000 --- a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c +++ /dev/null @@ -1,65 +0,0 @@ -From a61e145304da86c8c35b137493bbd8fd5dd1e7f5 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Mon, 09 Sep 2013 10:59:31 +0000 -Subject: Fix memory leaks in FcFreeTypeQueryFace - ---- -diff --git a/src/fcfreetype.c b/src/fcfreetype.c -index 02e85cb..e394307 100644 ---- src/fcfreetype.c -+++ src/fcfreetype.c -@@ -1105,7 +1105,6 @@ FcFreeTypeQueryFace (const FT_Face face, - const char *tmp; - - FcChar8 *hashstr = NULL; -- char *fontdata = NULL; - FT_Error err; - FT_ULong len = 0, alen; - -@@ -1668,15 +1667,21 @@ FcFreeTypeQueryFace (const FT_Face face, - err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); - if (err == FT_Err_Ok) - { -+ char *fontdata; -+ - alen = (len + 63) & ~63; - fontdata = malloc (alen); - if (!fontdata) - goto bail3; - err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); - if (err != FT_Err_Ok) -+ { -+ free (fontdata); - goto bail3; -+ } - memset (&fontdata[len], 0, alen - len); - hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); -+ free (fontdata); - } - else if (err == FT_Err_Invalid_Face_Handle) - { -@@ -1692,7 +1697,11 @@ FcFreeTypeQueryFace (const FT_Face face, - if (hashstr) - { - if (!FcPatternAddString (pat, FC_HASH, hashstr)) -+ { -+ free (hashstr); - goto bail1; -+ } -+ free (hashstr); - } - bail3: - -@@ -1783,10 +1792,6 @@ bail3: - bail2: - FcCharSetDestroy (cs); - bail1: -- if (hashstr) -- free (hashstr); -- if (fontdata) -- free (fontdata); - FcPatternDestroy (pat); - bail0: - return NULL; --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-fonts/fontconfig/files/patch-src_fcxml.c b/x11-fonts/fontconfig/files/patch-src_fcxml.c deleted file mode 100644 index f67fe3ac3..000000000 --- a/x11-fonts/fontconfig/files/patch-src_fcxml.c +++ /dev/null @@ -1,48 +0,0 @@ -From 3e5f70a16ac6d54f1e01c92ddaa5985deec1b7f9 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Mon, 02 Sep 2013 11:51:46 +0000 -Subject: Do not create a config dir for migration when no config files nor dirs - ---- -diff --git a/src/fcxml.c b/src/fcxml.c -index b464b4e..8ff10b6 100644 ---- src/fcxml.c -+++ src/fcxml.c -@@ -2233,11 +2233,6 @@ FcParseInclude (FcConfigParse *parse) - /* No config dir nor file on the XDG directory spec compliant place - * so need to guess what it is supposed to be. - */ -- FcChar8 *parent = FcStrDirname (s); -- -- if (!FcFileIsDir (parent)) -- FcMakeDirectory (parent); -- FcStrFree (parent); - if (FcStrStr (s, (const FcChar8 *)"conf.d") != NULL) - goto userdir; - else -@@ -2259,6 +2254,11 @@ FcParseInclude (FcConfigParse *parse) - { - if (FcFileIsDir (filename)) - { -+ FcChar8 *parent = FcStrDirname (userdir); -+ -+ if (!FcFileIsDir (parent)) -+ FcMakeDirectory (parent); -+ FcStrFree (parent); - if (FcFileIsDir (userdir) || - rename ((const char *)filename, (const char *)userdir) != 0 || - symlink ((const char *)userdir, (const char *)filename) != 0) -@@ -2272,6 +2272,11 @@ FcParseInclude (FcConfigParse *parse) - } - else - { -+ FcChar8 *parent = FcStrDirname (userconf); -+ -+ if (!FcFileIsDir (parent)) -+ FcMakeDirectory (parent); -+ FcStrFree (parent); - if (FcFileIsFile (userconf) || - rename ((const char *)filename, (const char *)userconf) != 0 || - symlink ((const char *)userconf, (const char *)filename) != 0) --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-fonts/fontconfig/files/pkg-install.in b/x11-fonts/fontconfig/files/pkg-install.in deleted file mode 100644 index e82abb41d..000000000 --- a/x11-fonts/fontconfig/files/pkg-install.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin -export PATH - -if [ "$2" = "POST-INSTALL" ]; then - echo "Running fc-cache to build fontconfig cache..." - fc-cache -f -v - exit 0 -fi diff --git a/x11-fonts/fontconfig/pkg-descr b/x11-fonts/fontconfig/pkg-descr deleted file mode 100644 index 33793ec4c..000000000 --- a/x11-fonts/fontconfig/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Fontconfig does the following: - - * discover new fonts when installed automatically, removing a common source - of configuration problems. - * perform font name substitution, so that appropriate alternative fonts can - be selected if fonts are missing. - * identify the set of fonts required to completely cover a set of languages. - * have GUI configuration tools built as it uses an XML-based configuration - file (though with autodiscovery, we believe this need is minimized). - * efficiently and quickly find the fonts you need among the set of fonts - you have installed, even if you have installed thousands of fonts, while - minimzing memory usage. - * be used in concert with the X Render Extension and FreeType to implement - high quality, anti-aliased and subpixel rendered text on a display. - -WWW: http://www.freedesktop.org/wiki/Software/fontconfig diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist deleted file mode 100644 index 91ad7018d..000000000 --- a/x11-fonts/fontconfig/pkg-plist +++ /dev/null @@ -1,70 +0,0 @@ -bin/fc-cache -bin/fc-cat -bin/fc-list -bin/fc-match -bin/fc-pattern -bin/fc-query -bin/fc-scan -bin/fc-validate -etc/fonts/conf.avail/10-autohint.conf -etc/fonts/conf.avail/10-no-sub-pixel.conf -etc/fonts/conf.avail/10-scale-bitmap-fonts.conf -etc/fonts/conf.avail/10-sub-pixel-bgr.conf -etc/fonts/conf.avail/10-sub-pixel-rgb.conf -etc/fonts/conf.avail/10-sub-pixel-vbgr.conf -etc/fonts/conf.avail/10-sub-pixel-vrgb.conf -etc/fonts/conf.avail/10-unhinted.conf -etc/fonts/conf.avail/11-lcdfilter-default.conf -etc/fonts/conf.avail/11-lcdfilter-legacy.conf -etc/fonts/conf.avail/11-lcdfilter-light.conf -etc/fonts/conf.avail/20-unhint-small-vera.conf -etc/fonts/conf.avail/25-unhint-nonlatin.conf -etc/fonts/conf.avail/30-metric-aliases.conf -etc/fonts/conf.avail/30-urw-aliases.conf -etc/fonts/conf.avail/40-nonlatin.conf -etc/fonts/conf.avail/45-latin.conf -etc/fonts/conf.avail/49-sansserif.conf -etc/fonts/conf.avail/50-user.conf -etc/fonts/conf.avail/51-local.conf -etc/fonts/conf.avail/60-latin.conf -etc/fonts/conf.avail/65-fonts-persian.conf -etc/fonts/conf.avail/65-khmer.conf -etc/fonts/conf.avail/65-nonlatin.conf -etc/fonts/conf.avail/69-unifont.conf -etc/fonts/conf.avail/70-no-bitmaps.conf -etc/fonts/conf.avail/70-yes-bitmaps.conf -etc/fonts/conf.avail/80-delicious.conf -etc/fonts/conf.avail/90-synthetic.conf -etc/fonts/conf.d/10-scale-bitmap-fonts.conf -etc/fonts/conf.d/20-unhint-small-vera.conf -etc/fonts/conf.d/30-metric-aliases.conf -etc/fonts/conf.d/30-urw-aliases.conf -etc/fonts/conf.d/40-nonlatin.conf -etc/fonts/conf.d/45-latin.conf -etc/fonts/conf.d/49-sansserif.conf -etc/fonts/conf.d/50-user.conf -etc/fonts/conf.d/51-local.conf -etc/fonts/conf.d/60-latin.conf -etc/fonts/conf.d/65-fonts-persian.conf -etc/fonts/conf.d/65-nonlatin.conf -etc/fonts/conf.d/69-unifont.conf -etc/fonts/conf.d/80-delicious.conf -etc/fonts/conf.d/90-synthetic.conf -etc/fonts/conf.d/README -@unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi -etc/fonts/fonts.conf.default -@exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf -etc/fonts/fonts.dtd -include/fontconfig/fcfreetype.h -include/fontconfig/fcprivate.h -include/fontconfig/fontconfig.h -lib/libfontconfig.a -lib/libfontconfig.la -lib/libfontconfig.so -lib/libfontconfig.so.1 -libdata/pkgconfig/fontconfig.pc -@dirrm include/fontconfig -@dirrmtry etc/fonts/conf.d -@dirrmtry etc/fonts/conf.avail -@dirrmtry etc/fonts -@unexec rm -rf /var/db/fontconfig 2>/dev/null || true |