[Midnightbsd-cvs] mports [15942] trunk/x11-fonts/fontconfig: update fontconfig to 2.11
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Feb 28 18:11:36 EST 2014
Revision: 15942
http://svnweb.midnightbsd.org/mports/?rev=15942
Author: laffer1
Date: 2014-02-28 18:11:35 -0500 (Fri, 28 Feb 2014)
Log Message:
-----------
update fontconfig to 2.11
Modified Paths:
--------------
trunk/x11-fonts/fontconfig/Makefile
trunk/x11-fonts/fontconfig/distinfo
Added Paths:
-----------
trunk/x11-fonts/fontconfig/files/patch-configure
Removed Paths:
-------------
trunk/x11-fonts/fontconfig/files/patch-src_fcfreetype.c
trunk/x11-fonts/fontconfig/files/patch-src_fcxml.c
Modified: trunk/x11-fonts/fontconfig/Makefile
===================================================================
--- trunk/x11-fonts/fontconfig/Makefile 2014-02-28 13:04:52 UTC (rev 15941)
+++ trunk/x11-fonts/fontconfig/Makefile 2014-02-28 23:11:35 UTC (rev 15942)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= fontconfig
-PORTVERSION= 2.10.95
+PORTVERSION= 2.11.0
PORTEPOCH?= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/
Modified: trunk/x11-fonts/fontconfig/distinfo
===================================================================
--- trunk/x11-fonts/fontconfig/distinfo 2014-02-28 13:04:52 UTC (rev 15941)
+++ trunk/x11-fonts/fontconfig/distinfo 2014-02-28 23:11:35 UTC (rev 15942)
@@ -1,2 +1,2 @@
-SHA256 (fontconfig-2.10.95.tar.bz2) = abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b
-SIZE (fontconfig-2.10.95.tar.bz2) = 1529849
+SHA256 (fontconfig-2.11.0.tar.bz2) = cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467
+SIZE (fontconfig-2.11.0.tar.bz2) = 1541382
Added: trunk/x11-fonts/fontconfig/files/patch-configure
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-configure (rev 0)
+++ trunk/x11-fonts/fontconfig/files/patch-configure 2014-02-28 23:11:35 UTC (rev 15942)
@@ -0,0 +1,10 @@
+--- configure.orig 2013-12-27 19:47:10.000000000 +0100
++++ configure 2013-12-27 19:47:24.000000000 +0100
+@@ -654,6 +654,7 @@
+ XMLDIR
+ CONFIGDIR
+ BASECONFIGDIR
++baseconfigdir
+ TEMPLATEDIR
+ FC_FONTDATE
+ FC_CACHEDIR
Deleted: trunk/x11-fonts/fontconfig/files/patch-src_fcfreetype.c
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-src_fcfreetype.c 2014-02-28 13:04:52 UTC (rev 15941)
+++ trunk/x11-fonts/fontconfig/files/patch-src_fcfreetype.c 2014-02-28 23:11:35 UTC (rev 15942)
@@ -1,65 +0,0 @@
-From a61e145304da86c8c35b137493bbd8fd5dd1e7f5 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at 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
Deleted: trunk/x11-fonts/fontconfig/files/patch-src_fcxml.c
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-src_fcxml.c 2014-02-28 13:04:52 UTC (rev 15941)
+++ trunk/x11-fonts/fontconfig/files/patch-src_fcxml.c 2014-02-28 23:11:35 UTC (rev 15942)
@@ -1,48 +0,0 @@
-From 3e5f70a16ac6d54f1e01c92ddaa5985deec1b7f9 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at 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
More information about the Midnightbsd-cvs
mailing list