From 51a50631d4ff67854d433f59e3226e05fef61bd1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 30 Aug 2018 17:25:41 -0300 Subject: [PATCH] fontconfig: update to 2.13.1. --- srcpkgs/fontconfig/patches/01-locale.patch | 35 ---------- srcpkgs/fontconfig/patches/02-locale.patch | 81 ---------------------- srcpkgs/fontconfig/template | 14 ++-- 3 files changed, 7 insertions(+), 123 deletions(-) delete mode 100644 srcpkgs/fontconfig/patches/01-locale.patch delete mode 100644 srcpkgs/fontconfig/patches/02-locale.patch diff --git a/srcpkgs/fontconfig/patches/01-locale.patch b/srcpkgs/fontconfig/patches/01-locale.patch deleted file mode 100644 index cf46d8cb9b9..00000000000 --- a/srcpkgs/fontconfig/patches/01-locale.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 923b5be626a6e03fbaeee0b5cd6d0246c2f8f36f Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Wed, 14 Mar 2018 12:35:05 +0900 -Subject: 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 ---- src/fccfg.c -+++ 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); --- -cgit v1.1 - diff --git a/srcpkgs/fontconfig/patches/02-locale.patch b/srcpkgs/fontconfig/patches/02-locale.patch deleted file mode 100644 index e244a96889f..00000000000 --- a/srcpkgs/fontconfig/patches/02-locale.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 98eaef69af1350e459bf9c175476d3b772968874 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Thu, 15 Mar 2018 12:17:52 +0900 -Subject: 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 ---- fc-conflist/fc-conflist.c -+++ 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 ---- src/fccfg.c -+++ 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; --- -cgit v1.1 - diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template index e969026bfc9..1deb07eca60 100644 --- a/srcpkgs/fontconfig/template +++ b/srcpkgs/fontconfig/template @@ -1,18 +1,18 @@ -# Template build file for 'fontconfig'. +# Template file for 'fontconfig' pkgname=fontconfig -version=2.13.0 -revision=2 +version=2.13.1 +revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-docs --with-cache-dir=/var/cache/$pkgname" +configure_args="--disable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}" hostmakedepends="gperf pkg-config" makedepends="expat-devel freetype-devel libuuid-devel" conf_files="/etc/fonts/fonts.conf" short_desc="Library for configuring and customizing font access" maintainer="Juan RP " -homepage="http://www.fontconfig.org" license="MIT" -distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/$pkgname-$version.tar.bz2" -checksum=91dde8492155b7f34bb95079e79be92f1df353fcc682c19be90762fd3e12eeb9 +homepage="http://www.fontconfig.org" +distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.bz2" +checksum=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 pre_build() { # trick to regenerate hash functions :-)