commit 669b634bdb85585a2372703a3b9c5e813543f3b7 Author: CentOS Sources Date: Tue Nov 2 11:59:17 2021 -0400 import fontconfig-2.13.93-8.el9 diff --git a/.fontconfig.metadata b/.fontconfig.metadata new file mode 100644 index 0000000..eec2747 --- /dev/null +++ b/.fontconfig.metadata @@ -0,0 +1 @@ +484645daa95612521344bd88f8a4862c843d2549 SOURCES/fontconfig-2.13.93.tar.xz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..610450c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/fontconfig-2.13.93.tar.xz diff --git a/SOURCES/25-no-bitmap-fedora.conf b/SOURCES/25-no-bitmap-fedora.conf new file mode 100644 index 0000000..ffa7926 --- /dev/null +++ b/SOURCES/25-no-bitmap-fedora.conf @@ -0,0 +1,44 @@ + + + + + + Kochi Mincho + + + false + + + + + Kochi Gothic + + + false + + + + + Sazanami Mincho + + + false + + + + + Sazanami Gothic + + + false + + + + + AR PL ShanHeiSun Uni + + + true + + + diff --git a/SOURCES/fc-cache b/SOURCES/fc-cache new file mode 100755 index 0000000..8253ae7 --- /dev/null +++ b/SOURCES/fc-cache @@ -0,0 +1,4 @@ +#! /bin/sh + +[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 "$@" || : +[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 "$@" || : diff --git a/SOURCES/fontconfig-disable-network-required-test.patch b/SOURCES/fontconfig-disable-network-required-test.patch new file mode 100644 index 0000000..8481f39 --- /dev/null +++ b/SOURCES/fontconfig-disable-network-required-test.patch @@ -0,0 +1,33 @@ +diff -pruN fontconfig-2.13.93.orig/test/run-test.sh fontconfig-2.13.93/test/run-test.sh +--- fontconfig-2.13.93.orig/test/run-test.sh 2020-11-28 10:56:42.000000000 +0900 ++++ fontconfig-2.13.93/test/run-test.sh 2020-11-28 12:39:57.345644527 +0900 +@@ -421,18 +421,18 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" my- + + fi # if [ "x$EXEEXT" = "x" ] + +-if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then +- dotest "MT-safe global config" +- prep +- curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip +- (cd "$FONTDIR"; unzip noto.zip) +- if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then +- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR" +- fi +- "$BUILDTESTDIR"/test-crbug1004254 +-else ++#if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then ++# dotest "MT-safe global config" ++# prep ++# curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip ++# (cd "$FONTDIR"; unzip noto.zip) ++# if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then ++# touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR" ++# fi ++# "$BUILDTESTDIR"/test-crbug1004254 ++#else + echo "No test-crbug1004254: skipped" +-fi ++#fi + + if [ "x$EXEEXT" = "x" ]; then + diff --git a/SOURCES/fontconfig-drop-lang-from-pkgkit-format.patch b/SOURCES/fontconfig-drop-lang-from-pkgkit-format.patch new file mode 100644 index 0000000..8b77308 --- /dev/null +++ b/SOURCES/fontconfig-drop-lang-from-pkgkit-format.patch @@ -0,0 +1,12 @@ +diff -pruN fontconfig-2.13.92.orig/src/fcformat.c fontconfig-2.13.92/src/fcformat.c +--- fontconfig-2.13.92.orig/src/fcformat.c 2018-07-19 12:14:39.000000000 +0900 ++++ fontconfig-2.13.92/src/fcformat.c 2020-01-20 13:05:33.626227767 +0900 +@@ -78,7 +78,7 @@ + #define FCCAT_FORMAT "\"%{file|basename|cescape}\" %{index} \"%{-file{%{=unparse|cescape}}}\"" + #define FCMATCH_FORMAT "%{file:-|basename}: \"%{family[0]:-}\" \"%{style[0]:-}\"" + #define FCLIST_FORMAT "%{?file{%{file}: }}%{-file{%{=unparse}}}" +-#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" ++#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}" + + + static void diff --git a/SOURCES/fontconfig-hotfix.patch b/SOURCES/fontconfig-hotfix.patch new file mode 100644 index 0000000..e506fde --- /dev/null +++ b/SOURCES/fontconfig-hotfix.patch @@ -0,0 +1,772 @@ +From 93c93689f5da4ceaa675e006df63283e25b91d49 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Fri, 4 Dec 2020 18:18:03 +0900 +Subject: [PATCH 01/12] Add back fullname property at scan matching phase + +There seems to be a lot of config files using fullname property in the world. +To keep the backward compatibility, fullname property is back to a cache at +the scan matching phase but will be rebuilt once it is done according to family +and style property in the pattern no matter what changes one made in fullname +property during that. + +Ref. https://bugzilla.redhat.com/show_bug.cgi?id=1902881 +--- + src/fcfreetype.c | 21 ++++++++++++++++++++- + src/fcopentype.c | 2 ++ + 2 files changed, 22 insertions(+), 1 deletion(-) + +diff --git a/src/fcfreetype.c b/src/fcfreetype.c +index a7809cb..4b545bf 100644 +--- a/src/fcfreetype.c ++++ b/src/fcfreetype.c +@@ -1087,6 +1087,8 @@ static const FT_UShort nameid_order[] = { + TT_NAME_ID_WWS_FAMILY, + TT_NAME_ID_TYPOGRAPHIC_FAMILY, + TT_NAME_ID_FONT_FAMILY, ++ TT_NAME_ID_MAC_FULL_NAME, ++ TT_NAME_ID_FULL_NAME, + TT_NAME_ID_WWS_SUBFAMILY, + TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY, + TT_NAME_ID_FONT_SUBFAMILY, +@@ -1222,6 +1224,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face, + int nfamily_lang = 0; + int nstyle = 0; + int nstyle_lang = 0; ++ int nfullname = 0; ++ int nfullname_lang = 0; + unsigned int p, n; + + FcChar8 *style = 0; +@@ -1443,7 +1447,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face, + * and treat the instance's nameid as FONT_SUBFAMILY. + * Postscript name is automatically handled by FreeType. */ + if (nameid == TT_NAME_ID_WWS_SUBFAMILY || +- nameid == TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY) ++ nameid == TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY || ++ nameid == TT_NAME_ID_FULL_NAME) + continue; + + if (nameid == TT_NAME_ID_FONT_SUBFAMILY) +@@ -1474,6 +1479,20 @@ FcFreeTypeQueryFaceInternal (const FT_Face face, + np = &nfamily; + nlangp = &nfamily_lang; + break; ++ case TT_NAME_ID_MAC_FULL_NAME: ++ case TT_NAME_ID_FULL_NAME: ++ if (variable) ++ break; ++ if (FcDebug () & FC_DBG_SCANV) ++ printf ("found full (n %2d p %d e %d l 0x%04x)", ++ sname.name_id, sname.platform_id, ++ sname.encoding_id, sname.language_id); ++ ++ obj = FC_FULLNAME_OBJECT; ++ objlang = FC_FULLNAMELANG_OBJECT; ++ np = &nfullname; ++ nlangp = &nfullname_lang; ++ break; + case TT_NAME_ID_WWS_SUBFAMILY: + case TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY: + case TT_NAME_ID_FONT_SUBFAMILY: +diff --git a/src/fcopentype.c b/src/fcopentype.c +index 9382a1b..59cce45 100644 +--- a/src/fcopentype.c ++++ b/src/fcopentype.c +@@ -76,12 +76,14 @@ FcPatternAddFullname (FcPattern *pat) + FcStrBufChar (&sbuf, ' '); + FcStrBufString (&sbuf, style); + } ++ FcPatternObjectDel (pat, FC_FULLNAME_OBJECT); + if (!FcPatternObjectAddString (pat, FC_FULLNAME_OBJECT, FcStrBufDoneStatic (&sbuf))) + { + FcStrBufDestroy (&sbuf); + return FcFalse; + } + FcStrBufDestroy (&sbuf); ++ FcPatternObjectDel (pat, FC_FULLNAMELANG_OBJECT); + if (!FcPatternObjectAddString (pat, FC_FULLNAMELANG_OBJECT, (const FcChar8 *) "en")) + return FcFalse; + } +-- +2.29.2 + +From 3d6926380dc3c8597dc2fd9d34087da9b39dfdd9 Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Fri, 4 Dec 2020 15:00:08 -0500 +Subject: [PATCH 02/12] Skip leading whitespace in style name. + +Found by Clang-Tidy. The intent seems to have been to skip all leading +whitespace in the 'style' string, but instead this loop was an odd +looking no-op. Remove the 'break' from the loop so that it will +continue until end of string or a non-space character is found. +--- + src/fcopentype.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/fcopentype.c b/src/fcopentype.c +index 59cce45..39c05e9 100644 +--- a/src/fcopentype.c ++++ b/src/fcopentype.c +@@ -66,8 +66,7 @@ FcPatternAddFullname (FcPattern *pat) + if (FcPatternObjectGetString (pat, FC_STYLE_OBJECT, n, &style) != FcResultMatch) + return FcFalse; + len = strlen ((const char *) style); +- for (i = 0; style[i] != 0 && isspace (style[i]); i++) +- break; ++ for (i = 0; style[i] != 0 && isspace (style[i]); i++); + memcpy (style, &style[i], len - i); + FcStrBufInit (&sbuf, NULL, 0); + FcStrBufString (&sbuf, family); +-- +2.29.2 + +From 97d541855429629f40a0accdd2b06b7dce7ba2db Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Fri, 4 Dec 2020 15:42:28 -0500 +Subject: [PATCH 03/12] Remove abort from FcCompareSize. + +There doesn't appear to be a good reason to abort when 'v1' has type +FcTypeRange. If there does turn out to be a good reason for this then it +should be better documented and the code for handling this case removed. +At worst it seems -1 should be returned as it is for other unknown +types. It is possible this is left over debug code from the initial +implementation. +--- + src/fcmatch.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/fcmatch.c b/src/fcmatch.c +index df6db71..53c3b0e 100644 +--- a/src/fcmatch.c ++++ b/src/fcmatch.c +@@ -235,7 +235,6 @@ FcCompareSize (const FcValue *v1, const FcValue *v2, FcValue *bestValue) + b1 = e1 = value1.u.d; + break; + case FcTypeRange: +- abort(); + b1 = value1.u.r->begin; + e1 = value1.u.r->end; + break; +-- +2.29.2 + +From d55eaa6b3148691f32ec19c5c36dfc8818a6385f Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Fri, 11 Dec 2020 11:54:43 -0500 +Subject: [PATCH 07/12] Fix leaks in fcxml.c, fc-match.c, and tests. + +Fix leaks reported by AddressSanitizer when running 'make check'. +--- + fc-match/fc-match.c | 8 +++++++- + src/fcxml.c | 4 +++- + test/test-bz106632.c | 8 ++++++++ + test/test-issue180.c | 4 +++- + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c +index 4362ec1..f31047e 100644 +--- a/fc-match/fc-match.c ++++ b/fc-match/fc-match.c +@@ -117,6 +117,7 @@ main (int argc, char **argv) + int brief = 0; + int sort = 0, all = 0; + const FcChar8 *format = NULL; ++ const FcChar8 *format_optarg = NULL; + int i; + FcObjectSet *os = 0; + FcFontSet *fs; +@@ -146,7 +147,7 @@ main (int argc, char **argv) + brief = 1; + break; + case 'f': +- format = (FcChar8 *) strdup (optarg); ++ format = format_optarg = (FcChar8 *) strdup (optarg); + break; + case 'V': + fprintf (stderr, "fontconfig version %d.%d.%d\n", +@@ -269,5 +270,10 @@ main (int argc, char **argv) + + FcFini (); + ++ if (format_optarg) { ++ free ((void*)format_optarg); ++ format_optarg = NULL; ++ } ++ + return 0; + } +diff --git a/src/fcxml.c b/src/fcxml.c +index 3f22581..9efe157 100644 +--- a/src/fcxml.c ++++ b/src/fcxml.c +@@ -2307,7 +2307,9 @@ FcParseCacheDir (FcConfigParse *parse) + if (data[0] == 0) + { + FcConfigMessage (parse, FcSevereWarning, "empty cache directory name ignored"); +- return; ++ FcStrFree (data); ++ data = prefix; ++ goto bail; + } + if (prefix) + { +diff --git a/test/test-bz106632.c b/test/test-bz106632.c +index 0f37b9c..c610d73 100644 +--- a/test/test-bz106632.c ++++ b/test/test-bz106632.c +@@ -221,6 +221,7 @@ main (void) + ret = 1; + goto bail; + } ++ FcFontSetDestroy (fs); + fprintf (stderr, "D: Removing %s\n", fontdir); + snprintf (cmd, 512, "sleep 1; rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S); + (void) system (cmd); +@@ -243,6 +244,8 @@ main (void) + ret = 3; + goto bail; + } ++ FcConfigDestroy (config); ++ + config = FcConfigCreate (); + if (!FcConfigParseAndLoadFromMemory (config, (const FcChar8 *) conf, FcTrue)) + { +@@ -266,6 +269,7 @@ main (void) + ret = 1; + goto bail; + } ++ FcFontSetDestroy (fs); + fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir); + snprintf (cmd, 512, "sleep 1; cp -a %s %s; sleep 1", FONTFILE, fontdir); + (void) system (cmd); +@@ -288,6 +292,8 @@ main (void) + ret = 3; + goto bail; + } ++ FcConfigDestroy (config); ++ + config = FcConfigCreate (); + if (!FcConfigParseAndLoadFromMemory (config, (const FcChar8 *) conf, FcTrue)) + { +@@ -311,6 +317,8 @@ main (void) + ret = 1; + goto bail; + } ++ FcFontSetDestroy (fs); ++ FcConfigDestroy (config); + + bail: + fprintf (stderr, "Cleaning up\n"); +diff --git a/test/test-issue180.c b/test/test-issue180.c +index 2832d3b..9d0795e 100644 +--- a/test/test-issue180.c ++++ b/test/test-issue180.c +@@ -53,7 +53,9 @@ main (void) + fprintf (stderr, "There was one or more cachedirs\n"); + return 1; + } ++ FcStrListDone (l); + FcConfigDestroy (cfg); ++ + cfg = FcConfigCreate (); + if (!FcConfigParseAndLoadFromMemory (cfg, doc2, FcTrue)) + { +@@ -66,7 +68,7 @@ main (void) + fprintf (stderr, "There was one or more cachedirs (with prefix)\n"); + return 1; + } +- ++ FcStrListDone (l); + FcConfigDestroy (cfg); + + return 0; +-- +2.29.2 + +From 5cd11d19dfb2d901e1f6b690ae504d3bf5f5ff69 Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Thu, 10 Dec 2020 14:12:05 -0500 +Subject: [PATCH 08/12] Fix wild frees and leak of fs in test-conf. + +Reported by AddressSanitizer when running test-conf. The `query`, +`result`, and `result_fs` were not initialized to NULL so could result +in a wild free when first initialized. + +The `method` was also not initialized to NULL so comparisons could be +made against random data if it had not yet been assigned. + +The outer `fs` was never destroyed, but is also not used, so remove. +--- + test/test-conf.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/test/test-conf.c b/test/test-conf.c +index d4de21a..6097983 100644 +--- a/test/test-conf.c ++++ b/test/test-conf.c +@@ -158,7 +158,6 @@ static FcBool + run_test (FcConfig *config, json_object *root) + { + json_object *tests; +- FcFontSet *fs; + int i, n, fail = 0; + + if (!json_object_object_get_ex (root, "tests", &tests) || +@@ -167,15 +166,15 @@ run_test (FcConfig *config, json_object *root) + fprintf (stderr, "W: No test cases defined\n"); + return FcFalse; + } +- fs = FcFontSetCreate (); + n = json_object_array_length (tests); + for (i = 0; i < n; i++) + { + json_object *obj = json_object_array_get_idx (tests, i); + json_object_iter iter; +- FcPattern *query, *result; +- FcFontSet *result_fs; +- const char *method; ++ FcPattern *query = NULL; ++ FcPattern *result = NULL; ++ FcFontSet *result_fs = NULL; ++ const char *method = NULL; + + if (json_object_get_type (obj) != json_type_object) + continue; +-- +2.29.2 + +From b35c72dbc7da5b61a84766cfa431c95c1d1b35bd Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Tue, 15 Dec 2020 17:39:05 -0500 +Subject: [PATCH 09/12] Always run-test-conf, but skip if not built. + +The test-conf test requires libjson-c to be available in order to be +built. However, there has been no user indication that additional tests +could be built if the json-c development files were available. + +Continue to not build test-conf if json-c is not available, but do run +the test harness. The test harness is updated to SKIP the test if the +test-conf binary is unavailable. +--- + test/Makefile.am | 2 +- + test/run-test-conf.sh | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index 5a998b3..1a9b293 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -101,8 +101,8 @@ if ENABLE_JSONC + check_PROGRAMS += test-conf + test_conf_CFLAGS = $(JSONC_CFLAGS) + test_conf_LDADD = $(top_builddir)/src/libfontconfig.la $(JSONC_LIBS) +-TESTS += run-test-conf.sh + endif ++TESTS += run-test-conf.sh + + check_PROGRAMS += test-bz106618 + test_bz106618_LDADD = $(top_builddir)/src/libfontconfig.la +diff --git a/test/run-test-conf.sh b/test/run-test-conf.sh +index 437bafa..e085e82 100644 +--- a/test/run-test-conf.sh ++++ b/test/run-test-conf.sh +@@ -33,6 +33,12 @@ BUILDTESTDIR=${builddir-"$MyPWD"} + + RUNNER=../test/test-conf$EXEEXT + ++if [ ! -f ${RUNNER} ]; then ++ echo "${RUNNER} not found!\n" ++ echo "Building this test requires libjson-c development files to be available." ++ exit 77 # SKIP ++fi ++ + for i in \ + 60-generic.conf \ + 90-synthetic.conf \ +-- +2.29.2 + +From 921ede9f460fb661146182809557a1da2dd7afd7 Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Tue, 15 Dec 2020 16:30:14 -0500 +Subject: [PATCH 10/12] Fix test-conf string to integer conversion. + +The test-conf build_pattern attempted to convert known constant strings +into integer values. However, it did so by always converting the string +value to an integer if possible and then complaining if the key wasn't +of the expected type. This lead to error messages on "style": "Regular" +since "Regular" was recognized as "weight". + +Instead, only attempt conversion from string to integer if the key is +the name of an object which can take an integer type. This eliminates +the spurious non-fatal errors reported when parsing +test-90-synthetic.json. + +This also fixes an issue where the created value was given the type of +the object found, but the integer field was assigned. Instead, check +that the object type can take an integer and always set the value type +to integer. +--- + test/test-conf.c | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/test/test-conf.c b/test/test-conf.c +index 6097983..288bb5b 100644 +--- a/test/test-conf.c ++++ b/test/test-conf.c +@@ -69,22 +69,25 @@ build_pattern (json_object *obj) + } + else if (json_object_get_type (iter.val) == json_type_string) + { +- const FcConstant *c = FcNameGetConstant ((const FcChar8 *) json_object_get_string (iter.val)); +- FcBool b; +- +- if (c) ++ const FcObjectType *o = FcNameGetObjectType (iter.key); ++ if (o && (o->type == FcTypeRange || o->type == FcTypeDouble || o->type == FcTypeInteger)) + { +- const FcObjectType *o; +- ++ const FcConstant *c = FcNameGetConstant ((const FcChar8 *) json_object_get_string (iter.val)); ++ if (!c) { ++ fprintf (stderr, "E: value is not a known constant\n"); ++ fprintf (stderr, " key: %s\n", iter.key); ++ fprintf (stderr, " val: %s\n", json_object_get_string (iter.val)); ++ continue; ++ } + if (strcmp (c->object, iter.key) != 0) + { +- fprintf (stderr, "E: invalid object type for const\n"); +- fprintf (stderr, " actual result: %s\n", iter.key); +- fprintf (stderr, " expected result: %s\n", c->object); ++ fprintf (stderr, "E: value is a constant of different object\n"); ++ fprintf (stderr, " key: %s\n", iter.key); ++ fprintf (stderr, " val: %s\n", json_object_get_string (iter.val)); ++ fprintf (stderr, " key implied by value: %s\n", c->object); + continue; + } +- o = FcNameGetObjectType (c->object); +- v.type = o->type; ++ v.type = FcTypeInteger; + v.u.i = c->value; + } + else if (strcmp (json_object_get_string (iter.val), "DontCare") == 0) +-- +2.29.2 + +From df29933e1a06b7aa7af229bd7cd03c62d957f15f Mon Sep 17 00:00:00 2001 +From: Szunti +Date: Sun, 6 Dec 2020 12:52:44 +0100 +Subject: [PATCH 11/12] Check qual and compare for family tests + +Fixes #267. Hash table lookups assumed qual="any" compare="eq". +Add a test too. +--- + src/fccfg.c | 16 ++- + test/Makefile.am | 4 + + test/meson.build | 1 + + test/test-family-matching.c | 228 ++++++++++++++++++++++++++++++++++++ + 4 files changed, 248 insertions(+), 1 deletion(-) + create mode 100644 test/test-family-matching.c + +diff --git a/src/fccfg.c b/src/fccfg.c +index 7b857bf..00a94e5 100644 +--- a/src/fccfg.c ++++ b/src/fccfg.c +@@ -1714,6 +1714,7 @@ FcConfigMatchValueList (FcPattern *p, + FcExpr *e = t->expr; + FcValue value; + FcValueList *v; ++ FcOp op; + + while (e) + { +@@ -1731,10 +1732,23 @@ FcConfigMatchValueList (FcPattern *p, + + if (t->object == FC_FAMILY_OBJECT && table) + { +- if (!FamilyTableLookup (table, t->op, FcValueString (&value))) ++ op = FC_OP_GET_OP (t->op); ++ if (op == FcOpEqual || op == FcOpListing) + { ++ if (!FamilyTableLookup (table, t->op, FcValueString (&value))) ++ { + ret = 0; + goto done; ++ } ++ } ++ if (op == FcOpNotEqual && t->qual == FcQualAll) ++ { ++ ret = 0; ++ if (!FamilyTableLookup (table, t->op, FcValueString (&value))) ++ { ++ ret = values; ++ } ++ goto done; + } + } + for (v = values; v; v = FcValueListNext(v)) +diff --git a/test/Makefile.am b/test/Makefile.am +index 1a9b293..30d8c2a 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -167,6 +167,10 @@ check_PROGRAMS += test-issue180 + test_issue180_LDADD = $(top_builddir)/src/libfontconfig.la + TESTS += test-issue180 + ++check_PROGRAMS += test-family-matching ++test_family_matching_LDADD = $(top_builddir)/src/libfontconfig.la ++TESTS += test-family-matching ++ + EXTRA_DIST=run-test.sh run-test-conf.sh $(LOG_COMPILER) $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names + + CLEANFILES = \ +diff --git a/test/meson.build b/test/meson.build +index 96b30a9..59de427 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -6,6 +6,7 @@ tests = [ + ['test-bz106618.c'], + ['test-bz1744377.c'], + ['test-issue180.c'], ++ ['test-family-matching.c'], + ] + + if host_machine.system() != 'windows' +diff --git a/test/test-family-matching.c b/test/test-family-matching.c +new file mode 100644 +index 0000000..9fab36c +--- /dev/null ++++ b/test/test-family-matching.c +@@ -0,0 +1,228 @@ ++/* ++ * fontconfig/test/test-family-matching.c ++ * ++ * Copyright © 2020 Zoltan Vandrus ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of the author(s) not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. The authors make no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++#include ++#include ++#include ++ ++#define FC_TEST_RESULT "testresult" ++ ++typedef enum _TestMatchResult { ++ TestMatch, ++ TestNoMatch, ++ TestMatchError ++} TestMatchResult; ++ ++typedef enum _TestResult { ++ TestPassed, ++ TestFailed, ++ TestError ++} TestResult; ++ ++static TestMatchResult ++TestMatchPattern (const char *test, FcPattern *p) ++{ ++ const FcChar8 *xml_pre = (const FcChar8 *) "" ++ "\n" ++ " \n" ++ ""; ++ ++ const FcChar8 *xml_post = (const FcChar8 *) "" ++ " \n" ++ " true\n" ++ " \n" ++ " \n" ++ "\n" ++ ""; ++ ++ FcChar8 *xml, *concat; ++ FcConfig *cfg; ++ FcResult result; ++ FcBool dummy; ++ TestResult ret = TestMatchError; ++ ++ FcPattern *pat = FcPatternDuplicate (p); ++ if (!pat) ++ { ++ fprintf (stderr, "Unable to duplicate pattern.\n"); ++ goto bail0; ++ } ++ ++ concat = FcStrPlus (xml_pre, (const FcChar8 *) test); ++ if (!concat) ++ { ++ fprintf (stderr, "Concatenation failed.\n"); ++ goto bail0; ++ } ++ ++ xml = FcStrPlus (concat, xml_post); ++ FcStrFree (concat); ++ if (!xml) ++ { ++ fprintf (stderr, "Concatenation failed.\n"); ++ goto bail0; ++ } ++ ++ cfg = FcConfigCreate (); ++ if (!cfg) ++ { ++ fprintf (stderr, "Unable to create a new empty config.\n"); ++ return TestMatchError; ++ } ++ ++ if (!FcConfigParseAndLoadFromMemory (cfg, xml, FcTrue)) ++ { ++ fprintf (stderr, "Unable to load a config from memory.\n"); ++ goto bail1; ++ } ++ ++ if (!FcConfigSubstitute (cfg, pat, FcMatchPattern)) ++ { ++ fprintf (stderr, "Unable to substitute config.\n"); ++ goto bail1; ++ } ++ ++ result = FcPatternGetBool (pat, FC_TEST_RESULT, 0, &dummy); ++ switch (result) { ++ case FcResultMatch: ++ ret = TestMatch; ++ break; ++ case FcResultNoMatch: ++ ret = TestNoMatch; ++ break; ++ default: ++ fprintf (stderr, "Unable to check pattern.\n"); ++ break; ++ } ++ ++bail1: ++ FcConfigDestroy (cfg); ++bail0: ++ FcPatternDestroy (pat); ++ return ret; ++} ++ ++static TestResult ++TestShouldMatchPattern(const char* test, FcPattern *pat, int negate) ++{ ++ switch (TestMatchPattern (test, pat)) { ++ case TestMatch: ++ if (!negate) { ++ return TestPassed; ++ } ++ else ++ { ++ printf ("Following test unexpectedly matched:\n%s", test); ++ printf ("on\n"); ++ FcPatternPrint (pat); ++ return TestFailed; ++ } ++ break; ++ case TestNoMatch: ++ if (!negate) { ++ printf ("Following test should have matched:\n%s", test); ++ printf ("on\n"); ++ FcPatternPrint (pat); ++ return TestFailed; ++ } ++ else ++ { ++ return TestPassed; ++ } ++ break; ++ case TestMatchError: ++ return TestError; ++ break; ++ default: ++ fprintf (stderr, "This shouldn't have been reached.\n"); ++ return TestError; ++ } ++} ++ ++#define MAX(a,b) ((a) > (b) ? (a) : (b)) ++ ++static TestResult ++UpdateResult (TestResult* res, TestResult resNew) ++{ ++ *res = MAX(*res, resNew); ++ return *res; ++} ++ ++static TestResult ++TestFamily (void) ++{ ++ const char *test; ++ TestResult res = TestPassed; ++ ++ FcPattern *pat = FcPatternBuild (NULL, ++ FC_FAMILY, FcTypeString, "family1", ++ FC_FAMILY, FcTypeString, "family2", ++ FC_FAMILY, FcTypeString, "family3", ++ NULL); ++ ++ if (!pat) ++ { ++ fprintf (stderr, "Unable to build pattern.\n"); ++ return TestError; ++ } ++ ++ #define SHOULD_MATCH(p,t) \ ++ UpdateResult (&res, TestShouldMatchPattern (t, p, 0)) ++ #define SHOULD_NOT_MATCH(p,t) \ ++ UpdateResult (&res, TestShouldMatchPattern (t, p, 1)) ++ ++ test = "\n" ++ " foo\n" ++ "\n" ++ ""; ++ SHOULD_MATCH(pat, test); ++ ++ test = "" ++ "\n" ++ " family2\n" ++ "\n" ++ ""; ++ SHOULD_NOT_MATCH(pat, test); ++ ++ test = "" ++ "\n" ++ " family3\n" ++ "\n" ++ ""; ++ SHOULD_MATCH(pat, test); ++ ++ test = "" ++ "\n" ++ " foo\n" ++ "\n" ++ ""; ++ SHOULD_NOT_MATCH(pat, test); ++ ++ return res; ++} ++ ++int ++main (void) ++{ ++ return (TestFamily ()); ++} +-- +2.29.2 + diff --git a/SOURCES/fontconfig-sleep-less.patch b/SOURCES/fontconfig-sleep-less.patch new file mode 100644 index 0000000..bd9c58c --- /dev/null +++ b/SOURCES/fontconfig-sleep-less.patch @@ -0,0 +1,12 @@ +diff -pruN fontconfig-2.12.91.orig/fc-cache/fc-cache.c fontconfig-2.12.91/fc-cache/fc-cache.c +--- fontconfig-2.12.91.orig/fc-cache/fc-cache.c 2017-11-20 21:02:20.000000000 +0900 ++++ fontconfig-2.12.91/fc-cache/fc-cache.c 2017-12-14 16:59:19.002003145 +0900 +@@ -413,7 +413,7 @@ main (int argc, char **argv) + */ + /* the resolution of mtime on FAT is 2 seconds */ + if (changed) +- sleep (2); ++ sleep (1); + if (verbose) + printf ("%s: %s\n", argv[0], ret ? _("failed") : _("succeeded")); + return ret; diff --git a/SPECS/fontconfig.spec b/SPECS/fontconfig.spec new file mode 100644 index 0000000..ae1f29b --- /dev/null +++ b/SPECS/fontconfig.spec @@ -0,0 +1,1094 @@ +# ifdef'd in source code but runtime dep will be made for FT_Done_MM_Var symbol in freetype-2.9.1 +# so update the build deps as well to keep deps consistency between runtime and build time. +%global freetype_version 2.9.1 + +Summary: Font configuration and customization library +Name: fontconfig +Version: 2.13.93 +Release: 8%{?dist} +# src/ftglue.[ch] is in Public Domain +# src/fccache.c contains Public Domain code +# fc-case/CaseFolding.txt is in the UCD +# otherwise MIT +License: MIT and Public Domain and UCD +Source: http://fontconfig.org/release/%{name}-%{version}.tar.xz +URL: http://fontconfig.org +Source1: 25-no-bitmap-fedora.conf +Source2: fc-cache + +# https://bugzilla.redhat.com/show_bug.cgi?id=140335 +Patch0: %{name}-sleep-less.patch +Patch4: %{name}-drop-lang-from-pkgkit-format.patch +Patch5: %{name}-disable-network-required-test.patch +Patch6: %{name}-hotfix.patch + +BuildRequires: libxml2-devel +BuildRequires: freetype-devel >= %{freetype_version} +BuildRequires: fontpackages-devel +BuildRequires: autoconf automake libtool gettext +BuildRequires: gperf +BuildRequires: docbook-utils docbook-utils-pdf +BuildRequires: make + +Requires: fonts-filesystem freetype +# Register DTD system-wide to make validation work by default +# (used by fonts-rpm-macros) +Requires(pre): xml-common +Requires(postun): xml-common +PreReq: freetype >= 2.9.1-6 +Requires(post): grep coreutils +Requires: font(:lang=en) +Suggests: font(dejavusans) + +%description +Fontconfig is designed to locate fonts within the +system and select them according to requirements specified by +applications. + +%package devel +Summary: Font configuration and customization library +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: freetype-devel >= %{freetype_version} +Requires: pkgconfig +Requires: gettext + +%description devel +The fontconfig-devel package includes the header files, +and developer docs for the fontconfig package. + +Install fontconfig-devel if you want to develop programs which +will use fontconfig. + +%package devel-doc +Summary: Development Documentation files for fontconfig library +BuildArch: noarch +Requires: %{name}-devel = %{version}-%{release} + +%description devel-doc +The fontconfig-devel-doc package contains the documentation files +which is useful for developing applications that uses fontconfig. + +%prep +%autosetup -p1 + +%build +# We don't want to rebuild the docs, but we want to install the included ones. +export HASDOCBOOK=no + +for i in doc/*.fncs; do + touch -r $i ${i//.fncs/.sgml} +done +autoreconf +%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \ + --enable-libxml2 \ + --disable-static --with-cache-dir=/usr/lib/fontconfig/cache + +make %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d +ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/ + +# move installed doc files back to build directory to package them +# in the right place +mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* . +rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/ + +# adjust the timestamp to avoid conflicts for multilib +touch -r doc/fontconfig-user.sgml fontconfig-user.txt +touch -r doc/fontconfig-user.sgml fontconfig-user.html + +# rename fc-cache binary +mv $RPM_BUILD_ROOT%{_bindir}/fc-cache $RPM_BUILD_ROOT%{_bindir}/fc-cache-%{__isa_bits} + +# create link to man page +echo ".so man1/fc-cache.1" > $RPM_BUILD_ROOT%{_mandir}/man1/fc-cache-%{__isa_bits}.1 + +install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache + +%find_lang %{name} +%find_lang %{name}-conf +cat %{name}-conf.lang >> %{name}.lang + +%check +VERBOSE=1 make check + +%post +umask 0022 + +mkdir -p /usr/lib/fontconfig/cache + +[[ -d %{_localstatedir}/cache/fontconfig ]] && rm -rf %{_localstatedir}/cache/fontconfig/* 2> /dev/null || : + +# Force regeneration of all fontconfig cache files +# The check for existance is needed on dual-arch installs (the second +# copy of fontconfig might install the binary instead of the first) +# The HOME setting is to avoid problems if HOME hasn't been reset +if [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache --version 2>&1 | grep -q %{version} ; then + HOME=/root /usr/bin/fc-cache -f +fi + +%transfiletriggerin -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts +HOME=/root /usr/bin/fc-cache -s + +%transfiletriggerpostun -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts +HOME=/root /usr/bin/fc-cache -s + +%posttrans +if [ -e %{_sysconfdir}/xml/catalog ]; then + %{_bindir}/xmlcatalog --noout --add system \ + "urn:fontconfig:fonts.dtd" \ + "file://%{_datadir}/xml/fontconfig/fonts.dtd" \ + %{_sysconfdir}/xml/catalog +fi + +%postun +if [ $1 == 0 ] && [ -e %{_sysconfdir}/xml/catalog ]; then + %{_bindir}/xmlcatalog --noout --del "urn:fontconfig:fonts.dtd" %{_sysconfdir}/xml/catalog +fi + +%files -f %{name}.lang +%doc README AUTHORS +%doc fontconfig-user.txt fontconfig-user.html +%doc %{_fontconfig_confdir}/README +%license COPYING +%{_libdir}/libfontconfig.so.* +%{_bindir}/fc-cache* +%{_bindir}/fc-cat +%{_bindir}/fc-conflist +%{_bindir}/fc-list +%{_bindir}/fc-match +%{_bindir}/fc-pattern +%{_bindir}/fc-query +%{_bindir}/fc-scan +%{_bindir}/fc-validate +%{_fontconfig_templatedir}/*.conf +%{_datadir}/xml/fontconfig +# fonts.conf is not supposed to be modified. +# If you want to do so, you should use local.conf instead. +%config %{_fontconfig_masterdir}/fonts.conf +%config(noreplace) %{_fontconfig_confdir}/*.conf +%dir /usr/lib/fontconfig/cache +%{_mandir}/man1/* +%{_mandir}/man5/* + +%files devel +%{_libdir}/libfontconfig.so +%{_libdir}/pkgconfig/* +%{_includedir}/fontconfig +%{_mandir}/man3/* +%{_datadir}/gettext/its/fontconfig.its +%{_datadir}/gettext/its/fontconfig.loc + +%files devel-doc +%doc fontconfig-devel.txt fontconfig-devel + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 2.13.93-8 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Apr 15 2021 Mohan Boddu - 2.13.93-7 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Thu Mar 25 2021 Akira TAGOH - 2.13.93-6 +- Fix postun scriptlet to remove the entry from xml catalog. + +* Tue Jan 26 2021 Fedora Release Engineering - 2.13.93-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 23 2020 Akira TAGOH - 2.13.93-4 +- cherry pick some upstream patches + - Skip leading white space in style. + - Remove abort from FcCompareSize. + - Fix memory leaks + - Check qual and compare for family tests. +- +* Thu Dec 3 2020 Akira TAGOH - 2.13.93-3 +- Add back fullname property at the scan matching phase for the backward compatibility. + Resolves: rhbz#1902881 + +* Mon Nov 30 2020 Akira TAGOH - 2.13.93-2 +- Fix file conflicts. + +* Sat Nov 28 2020 Akira TAGOH - 2.13.93-1 +- New upstream release. + +* Mon Jul 27 2020 Fedora Release Engineering - 2.13.92-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Apr 23 2020 Akira TAGOH - 2.13.92-11 +- deal with system caches as always latest on Silverblue. (#1750891) + +* Thu Apr 02 2020 Akira TAGOH - 2.13.92-10 +- Build against libxml2 instead of expat. + +* Sat Mar 28 2020 Nicolas Mailhot - 2.13.92-9 +- Fix DTD declaration and registration so users and Fedora automation can + easily validate new configuration files + +* Mon Mar 23 2020 Akira TAGOH - 2.13.92-8 +- Fix assertion in FcCacheFini() again. + Resolves: rhbz#1815684 + +* Wed Feb 26 2020 Akira TAGOH - 2.13.92-7 +- Fix assertion in FcCacheFini(). + +* Thu Jan 30 2020 Akira TAGOH - 2.13.92-6 +- Fix some wrong behavior with sysroot option. +- Fix reading the outdated caches. +- Apply a patch to make it MT-safe more. + +* Tue Jan 28 2020 Fedora Release Engineering - 2.13.92-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Akira TAGOH - 2.13.92-4 +- Drop font(:lang=...) from %%{=pkgkit} format. + Reference: rhbz#1792463 + +* Wed Aug 28 2019 Akira TAGOH - 2.13.92-3 +- Do not return false on FcConfigParseAndLoad*() if complain is set to false. + Resolves: rhbz#1744377 + +* Fri Aug 9 2019 Akira TAGOH - 2.13.92-2 +- Fix to affect fonthashint property for score on match. + +* Fri Aug 9 2019 Akira TAGOH - 2.13.92-1 +- New upstream release. + +* Wed Jul 31 2019 Akira TAGOH - 2.13.91-4 +- Fix make check fails. + +* Thu Jul 25 2019 Fedora Release Engineering - 2.13.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 16 2019 Tim Landscheidt - 2.13.91-2 +- Remove calls to ldconfig from scriptlets +- Use "PreReq" instead of "Requires(pre)" for freetype + +* Mon Jun 10 2019 Akira TAGOH - 2.13.91-1 +- New upstream release. + +* Fri Feb 22 2019 Akira TAGOH - 2.13.1-6 +- Update freetype version for runtime dependency to ensure + they have FT_Done_MM_Var symbol certainly. (#1679619) + +* Thu Jan 31 2019 Fedora Release Engineering - 2.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Nov 13 2018 Akira TAGOH - 2.13.1-4 +- Use Rachana instead of Meera for serif subsitution. (#1649184) + +* Wed Nov 07 2018 Akira TAGOH - 2.13.1-3 +- Stop cleaning up .uuid file even when a directory is empty. + +* Wed Sep 26 2018 Akira TAGOH - 2.13.1-2 +- Add man page for fc-cache-* links to fc-cache. +- Drop unnecessary BR. + +* Thu Aug 30 2018 Akira TAGOH - 2.13.1-1 +- New upstream release. + +* Fri Jul 13 2018 Fedora Release Engineering - 2.13.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Akira TAGOH - 2.13.0-7 +- Use ldconfig rpm macro. + +* Thu Jun 07 2018 Akira TAGOH - 2.13.0-6 +- Add Suggests: dejavu-sans-fonts to address pulling the unpredicted + font package as dependency. (#1321551) + +* Wed Jun 06 2018 Akira TAGOH - 2.13.0-5 +- Update the version deps of freetype to resolve FT_Done_MM_Var symbol. (#1579464) + +* Fri May 11 2018 Akira TAGOH - 2.13.0-4 +- Fix the emboldening logic. (#1575649) + +* Thu Mar 15 2018 Akira TAGOH - 2.13.0-3 +- Another fix to accept the const names in param. +- Fix locale issue. + +* Mon Mar 12 2018 Akira TAGOH - 2.13.0-2 +- Allow the const names in the range. + +* Tue Mar 06 2018 Akira TAGOH - 2.13.0-1 +- New upstream release. + +* Thu Feb 15 2018 Akira TAGOH - 2.12.93-1 +- New upstream release. + +* Wed Feb 07 2018 Fedora Release Engineering - 2.12.92-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 4 2018 Akira TAGOH - 2.12.92-1 +- New upstream release. +- Fix the mis-ordering of evaluating config. (#1530211) + +* Sat Dec 23 2017 Akira TAGOH - 2.12.91-2 +- Fix crash (#1528706) + +* Thu Dec 14 2017 Akira TAGOH - 2.12.91-1 +- New upstream release. + +* Wed Nov 8 2017 Akira TAGOH - 2.12.6-4 +- Remove the debug print in fc-query. (#1509790) + +* Thu Oct 5 2017 Akira TAGOH - 2.12.6-3 +- Backport a patch to change the order of the emoji fonts. (#1496761) + +* Tue Oct 3 2017 Akira TAGOH - 2.12.6-2 +- Bump the release to address the upgrade path issue. + +* Thu Sep 21 2017 Akira TAGOH - 2.12.6-1 +- New upstream release. + +* Sat Sep 9 2017 Akira TAGOH - 2.12.5-1 +- New upstream release. + +* Mon Jul 31 2017 Akira TAGOH - 2.12.4-4 +- Fix exiting with 1 on 32bit arch. (#1476831) + +* Wed Jul 26 2017 Fedora Release Engineering - 2.12.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jul 24 2017 Akira TAGOH - 2.12.4-2 +- Allow installing 32/64 bit version of fc-cache at the same time. (#1474257) +- Add fc-cache script to invoke both version of fc-cache if available. + +* Wed Jul 5 2017 Akira TAGOH - 2.12.4-1 +- New upstream release. + +* Wed May 31 2017 Akira TAGOH - 2.12.3-1 +- New upstream release. + +* Thu Feb 23 2017 Akira TAGOH - 2.12.1-4 +- Move the cache files into /usr/lib/fontconfig/cache (#1377367, #1416380) + +* Wed Feb 22 2017 Akira TAGOH - 2.12.1-3 +- Fix FTBFS (#1423570) + +* Fri Feb 10 2017 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Aug 5 2016 Akira TAGOH - 2.12.1-1 +- New upstream release. + +* Wed Jun 15 2016 Akira TAGOH - 2.12.0-1 +- New upstream release. + +* Tue Apr 12 2016 Akira TAGOH - 2.11.95-1 +- New upstream release. (#1325560) + +* Mon Mar 28 2016 Akira TAGOH - 2.11.94-7 +- Add Requires: freetype. + +* Wed Feb 03 2016 Fedora Release Engineering - 2.11.94-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Sep 7 2015 Akira TAGOH - 2.11.94-5 +- Add file triggers for fonts. + +* Fri Aug 14 2015 Akira TAGOH - 2.11.94-4 +- Revise the patch. (#1236034) + +* Wed Aug 12 2015 Akira TAGOH - 2.11.94-3 +- Lock the cache file until scanning and writing finished. (#1236034) + +* Wed Jun 17 2015 Fedora Release Engineering - 2.11.94-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 2 2015 Akira TAGOH - 2.11.94-1 +- New upstream release. + - Fix bitmap scaling. (#1187528, #1226433, 1226522, #1226722) + +* Mon Mar 30 2015 Akira TAGOH - 2.11.93-2 +- Fix SIGFPE (#1203118) + +* Mon Mar 9 2015 Akira TAGOH - 2.11.93-1 +- New upstream release. + +* Sat Feb 21 2015 Till Maas - 2.11.92-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Tue Jan 13 2015 Akira TAGOH - 2.11.92-1 +- New upstream release. + +* Thu Dec 25 2014 Akira TAGOH - 2.11.91-1 +- New upstream release. + +* Sat Aug 16 2014 Fedora Release Engineering - 2.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.11.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 5 2014 Akira TAGOH - 2.11.1-3 +- Workaround that the cache isn't updated properly. (#921706) + +* Fri Apr 11 2014 Akira TAGOH - 2.11.1-2 +- Fix failing on updating cache with --really-force. + +* Mon Mar 24 2014 Akira TAGOH - 2.11.1-1 +- New upstream release. + +* Fri Jan 24 2014 Akira TAGOH - 2.11.0-2 +- Add Requires: font(:lang=en) (#1025331, #845712) + +* Fri Oct 11 2013 Akira TAGOH - 2.11.0-1 +- New upstream release. + +* Fri Sep 13 2013 Akira TAGOH - 2.10.95-4 +- Fix memory leaks in FcFreeTypeQueryFace(). + +* Mon Sep 2 2013 Akira TAGOH - 2.10.95-3 +- Do not create a directory for migration when no old config file and directory. + (#1003495) + +* Sat Aug 31 2013 Akira TAGOH - 2.10.95-1 +- Fix a crash issue (#1003069) + +* Fri Aug 30 2013 Akira TAGOH - 2.10.94-1 +- New upstream release. +- migrate the configuration for XDG Base Directory spec automatically (#882267) + +* Sat Aug 03 2013 Fedora Release Engineering - 2.10.93-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon May 20 2013 Akira TAGOH - 2.10.93-1 +- New upstream release. + +* Thu Apr 11 2013 Akira TAGOH - 2.10.92-3 +- Fix a web font issue in firefox. (#946859) + +* Mon Apr 1 2013 Akira TAGOH - 2.10.92-2 +- Fix font matching issue. (#929372) + +* Fri Mar 29 2013 Akira TAGOH - 2.10.92-1 +- New upstream release. + +* Tue Feb 12 2013 Akira TAGOH - 2.10.91-3 +- Improve the spec to meet the latest packaging guidelines (#225759) + - add -devel-doc subpackage. +- Fix a build issue with automake 1.13 + +* Fri Feb 8 2013 Ville Skyttä - 2.10.91-2 +- Own the %%{_datadir}/xml/fontconfig dir. +- Fix bogus dates in %%changelog. + +* Fri Jan 11 2013 Akira TAGOH - 2.10.91-1 +- New upstream release (#894109) + - threadsafe + - new tool to validate the glyph coverage + - add new rule to scale the bitmap font. + +* Mon Nov 26 2012 Akira TAGOH - 2.10.2-1 +- New upstream release. + - Fix an regression on FcFontMatch with namelang. (#876970) + +* Thu Oct 25 2012 Akira TAGOH - 2.10.1-2 +- Update License field (#869614) + +* Fri Jul 27 2012 Akira TAGOH - 2.10.1-1 +- New upstream release. + +* Thu Jul 19 2012 Fedora Release Engineering - 2.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 17 2012 Akira TAGOH - 2.10.0-1 +- New upstream release. + +* Mon Jun 25 2012 Akira TAGOH - 2.9.92-1 +- New upstream release. + +* Mon Jun 11 2012 Akira TAGOH - 2.9.91-1 +- New upstream release. + - docs are generated with the fixed docbook (#826145) + - handle whitespace in family name correctly (#468565, #591634) + - Updated ne.orth. (#586763) + +* Wed May 16 2012 Akira TAGOH - 2.9.0-2 +- Add grep and coreutils to Requires(post). (#821957) + +* Fri Mar 23 2012 Akira TAGOH +- backport patch to make 'result' from FcFontMatch() and FcFontSort() + more reliable. + +* Wed Mar 21 2012 Akira TAGOH - 2.9.0-1 +- New upstream release (#803559) + - Update ks.orth (#790471) + - Add brx.orth (#790460) + - Update ur.orth (#757985) + - No Apple Roman cmap support anymore. should works. (#681808) + - Update ne.orth (#586763) + - Add a workaround for ZapfDingbats. (#562952, #497648, #468565) +- clean up the spec file. +- Add BR: fontpackages-devel. +- Add R: fontpackages-filesystem. + +* Fri Jan 13 2012 Fedora Release Engineering - 2.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue May 31 2011 Adam Jackson 2.8.0-4 +- fontconfig-2.8.0-dingbats.patch: Hack for dingbats font matching. (#468565) + +* Tue Feb 08 2011 Fedora Release Engineering - 2.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jun 24 2010 Adam Jackson 2.8.0-2 +- fontconfig-2.8.0-sleep-less.patch: Make a stupid sleep() in fc-cache + slightly less stupid. + +* Thu Dec 3 2009 Behdad Esfahbod - 2.8.0-1 +- Update to 2.8.0 + +* Tue Sep 8 2009 Behdad Esfahbod - 2.7.3-1 +- Update to 2.7.3 + +* Mon Aug 31 2009 Behdad Esfahbod - 2.7.2-1 +- Update to 2.7.2 + +* Mon Jul 27 2009 Behdad Esfahbod - 2.7.1-1 +- Update to 2.7.1 + +* Fri Jul 24 2009 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jun 24 2009 Behdad Esfahbod - 2.7.0 +- Update to 2.7.0 + +* Mon Jun 1 2009 Behdad Esfahbod - 2.6.99.behdad.20090601-1 +- Update to 2.6.99.behdad.20090601 + +* Fri May 8 2009 Behdad Esfahbod - 2.6.99.behdad.20090508-1 +- Update to 2.6.99.behdad.20090508 +- Resolves #497984 + +* Wed Mar 18 2009 Behdad Esfahbod - 2.6.99.behdad.20090318-1 +- Update to 2.6.99.behdad.20090318 +- Resolves #490888 + +* Tue Mar 17 2009 Behdad Esfahbod - 2.6.99.behdad.20090317-1 +- Update to 2.6.99.behdad.20090317 +- Resolves #485685 + +* Sat Mar 14 2009 Behdad Esfahbod - 2.6.99.behdad-3 +- New tarball with version fixed in the header + +* Fri Mar 13 2009 Behdad Esfahbod - 2.6.99.behdad-2 +- Previous tarball was broken. Rebuild with respinned ball. + +* Fri Mar 13 2009 Behdad Esfahbod - 2.6.99.behdad-1 +- Update to 2.6.99.behdad + +* Tue Mar 10 2009 Behdad Esfahbod - 2.6.98-1.gb39c36a +- Update to 2.6.98-1.gb39c36a + +* Tue Feb 24 2009 Fedora Release Engineering - 2.6.97-5.g945d6a4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 23 2009 Nicolas Mailhot +- 2.6.97-4.g945d6a4 +— global-ization + +* Mon Feb 16 2009 Richard Hughes - 2.6.97-3.g945d6a4 +- Correct the rpm provide name to be font(), not Font(). + +* Sun Feb 15 2009 Behdad Esfahbod - 2.6.97-2.g945d6a4 +- Another try. + +* Sun Feb 15 2009 Behdad Esfahbod - 2.6.97-1.g945d6a4 +- Update to 2.6.97-1.g945d6a4 + +* Sun Feb 15 2009 Behdad Esfahbod - 2.6.96-1.g0b290a6 +- Update to 2.6.96-1.g0b290a6 + +* Tue Jan 27 2009 Behdad Esfahbod - 2.6.95-1.git.66.gb162bfb +- Update to 2.6.95-1.git.66.gb162bfb + +* Fri Jan 23 2009 Behdad Esfahbod - 2.6.94-1.git.65.g628ee83 +- Update to 2.6.94-1.git.65.g628ee83 + +* Wed Jan 21 2009 Behdad Esfahbod - 2.6.93-1.git.64.g6aa4dce +- Update to 2.6.93-1.git.64.g6aa4dce + +* Mon Jan 19 2009 Behdad Esfahbod - 2.6.92-1.git.64.g167bb82 +- Update to 2.6.92-1.git.64.g167bb82 + +* Mon Jan 19 2009 Behdad Esfahbod - 2.6.91-1.git.64.g9feaf34 +- Update to 2.6.91-1.git.64.g9feaf34 + +* Fri Jan 16 2009 Behdad Esfahbod - 2.6.90-3.git.63.g6bb4b9a +- Install fc-scan and fc-query + +* Fri Jan 16 2009 Behdad Esfahbod - 2.6.90-2.git.63.g6bb4b9a +- Update to 2.6.90-1.git.63.g6bb4b9a +- Remove upstreamed patch + +* Mon Oct 20 2008 Behdad Esfahbod - 2.6.0-3 +- Add fontconfig-2.6.0-indic.patch +- Resolves: #464470 + +* Sun Jun 01 2008 Behdad Esfahbod - 2.6.0-2 +- Fix build. + +* Sat May 31 2008 Behdad Esfahbod - 2.6.0-1 +- Update to 2.6.0. + +* Mon Feb 18 2008 Fedora Release Engineering - 2.5.0-2 +- Autorebuild for GCC 4.3 + +* Wed Nov 14 2007 Behdad Esfahbod - 2.5.0-1 +- Update to 2.5.0. + +* Tue Nov 06 2007 Behdad Esfahbod - 2.4.92-1 +- Update to 2.4.92. +- Mark /etc/fonts/conf.d/* as config(noreplace). +- Remove most of our conf file, all upstreamed except for + 75-blacklist-fedora.conf that I'm happily dropping. Who has + Hershey fonts these days... +- ln upstream'ed 25-unhint-nonlatin.conf from conf.avail in conf.d +- Add 25-no-bitmap-fedora.conf which is the tiny remaining bit + of conf that didn't end up upstream. Can get rid of it in the + future, but not just yet. + +* Thu Oct 25 2007 Behdad Esfahbod - 2.4.91-1 +- Update to 2.4.91. +- Add /usr/local/share/fonts to default config. (#147004) +- Don't rebuild docs, to fix multilib conflicts. (#313011) +- Remove docbook and elinks BuildRequires and stuff as we don't + rebuild docs. + +* Wed Aug 22 2007 Adam Jackson - 2.4.2-5 +- Rebuild for PPC toolchain bug +- Add BuildRequires: gawk + +* Sun Jun 17 2007 Matthias Clasen - 2.4.2-4 +- /etc/fonts/conf.d is now owned by filesystem + +* Fri May 11 2007 Matthias Clasen - 2.4.2-3 +- Add Liberation fonts to 30-aliases-fedora.conf + +* Fri Jan 12 2007 Behdad Esfahbod - 2.4.2-2 +- Change /usr/share/X11/fonts/OTF to /usr/share/X11/fonts/TTF +- Resolves: #220809 + +* Tue Dec 5 2006 Matthias Clasen - 2.4.2-1 +- Update to 2.4.2 + +* Wed Oct 4 2006 Matthias Clasen - 2.4.1-4 +- Fix a multilib upgrade problem (#208151) + +* Sun Oct 01 2006 Jesse Keating - 2.4.1-3 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Fri Sep 22 2006 Behdad Esfahbod - 2.4.1-2 +- Update 30-aliases-fedora.conf to correctly alias MS and StarOffice + fonts. (#207460) + +* Fri Sep 15 2006 Behdad Esfahbod - 2.4.1-1 +- Update to 2.4.1, a public API was dropped from 2.4.0 +- Remove upstreamed patch + +* Mon Sep 11 2006 Behdad Esfahbod - 2.4.0-1 +- Update to 2.4.0 +- Rename/order our configuration stuff to match the new scheme. + Breaks expected :-( + +* Thu Sep 07 2006 Behdad Esfahbod - 2.3.97-3 +- Add missing file. Previous update didn't go through + +* Thu Sep 07 2006 Behdad Esfahbod - 2.3.97-2 +- Add fontconfig-2.3.97-ppc64.patch, for ppc64 arch signature + +* Thu Sep 07 2006 Behdad Esfahbod - 2.3.97-1 +- update to 2.3.97 +- Drop upstreamed patches +- Regenerate defaultconfig patch +- Don't touch stamp as it was not ever needed + +* Thu Aug 17 2006 Behdad Esfahbod - 2.3.95-11 +- inclusion of zhong yi font and rearranged font prefer list. (bug# 201300) + +* Fri Aug 11 2006 Ray Strode - 2.3.95-10 +- use "%%5x" instead of " %%4x" to support 64k instead of + clamping. Idea from Behdad. + +* Fri Aug 11 2006 Ray Strode - 2.3.95-9 +- tweak last patch to give a more reasonable page size + value if 64k page size is in effect. + +* Fri Aug 11 2006 Ray Strode - 2.3.95-8 +- maybe fix buffer overflow (bug 202152). + +* Fri Aug 11 2006 Ray Strode - 2.3.95-7 +- Update configs to provide better openoffice/staroffice + compatibility (bug 200723) + +* Thu Jul 27 2006 Behdad Esfahbod - 2.3.95-6 +- Do umask 0022 in post +- Update configs to reflect addition of new Indic fonts (#200381, #200397) + +* Tue Jul 18 2006 Matthias Clasen - 2.3.95-5 +- Plug a small memory leak + +* Wed Jul 12 2006 Jesse Keating - 2.3.95-4.1.1 +- rebuild + +* Wed Jul 12 2006 Jesse Keating - 2.3.95-4.1 +- rebuild + +* Fri Jun 2 2006 Matthias Clasen - 2.3.95-4 +- Fix the handling of TTF font collections + +* Thu May 18 2006 Matthias Clasen - 2.3.95-3 +- Apply a patch by David Turner to speed up cache generation + +* Wed Apr 26 2006 Bill Nottingham - 2.3.95-2 +- fix fonts.conf typo + +* Wed Apr 26 2006 Matthias Clasen - 2.3.95-1 +- Update to 2.3.95 + +* Fri Feb 24 2006 Matthias Clasen - 2.3.94-1 +- Update to 2.3.94 + +* Sat Feb 11 2006 Matthias Clasen - 2.3.93.cvs20060211-1 +- Newer cvs snapshot + +* Fri Feb 10 2006 Jesse Keating - 2.3.93.cvs20060208-1.1 +- bump again for double-long bug on ppc(64) + +* Wed Feb 8 2006 Matthias Clasen - 2.3.93.cvs20060208-1 +- Newer cvs snapshot + +* Tue Feb 7 2006 Matthias Clasen - 2.3.93.cvs20060207-1 +- Newer cvs snapshot +- Drop upstreamed patches, pick up some new ones + +* Tue Feb 07 2006 Jesse Keating - 2.3.93.cvs20060131-3.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Thu Feb 2 2006 Ray Strode - 2.3.93.cvs20060131-3 +- Move user cache to a subdirectory (bug 160275) + +* Thu Feb 2 2006 Matthias Clasen - 2.3.93.cvs20060131-2 +- Accumulated patches + +* Tue Jan 31 2006 Matthias Clasen - 2.3.93.cvs20060131-1 +- Newer cvs snapshot + +* Tue Jan 24 2006 Matthias Clasen - 2.3.93.cvs20060124-1 +- Newer cvs snapshot + +* Tue Jan 17 2006 Ray Strode - 2.3.93-4 +- apply patch from Tim Mayberry to correct aliasing and disable + hinting for the two Chinese font names AR PL ShanHeiSun Uni + and AR PL Zenkai Uni + +* Tue Jan 10 2006 Bill Nottingham - 2.3.93-3 +- prereq coreutils for mkdir/touch in %%post + +* Wed Dec 21 2005 Carl Worth - 2.3.93-2 +- Fix to create /var/cache/fontconfig/stamp in the post install stage. + +* Wed Dec 21 2005 Carl Worth - 2.3.93-1 +- New upstream version. + +* Tue Dec 13 2005 Carl Worth - 2.3.92.cvs20051129-3 +- Disable hinting for Lohit Gujarati + +* Fri Dec 9 2005 Carl Worth - 2.3.92.cvs20051129-2 +- Add two new Chinese font names to the default fonts.conf file: + AR PL ShanHeiSun Uni + AR PL Zenkai Uni + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Nov 29 2005 Matthias Clasen - 2.3.92.cvs20051129-1 +- Update to a newer cvs snapshot + +* Sat Nov 19 2005 Matthias Clasen - 2.3.92.cvs20051119-1 +- Update to a newer cvs snapshot + +* Wed Nov 16 2005 Bill Nottingham - 2.3.93-3 +- modular X moved fonts from /usr/X11R6/lib/X11/fonts to + /usr/share/X11/fonts, adjust %%configure accordingly and + conflict with older font packages + +* Wed Nov 9 2005 Carl Worth - 2.3.92-2 +- Remove inadvertent rejection of Luxi Mono from 40-blacklist-fonts.conf. + Fixes #172437 + +* Fri Nov 4 2005 Matthias Clasen - 2.3.92-1 +- Update to 2.3.92 + +* Mon Oct 31 2005 Matthias Clasen - 2.3.91.cvs20051031-1 +- Update to a newer cvs snapshot +- Add a patch which should help to understand broken cache problems + +* Fri Oct 21 2005 Matthias Clasen - 2.3.91.cvs20051017-2 +- Add new Chinese fonts +- Fix the 40-blacklist-fonts.conf file to use the documented + fonts.conf syntax, and exclude the Hershey fonts by family + name. + +* Fri Oct 14 2005 Matthias Clasen - 2.3.91.cvs20051017-1 +- Update to the mmap branch of fontconfig + +* Fri Jul 22 2005 Kristian Høgsberg - 2.3.2-1 +- Update to fontconfig-2.3.2. Drop + + fontconfig-2.1-slighthint.patch, + fontconfig-2.2.3-timestamp.patch, + fontconfig-2.2.3-names.patch, + fontconfig-2.2.3-ta-pa-orth.patch, and + fontconfig-2.2.3-timestamp.patch, + + as they are now merged upstream. + +- Fold fontconfig-2.2.3-add-sazanami.patch into + fontconfig-2.3.2-defaultconfig.patch and split rules to disable CJK + hinting out into /etc/fonts/conf.d/50-no-hint-fonts.conf. + +- Drop fontconfig-0.0.1.020826.1330-blacklist.patch and use the new + rejectfont directive to reject those fonts in 40-blacklist-fonts.conf. + +- Add fontconfig-2.3.2-only-parse-conf-files.patch to avoid parsing + .rpmsave files. + +- Renable s390 documentation now that #97079 has been fixed and add + BuildRequires: for docbook-utils and docbook-utils-pdf. + +- Drop code to iconv and custom install man pages, upstream does the + right thing now. + +- Add workaround from hell to make elinks cooperate so we can build + txt documentation. + +* Tue Apr 19 2005 David Zeuthen - 2.2.3-13 +- Add another font family name Sazanami Gothic/Mincho (#148748) + +* Fri Mar 4 2005 David Zeuthen - 2.2.3-12 +- Rebuild + +* Fri Mar 4 2005 David Zeuthen - 2.2.3-11 +- Rebuild + +* Fri Mar 4 2005 David Zeuthen - 2.2.3-10 +- Rebuild + +* Fri Mar 4 2005 David Zeuthen - 2.2.3-9 +- Disable docs for s390 for now + +* Fri Mar 4 2005 David Zeuthen - 2.2.3-8 +- Rebuild + +* Wed Dec 1 2004 Owen Taylor - 2.2.3-6 +- Sleep a second before the exit of fc-cache to fix problems with fast + serial installs of fonts (#140335) +- Turn off hinting for Lohit Hindi/Bengali/Punjabi (#139816) + +* Tue Oct 19 2004 Owen Taylor - 2.2.3-5 +- Add Lohit fonts for Indic languages (#134492) +- Add Punjabi converage, fix Tamil coverage + +* Wed Sep 22 2004 Owen Taylor - 2.2.3-4 +- Update fonts-hebrew names to include CLM suffix + +* Thu Sep 2 2004 Owen Taylor - 2.2.3-3 +- Backport code from head branch of fontconfig CVS to parse names + for postscript fonts (fixes #127500, J. J. Ramsey) +- Own /usr/share/fonts (#110956, David K. Levine) +- Add KacstQura to serif/sans-serif/monospace aliases (#101182) + +* Mon Aug 16 2004 Owen Taylor - 2.2.3-2 +- Don't run fc-cache if the binary isn't there (#128072, tracked + down by Jay Turner) + +* Tue Aug 3 2004 Owen Taylor - 2.2.3-1 +- Upgrade to 2.2.3 +- Convert man pages to UTF-8 (#108730, Peter van Egdom) +- Renable docs on s390 + +* Mon Jul 26 2004 Owen Taylor - 2.2.1-12 +- Rebuild for RHEL +- Back freetype required version down to 2.1.4 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Apr 19 2004 Owen Taylor 2.2.1-10 +- Require recent freetype (#109592, Peter Oliver) +- Remove fonts.conf timestamp to fix multiarch conflict (#118182) +- Disable hinting for Mukti Narrow (#120915, Sayamindu Dasgupta) + +* Wed Mar 10 2004 Owen Taylor 2.2.1-8.1 +- Rebuild + +* Wed Mar 10 2004 Owen Taylor 2.2.1-8.0 +- Add Albany/Cumberland/Thorndale as fallbacks for Microsoft core fonts and + as non-preferred alternatives for Sans/Serif/Monospace +- Fix FreeType includes for recent FreeType + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Sep 22 2003 Owen Taylor 2.2.1-6.0 +- Should have been passing --with-add-fonts, not --with-add-dirs to + configure ... caused wrong version of Luxi to be used. (#100862) + +* Fri Sep 19 2003 Owen Taylor 2.2.1-5.0 +- Tweak fonts.conf to get right hinting for CJK fonts (#97337) + +* Tue Jun 17 2003 Bill Nottingham 2.2.1-3 +- handle null config->cache correctly + +* Thu Jun 12 2003 Owen Taylor 2.2.1-2 +- Update default config to include Hebrew fonts (#90501, Dov Grobgeld) + +* Tue Jun 10 2003 Owen Taylor 2.2.1-2 +- As a workaround disable doc builds on s390 + +* Mon Jun 9 2003 Owen Taylor 2.2.1-1 +- Version 2.2.1 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Feb 24 2003 Elliot Lee +- debuginfo rebuild + +* Mon Feb 24 2003 Owen Taylor 2.1-8 +- Fix segfault in fc-cache from .dircache patch + +* Mon Feb 24 2003 Owen Taylor +- Back out patch that wrote fonts.conf entries that crash RH-8.0 + gnome-terminal, go with patch from fontconfig CVS instead. + (#84863) + +* Tue Feb 11 2003 Owen Taylor +- Move fontconfig man page to main package, since it contains non-devel + information (#76189) +- Look in the OTF subdirectory of /usr/X11R6/lib/fonts as well + so we find Syriac fonts (#82627) + +* Thu Feb 6 2003 Matt Wilson 2.1-5 +- modified fontconfig-0.0.1.020626.1517-fontdir.patch to hard code + /usr/X11R6/lib/X11/fonts instead of using $(X_FONT_DIR). This is + because on lib64 machines, fonts are not in /usr/X11R6/lib64/.... + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 15 2003 Owen Taylor +- Try a different tack when fixing cache problem + +* Tue Jan 14 2003 Owen Taylor +- Try to fix bug where empty cache entries would be found in + ~/.fonts.cache-1 during scanning (#81335) + +* Thu Nov 21 2002 Mike A. Harris 2.1-1 +- Updated to version 2.1 +- Updated slighthint patch to fontconfig-2.1-slighthint.patch +- Updated freetype version required to 2.1.2-7 + +* Mon Sep 2 2002 Owen Taylor +- Version 2.0 +- Correct capitalization/spacing for ZYSong18030 name (#73272) + +* Fri Aug 30 2002 Owen Taylor +- Blacklist fonts from ghostscript-fonts that don't render correctly + +* Mon Aug 26 2002 Owen Taylor +- Upgrade to fcpackage rc3 +- Fix bug in comparisons for xx_XX language tags +- Compensate for a minor config file change in rc3 + +* Wed Aug 21 2002 Owen Taylor +- Add an explicit PreReq for freetype +- Move fonts we don't ship to the end of the fonts.conf aliases so + installing them doesn't change the look. + +* Wed Aug 21 2002 Owen Taylor +- Memory leak fix when parsing config files +- Set rh_prefer_bitmaps for .ja fonts to key off of in Xft +- Fix some groff warnings for fontconfig.man (#72138) + +* Thu Aug 15 2002 Owen Taylor +- Try once more to get the right default Sans-serif font :-( +- Switch the Sans/Monospace aliases for Korean to Gulim, not Dotum + +* Wed Aug 14 2002 Owen Taylor +- Fix %%post + +* Tue Aug 13 2002 Owen Taylor +- Fix lost Luxi Sans default + +* Mon Aug 12 2002 Owen Taylor +- Upgrade to rc2 +- Turn off hinting for all CJK fonts +- Fix typo in %%post +- Remove the custom language tag stuff in favor of Keith's standard + solution. + +* Mon Jul 15 2002 Owen Taylor +- Prefer Luxi Sans to Nimbus Sans again + +* Fri Jul 12 2002 Owen Taylor +- Add FC_HINT_STYLE to FcBaseObjectTypes +- Switch Chinese fonts to always using Sung-ti / Ming-ti, and never Kai-ti +- Add ZYSong18030 to aliases (#68428) + +* Wed Jul 10 2002 Owen Taylor +- Fix a typo in the langtag patch (caught by Erik van der Poel) + +* Wed Jul 3 2002 Owen Taylor +- Add FC_HINT_STYLE tag + +* Thu Jun 27 2002 Owen Taylor +- New upstream version, with fix for problems with + ghostscript-fonts (Fonts don't work for Qt+CJK, + etc.) + +* Wed Jun 26 2002 Owen Taylor +- New upstream version, fixing locale problem + +* Mon Jun 24 2002 Owen Taylor +- Add a hack where we set the "language" fontconfig property based on the locale, then + we conditionalize base on that in the fonts.conf file. + +* Sun Jun 23 2002 Owen Taylor +- New upstream version + +* Tue Jun 18 2002 Owen Taylor +- Fix crash from FcObjectSetAdd + +* Tue Jun 11 2002 Owen Taylor +- make fonts.conf %%config, not %%config(noreplace) +- Another try at the CJK aliases +- Add some CJK fonts to the config +- Prefer Luxi Mono to Nimbus Mono + +* Mon Jun 10 2002 Owen Taylor +- New upstream version +- Fix matching for bitmap fonts + +* Mon Jun 3 2002 Owen Taylor +- New version, new upstream mega-tarball + +* Tue May 28 2002 Owen Taylor +- Fix problem with FcConfigSort + +* Fri May 24 2002 Owen Taylor +- Initial specfile +