[118571] trunk/dports/graphics/fontconfig
ryandesign at macports.org
ryandesign at macports.org
Fri Apr 4 17:24:35 PDT 2014
Revision: 118571
https://trac.macports.org/changeset/118571
Author: ryandesign at macports.org
Date: 2014-04-04 17:24:35 -0700 (Fri, 04 Apr 2014)
Log Message:
-----------
fontconfig: update to 2.11.1
Modified Paths:
--------------
trunk/dports/graphics/fontconfig/Portfile
Removed Paths:
-------------
trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch
Modified: trunk/dports/graphics/fontconfig/Portfile
===================================================================
--- trunk/dports/graphics/fontconfig/Portfile 2014-04-04 23:51:15 UTC (rev 118570)
+++ trunk/dports/graphics/fontconfig/Portfile 2014-04-05 00:24:35 UTC (rev 118571)
@@ -5,8 +5,7 @@
PortGroup muniversal 1.0
name fontconfig
-version 2.11.0
-revision 2
+version 2.11.1
categories graphics
maintainers ryandesign
license fontconfig
@@ -22,8 +21,8 @@
master_sites http://www.freedesktop.org/software/fontconfig/release/
use_bzip2 yes
-checksums rmd160 a77063d43caecc6090e6b942ae4fca08a2f1f62c \
- sha256 cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467
+checksums rmd160 9d0a242ec05737f5dba3949ffe095f3c100217c7 \
+ sha256 dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
depends_build port:pkgconfig
@@ -39,9 +38,15 @@
lappend add_fonts ${prefix}/share/fonts
set docdir ${prefix}/share/doc/${name}
-patchfiles patch-docbook-4.2.diff \
- 0001-Revert-Workaround-the-race-condition-issue-on-updati.patch
+patchfiles patch-docbook-4.2.diff
+# *** No scandir function available.
+# https://bugs.freedesktop.org/show_bug.cgi?id=77034
+# Can be removed when ccache 3.2 is released with proper clang compatibility
+if {[string match *clang* ${configure.compiler}]} {
+ configure.ccache no
+}
+
configure.args --disable-silent-rules HASDOCBOOK=no
# We put this into a pre-configure block so it can be evaluated _after_ platform selection.
Deleted: trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch
===================================================================
--- trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch 2014-04-04 23:51:15 UTC (rev 118570)
+++ trunk/dports/graphics/fontconfig/files/0001-Revert-Workaround-the-race-condition-issue-on-updati.patch 2014-04-05 00:24:35 UTC (rev 118571)
@@ -1,162 +0,0 @@
-From e6f5880b2bb97e286e9609869384a57d5b3756ff Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Mon, 4 Nov 2013 15:28:07 -0800
-Subject: [PATCH] Revert "Workaround the race condition issue on updating
- cache"
-
-Fix 90 second start time regression in XQuartz
-
-This reverts commit 0203055520206028eecee5d261887cdc91500e15.
----
- fc-cache/fc-cache.c | 62 +++++++++++++++++++++----------------------------
- fontconfig/fontconfig.h | 3 ---
- src/fcstr.c | 6 -----
- 3 files changed, 26 insertions(+), 45 deletions(-)
-
-diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
-index af7ba6d..aeb0af2 100644
---- fc-cache/fc-cache.c
-+++ fc-cache/fc-cache.c
-@@ -118,7 +118,7 @@ usage (char *program, int error)
- static FcStrSet *processed_dirs;
-
- static int
--scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed)
-+scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, int *changed)
- {
- int ret = 0;
- const FcChar8 *dir;
-@@ -141,7 +141,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
- fflush (stdout);
- }
-
-- if (recursive && FcStrSetMember (processed_dirs, dir))
-+ if (FcStrSetMember (processed_dirs, dir))
- {
- if (verbose)
- printf ("skipping, looped directory detected\n");
-@@ -213,37 +213,32 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
- ret++;
- }
- }
--
-- if (recursive)
-- {
-- subdirs = FcStrSetCreate ();
-- if (!subdirs)
-- {
-- fprintf (stderr, "%s: Can't create subdir set\n", dir);
-- ret++;
-- FcDirCacheUnload (cache);
-- continue;
-- }
-- for (i = 0; i < FcCacheNumSubdir (cache); i++)
-- FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
-
-+ subdirs = FcStrSetCreate ();
-+ if (!subdirs)
-+ {
-+ fprintf (stderr, "%s: Can't create subdir set\n", dir);
-+ ret++;
- FcDirCacheUnload (cache);
-+ continue;
-+ }
-+ for (i = 0; i < FcCacheNumSubdir (cache); i++)
-+ FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
-
-- sublist = FcStrListCreate (subdirs);
-- FcStrSetDestroy (subdirs);
-- if (!sublist)
-- {
-- fprintf (stderr, "%s: Can't create subdir list\n", dir);
-- ret++;
-- continue;
-- }
-- FcStrSetAdd (processed_dirs, dir);
-- ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed);
-- FcStrListDone (sublist);
-+ FcDirCacheUnload (cache);
-+
-+ sublist = FcStrListCreate (subdirs);
-+ FcStrSetDestroy (subdirs);
-+ if (!sublist)
-+ {
-+ fprintf (stderr, "%s: Can't create subdir list\n", dir);
-+ ret++;
-+ continue;
- }
-- else
-- FcDirCacheUnload (cache);
-+ FcStrSetAdd (processed_dirs, dir);
-+ ret += scanDirs (sublist, config, force, really_force, verbose, changed);
- }
-+ FcStrListDone (list);
- return ret;
- }
-
-@@ -371,11 +366,7 @@ main (int argc, char **argv)
- }
-
- changed = 0;
-- ret = scanDirs (list, config, force, really_force, verbose, FcTrue, &changed);
-- /* Update the directory cache again to avoid the race condition as much as possible */
-- FcStrListFirst (list);
-- ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed);
-- FcStrListDone (list);
-+ ret = scanDirs (list, config, force, really_force, verbose, &changed);
-
- /*
- * Try to create CACHEDIR.TAG anyway.
-@@ -388,8 +379,6 @@ main (int argc, char **argv)
-
- cleanCacheDirectories (config, verbose);
-
-- FcConfigDestroy (config);
-- FcFini ();
- /*
- * Now we need to sleep a second (or two, to be extra sure), to make
- * sure that timestamps for changes after this run of fc-cache are later
-@@ -397,7 +386,8 @@ main (int argc, char **argv)
- * sleep(3) can't be interrupted by a signal here -- this isn't in the
- * library, and there aren't any signals flying around here.
- */
-- /* the resolution of mtime on FAT is 2 seconds */
-+ FcConfigDestroy (config);
-+ FcFini ();
- if (changed)
- sleep (2);
- if (verbose)
-diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
-index dfc48f9..e2c32fe 100644
---- fontconfig/fontconfig.h
-+++ fontconfig/fontconfig.h
-@@ -974,9 +974,6 @@ FcStrSetDestroy (FcStrSet *set);
- FcPublic FcStrList *
- FcStrListCreate (FcStrSet *set);
-
--FcPublic void
--FcStrListFirst (FcStrList *list);
--
- FcPublic FcChar8 *
- FcStrListNext (FcStrList *list);
-
-diff --git a/src/fcstr.c b/src/fcstr.c
-index 5707172..3a32031 100644
---- src/fcstr.c
-+++ src/fcstr.c
-@@ -1374,12 +1374,6 @@ FcStrListCreate (FcStrSet *set)
- return list;
- }
-
--void
--FcStrListFirst (FcStrList *list)
--{
-- list->n = 0;
--}
--
- FcChar8 *
- FcStrListNext (FcStrList *list)
- {
---
-1.8.4.1
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140404/95bc25fc/attachment.html>
More information about the macports-changes
mailing list