From d4bb4b1ba900903e3d319e1691e65dd80db628fd Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 30 Aug 2018 09:53:28 +0000 Subject: [PATCH] New upstream release. --- .gitignore | 1 + fc-cache | 4 +- fontconfig-const-name-in-range.patch | 60 ---- fontconfig-fix-embolden-logic.patch | 31 -- ...onfig-implicit-object-for-const-name.patch | 31 -- fontconfig-locale.patch | 274 ------------------ fontconfig.spec | 11 +- sources | 2 +- 8 files changed, 9 insertions(+), 405 deletions(-) delete mode 100644 fontconfig-const-name-in-range.patch delete mode 100644 fontconfig-fix-embolden-logic.patch delete mode 100644 fontconfig-implicit-object-for-const-name.patch delete mode 100644 fontconfig-locale.patch diff --git a/.gitignore b/.gitignore index da98c57..f153c22 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ fontconfig-2.8.0.tar.gz /fontconfig-2.12.92.tar.bz2 /fontconfig-2.12.93.tar.bz2 /fontconfig-2.13.0.tar.bz2 +/fontconfig-2.13.1.tar.bz2 diff --git a/fc-cache b/fc-cache index 6a12446..8253ae7 100755 --- a/fc-cache +++ b/fc-cache @@ -1,4 +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 $@ || : +[ -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/fontconfig-const-name-in-range.patch b/fontconfig-const-name-in-range.patch deleted file mode 100644 index 728c2c3..0000000 --- a/fontconfig-const-name-in-range.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 198358dd8ff858c9e36531a7406ccb2246ae77b7 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Mon, 12 Mar 2018 11:49:58 +0900 -Subject: [PATCH] Allow the constant names in the range - -https://bugs.freedesktop.org/show_bug.cgi?id=105415 ---- - src/fcname.c | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/fcname.c b/src/fcname.c -index 79e413e..15fb659 100644 ---- a/src/fcname.c -+++ b/src/fcname.c -@@ -330,13 +330,37 @@ FcNameConvert (FcType type, FcChar8 *string) - case FcTypeRange: - if (sscanf ((char *) string, "[%lg %lg]", &b, &e) != 2) - { -- v.u.d = strtod ((char *) string, &p); -- if (p != NULL && p[0] != 0) -+ char *sc, *ec; -+ size_t len = strlen ((const char *) string); -+ int si, ei; -+ -+ sc = malloc (len); -+ ec = malloc (len); -+ if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2) - { -- v.type = FcTypeVoid; -- break; -+ if (FcNameConstant ((const FcChar8 *) sc, &si) && -+ FcNameConstant ((const FcChar8 *) ec, &ei)) -+ v.u.r = FcRangeCreateDouble (si, ei); -+ else -+ goto bail1; -+ } -+ else -+ { -+ bail1: -+ v.type = FcTypeDouble; -+ if (FcNameConstant (string, &si)) -+ { -+ v.u.d = (double) si; -+ } else { -+ v.u.d = strtod ((char *) string, &p); -+ if (p != NULL && p[0] != 0) -+ v.type = FcTypeVoid; -+ } - } -- v.type = FcTypeDouble; -+ if (sc) -+ free (sc); -+ if (ec) -+ free (ec); - } - else - v.u.r = FcRangeCreateDouble (b, e); --- -2.14.3 - diff --git a/fontconfig-fix-embolden-logic.patch b/fontconfig-fix-embolden-logic.patch deleted file mode 100644 index 766b7be..0000000 --- a/fontconfig-fix-embolden-logic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 454923709a1a1e480554c400e053aea9a1ba951a Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Thu, 10 May 2018 22:01:29 +0900 -Subject: [PATCH] Change the emboldening logic again - -enable emboldening when request was >= bold and font was <= medium - -https://bugs.freedesktop.org/show_bug.cgi?id=106460 ---- - conf.d/90-synthetic.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/conf.d/90-synthetic.conf b/conf.d/90-synthetic.conf -index e344e4a..6b929dd 100644 ---- a/conf.d/90-synthetic.conf -+++ b/conf.d/90-synthetic.conf -@@ -42,9 +42,9 @@ - --> - - -- -+ - -- regular -+ medium - - - --- -2.17.0 - diff --git a/fontconfig-implicit-object-for-const-name.patch b/fontconfig-implicit-object-for-const-name.patch deleted file mode 100644 index 8dbde51..0000000 --- a/fontconfig-implicit-object-for-const-name.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4699406a68321179b14fae7412f828e2f37a7033 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Wed, 14 Mar 2018 18:31:30 +0900 -Subject: [PATCH 2/5] Add the value of the constant name to the implicit object - in the pattern - -For objects which has been changed the object type to FcTypeRange. - -https://bugs.freedesktop.org/show_bug.cgi?id=105415 ---- - src/fcname.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/fcname.c b/src/fcname.c -index 15fb659..c9320ae 100644 ---- a/src/fcname.c -+++ b/src/fcname.c -@@ -490,6 +490,10 @@ FcNameParse (const FcChar8 *name) - if (!FcPatternAddBool (pat, c->object, c->value)) - goto bail2; - break; -+ case FcTypeRange: -+ if (!FcPatternAddInteger (pat, c->object, c->value)) -+ goto bail2; -+ break; - default: - break; - } --- -2.14.3 - diff --git a/fontconfig-locale.patch b/fontconfig-locale.patch deleted file mode 100644 index c63a717..0000000 --- a/fontconfig-locale.patch +++ /dev/null @@ -1,274 +0,0 @@ -From 923b5be626a6e03fbaeee0b5cd6d0246c2f8f36f Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Wed, 14 Mar 2018 12:35:05 +0900 -Subject: [PATCH 1/5] Do not override locale if already set by app - -https://bugs.freedesktop.org/show_bug.cgi?id=105492 ---- - src/fccfg.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/fccfg.c b/src/fccfg.c -index eb0b76d..e311f17 100644 ---- a/src/fccfg.c -+++ b/src/fccfg.c -@@ -45,11 +45,16 @@ retry_locale: - is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized); - if (!is_locale_initialized) - { -+ char *loc; -+ - is_locale_initialized = FcTrue; - if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL, - (void *)(intptr_t) is_locale_initialized)) - goto retry_locale; -- setlocale (LC_ALL, ""); -+ -+ loc = setlocale (LC_ALL, NULL); -+ if (!loc || strcmp (loc, "C") == 0) -+ setlocale (LC_ALL, ""); - } - retry_config: - config = fc_atomic_ptr_get (&_fcConfig); --- -2.14.3 - -From 98eaef69af1350e459bf9c175476d3b772968874 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Thu, 15 Mar 2018 12:17:52 +0900 -Subject: [PATCH 4/5] Leave the locale setting to applications - -https://bugs.freedesktop.org/show_bug.cgi?id=105492 ---- - fc-conflist/fc-conflist.c | 2 ++ - src/fccfg.c | 22 ++-------------------- - 2 files changed, 4 insertions(+), 20 deletions(-) - -diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c -index d02273b..5c40a0f 100644 ---- a/fc-conflist/fc-conflist.c -+++ b/fc-conflist/fc-conflist.c -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #ifdef ENABLE_NLS - #include -@@ -102,6 +103,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Vh", longopts, NULL)) != -1) - #else -diff --git a/src/fccfg.c b/src/fccfg.c -index e311f17..e35c451 100644 ---- a/src/fccfg.c -+++ b/src/fccfg.c -@@ -26,7 +26,6 @@ - - #include "fcint.h" - #include --#include - #include - - #if defined (_WIN32) && !defined (R_OK) -@@ -39,24 +38,7 @@ static FcConfig * - FcConfigEnsure (void) - { - FcConfig *config; -- FcBool is_locale_initialized; -- static void *static_is_locale_initialized; --retry_locale: -- is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized); -- if (!is_locale_initialized) -- { -- char *loc; -- -- is_locale_initialized = FcTrue; -- if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL, -- (void *)(intptr_t) is_locale_initialized)) -- goto retry_locale; -- -- loc = setlocale (LC_ALL, NULL); -- if (!loc || strcmp (loc, "C") == 0) -- setlocale (LC_ALL, ""); -- } --retry_config: -+retry: - config = fc_atomic_ptr_get (&_fcConfig); - if (!config) - { -@@ -64,7 +46,7 @@ retry_config: - - if (!fc_atomic_ptr_cmpexch (&_fcConfig, NULL, config)) { - FcConfigDestroy (config); -- goto retry_config; -+ goto retry; - } - } - return config; --- -2.14.3 - -From 2938e4d72da40f6bb0d22086c519a9852a820f40 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Thu, 15 Mar 2018 12:54:02 +0900 -Subject: [PATCH 5/5] call setlocale - ---- - fc-cache/fc-cache.c | 2 ++ - fc-cat/fc-cat.c | 2 ++ - fc-list/fc-list.c | 2 ++ - fc-match/fc-match.c | 2 ++ - fc-pattern/fc-pattern.c | 2 ++ - fc-query/fc-query.c | 2 ++ - fc-scan/fc-scan.c | 2 ++ - 7 files changed, 14 insertions(+) - -diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c -index dc93c19..87e3020 100644 ---- a/fc-cache/fc-cache.c -+++ b/fc-cache/fc-cache.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - #if defined (_WIN32) - #define STRICT -@@ -302,6 +303,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1) - #else -diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c -index dfe30d7..69611bc 100644 ---- a/fc-cat/fc-cat.c -+++ b/fc-cat/fc-cat.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #ifdef ENABLE_NLS - #include -@@ -271,6 +272,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1) - #else -diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c -index 5cded50..2039acd 100644 ---- a/fc-list/fc-list.c -+++ b/fc-list/fc-list.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_CONFIG_H - #include - #else -@@ -117,6 +118,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "vbf:qVh", longopts, NULL)) != -1) - #else -diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c -index 7902707..dee6147 100644 ---- a/fc-match/fc-match.c -+++ b/fc-match/fc-match.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #ifdef ENABLE_NLS - #include -@@ -121,6 +122,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "asvbf:Vh", longopts, NULL)) != -1) - #else -diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c -index f63761c..7989b81 100644 ---- a/fc-pattern/fc-pattern.c -+++ b/fc-pattern/fc-pattern.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #ifdef ENABLE_NLS - #include -@@ -111,6 +112,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "cdf:Vh", longopts, NULL)) != -1) - #else -diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c -index 9da090d..fbffb84 100644 ---- a/fc-query/fc-query.c -+++ b/fc-query/fc-query.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #ifdef ENABLE_NLS - #include -@@ -115,6 +116,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "i:bf:Vh", longopts, NULL)) != -1) - #else -diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c -index edb967c..9302ac5 100644 ---- a/fc-scan/fc-scan.c -+++ b/fc-scan/fc-scan.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #ifdef ENABLE_NLS - #include -@@ -110,6 +111,7 @@ main (int argc, char **argv) - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "bf:Vh", longopts, NULL)) != -1) - #else --- -2.14.3 - diff --git a/fontconfig.spec b/fontconfig.spec index dcea52c..9ad661f 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -4,8 +4,8 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.13.0 -Release: 8%{?dist} +Version: 2.13.1 +Release: 1%{?dist} # src/ftglue.[ch] is in Public Domain # src/fccache.c contains Public Domain code # fc-case/CaseFolding.txt is in the UCD @@ -19,10 +19,6 @@ Source2: fc-cache # https://bugzilla.redhat.com/show_bug.cgi?id=140335 Patch0: %{name}-sleep-less.patch Patch1: %{name}-required-freetype-version.patch -Patch2: %{name}-const-name-in-range.patch -Patch3: %{name}-implicit-object-for-const-name.patch -Patch4: %{name}-locale.patch -Patch5: %{name}-fix-embolden-logic.patch BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -168,6 +164,9 @@ HOME=/root /usr/bin/fc-cache -s %doc fontconfig-devel.txt fontconfig-devel %changelog +* 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 diff --git a/sources b/sources index 6c9c723..61cde62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fontconfig-2.13.0.tar.bz2) = f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc +SHA512 (fontconfig-2.13.1.tar.bz2) = f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100