diff options
| author | Treeve Jelbert | 2018-10-01 08:57:45 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2018-10-01 09:01:39 +0200 |
| commit | c9ad40a92128ef6e055cd010a17c246b4d6d6c5a (patch) | |
| tree | f725e58c2c5e2881c747ec48c27f1a8ac026df4d /x11-libs | |
| parent | 2456a8f0fe575079ab8b7efa0764a86599b15114 (diff) | |
fontconfig: => 2.13.1
Diffstat (limited to 'x11-libs')
| -rwxr-xr-x | x11-libs/fontconfig/DETAILS | 10 | ||||
| -rw-r--r-- | x11-libs/fontconfig/HISTORY | 4 | ||||
| -rwxr-xr-x | x11-libs/fontconfig/PRE_BUILD | 3 | ||||
| -rw-r--r-- | x11-libs/fontconfig/fontconfig-2.13.0-locale.patch | 42 |
4 files changed, 8 insertions, 51 deletions
diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS index add84e6fd7..617c53c09f 100755 --- a/x11-libs/fontconfig/DETAILS +++ b/x11-libs/fontconfig/DETAILS @@ -1,12 +1,10 @@ SPELL=fontconfig if [[ "$FONTCONFIG_BRANCH" == "devel" ]]; then - VERSION=2.13.0 - SOURCE_HASH=sha512:f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc - PATCHLEVEL=1 + VERSION=2.13.1 + SOURCE_HASH=sha512:f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100 else - VERSION=2.13.0 - SOURCE_HASH=sha512:f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc - PATCHLEVEL=1 + VERSION=2.13.1 + SOURCE_HASH=sha512:f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100 fi SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY index 2cc4c2abdf..27c1a84bfe 100644 --- a/x11-libs/fontconfig/HISTORY +++ b/x11-libs/fontconfig/HISTORY @@ -1,3 +1,7 @@ +2018-10-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.13.1 + * fontconfig-2.13.0-locale.patch PRE_BUILD: deleted + 2018-06-22 Ismael Luceno <ismael@iodev.co.uk> * PRE_BUILD, fontconfig-2.13.0-locale.patch: added locale setup bugfix * DETAILS: PATCHLEVEL++ diff --git a/x11-libs/fontconfig/PRE_BUILD b/x11-libs/fontconfig/PRE_BUILD deleted file mode 100755 index 815336d1a0..0000000000 --- a/x11-libs/fontconfig/PRE_BUILD +++ /dev/null @@ -1,3 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && -patch -fp1 -i "$SPELL_DIRECTORY"/fontconfig-2.13.0-locale.patch diff --git a/x11-libs/fontconfig/fontconfig-2.13.0-locale.patch b/x11-libs/fontconfig/fontconfig-2.13.0-locale.patch deleted file mode 100644 index c6df432e9f..0000000000 --- a/x11-libs/fontconfig/fontconfig-2.13.0-locale.patch +++ /dev/null @@ -1,42 +0,0 @@ -Locale setup bugfix; leave the locale setting to applications - -Based on patches by Akira TAGOH <akira@tagoh.org>. - -https://bugs.freedesktop.org/show_bug.cgi?id=105492 - ---- - fc-conflist/fc-conflist.c | 1 + - src/fccfg.c | 12 ------------ - 2 files changed, 1 insertion(+), 12 deletions(-) - ---- a/fc-conflist/fc-conflist.c -+++ b/fc-conflist/fc-conflist.c -@@ -102,6 +102,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 ---- a/src/fccfg.c -+++ b/src/fccfg.c -@@ -39,18 +39,6 @@ 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) -- { -- 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, ""); -- } - retry_config: - config = fc_atomic_ptr_get (&_fcConfig); - if (!config) |