fontconfig: Update to 2.12.1

5 files changed, 22 insertions, 92 deletions

diff --git a/recipes/fontconfig.recipe b/recipes/fontconfig.recipe
index 5bfcb989..10e71d62 100644
--- a/recipes/fontconfig.recipe
+++ b/recipes/fontconfig.recipe
@@ -4,16 +4,14 @@ from cerbero.utils import needs_xcode8_sdk_workaround
 
 class Recipe(recipe.Recipe):
     name = 'fontconfig'
-    version = '2.11.1'
+    version = '2.12.1'
     stype = SourceType.TARBALL
     url = 'http://www.freedesktop.org/software/fontconfig/release/fontconfig-%(version)s.tar.gz'
     licenses = [License.MIT]
     configure_options = '--disable-docs'
     deps = ['expat', 'freetype', 'zlib', 'bzip2']
     autoreconf = True
-    patches = ['fontconfig/0001-Ensure-we-use-our-installed-headers-instead-of-syste.patch',
-               'fontconfig/0002-Port-to-Android.patch',
-               'fontconfig/0003-configure-Allow-static-build.patch',
+    patches = ['fontconfig/0003-configure-Allow-static-build.patch',
                'fontconfig/0001-Do-not-build-tests-on-windows.patch',
                'fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch',
                ]
diff --git a/recipes/fontconfig/0001-Do-not-build-tests-on-windows.patch b/recipes/fontconfig/0001-Do-not-build-tests-on-windows.patch
index 0c6d194c..f640e02c 100644
--- a/recipes/fontconfig/0001-Do-not-build-tests-on-windows.patch
+++ b/recipes/fontconfig/0001-Do-not-build-tests-on-windows.patch
@@ -1,33 +1,30 @@
-From dfeb55ef3e21b562f02a857af5d7203d9c6d3754 Mon Sep 17 00:00:00 2001
+From 8092554e6e14be784267a3eb829a804092248a7d Mon Sep 17 00:00:00 2001
 From: Thibault Saunier <tsaunier@gnome.org>
 Date: Wed, 2 Apr 2014 10:09:29 +0200
 Subject: [PATCH] Do not build tests on windows
 
 ---
- Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ Makefile.am | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 2b949e4..4502bf6 100644
+index 2b4a5b8..4262789 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -23,11 +23,15 @@
+@@ -23,7 +23,12 @@
  
- SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
+ SUBDIRS=fontconfig fc-blanks fc-case fc-lang fc-glyphname src \
  	fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
 -	fc-validate conf.d test
 +	fc-validate conf.d
- if ENABLE_DOCS
- SUBDIRS += doc
- endif
- 
++
 +if !OS_WIN32
 +SUBDIRS += test
 +endif
 +
- ACLOCAL_AMFLAGS = -I m4
- 
- EXTRA_DIST = \
+ if ENABLE_DOCS
+ SUBDIRS += doc
+ endif
 -- 
-1.9.0
+2.11.0
 
diff --git a/recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch b/recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch
index bac1fa81..38e9d800 100644
--- a/recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch
+++ b/recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch
@@ -1,28 +1,28 @@
-From 6f510bf9c9b0f86c40b8f5afa05f409493d8f7b8 Mon Sep 17 00:00:00 2001
+From 176a2e59de2df7f94be610bf7511922c728bb5ec Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Wed, 15 Oct 2014 16:14:19 +0200
 Subject: [PATCH] Don't use _mktemp_s which is not available in XP
 
 ---
- configure.ac   |    2 +-
- src/fccompat.c |    4 ++--
+ configure.ac   | 2 +-
+ src/fccompat.c | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 135e95a..f014ecf 100644
+index 1b48d50..785afb3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -150,7 +150,7 @@ AC_TYPE_PID_T
+@@ -160,7 +160,7 @@ AC_TYPE_PID_T
  # Checks for library functions.
  AC_FUNC_VPRINTF
  AC_FUNC_MMAP
--AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink regcomp regerror regexec regfree fstatvfs fstatfs lstat])
-+AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink regcomp regerror regexec regfree fstatvfs fstatfs lstat])
+-AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat])
++AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat])
  
  dnl AC_CHECK_FUNCS doesn't check for header files.
  dnl posix_fadvise() may be not available in older libc.
 diff --git a/src/fccompat.c b/src/fccompat.c
-index f4f3f5f..68a70ff 100644
+index 31d80be..b34c46e 100644
 --- a/src/fccompat.c
 +++ b/src/fccompat.c
 @@ -152,8 +152,8 @@ FcMakeTempfile (char *template)
@@ -37,5 +37,5 @@ index f4f3f5f..68a70ff 100644
     fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600);
  #endif
 -- 
-1.7.10.msysgit.1
+2.11.0
 
diff --git a/recipes/fontconfig/0001-Ensure-we-use-our-installed-headers-instead-of-syste.patch b/recipes/fontconfig/0001-Ensure-we-use-our-installed-headers-instead-of-syste.patch
deleted file mode 100644
index e08a15e4..00000000
--- a/recipes/fontconfig/0001-Ensure-we-use-our-installed-headers-instead-of-syste.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8f427c0a0cbd900c4bf9b9083f0c6a10ff4a1224 Mon Sep 17 00:00:00 2001
-From: Josep Torra <n770galaxy@gmail.com>
-Date: Mon, 12 Mar 2012 11:14:48 +0100
-Subject: [PATCH 1/2] Ensure we use our installed headers instead of system one
- when building other stuff that depends on fontconfig.
-
----
- fontconfig.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fontconfig.pc.in b/fontconfig.pc.in
-index fa00a72..0c253d7 100644
---- a/fontconfig.pc.in
-+++ b/fontconfig.pc.in
-@@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@
- Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
- Libs: -L${libdir} -lfontconfig
- Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@
--Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@
-+Cflags: -I${includedir}/fontconfig @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@
--- 
-1.9.0
-
diff --git a/recipes/fontconfig/0002-Port-to-Android.patch b/recipes/fontconfig/0002-Port-to-Android.patch
deleted file mode 100644
index 11a029e4..00000000
--- a/recipes/fontconfig/0002-Port-to-Android.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 83364dec2aa93d1a416c06b97de98c11d997bd37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Wed, 22 Aug 2012 15:29:52 +0200
-Subject: [PATCH 2/2] Port to Android
-
----
- src/fcxml.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/fcxml.c b/src/fcxml.c
-index 91d166f..7776fa6 100644
---- a/src/fcxml.c
-+++ b/src/fcxml.c
-@@ -1314,7 +1314,9 @@ FcParseInt (FcConfigParse *parse)
- static double
- FcStrtod (char *s, char **end)
- {
-+#ifndef __BIONIC__
-     struct lconv    *locale_data;
-+#endif
-     char	    *dot;
-     double	    v;
- 
-@@ -1322,6 +1324,7 @@ FcStrtod (char *s, char **end)
-      * Have to swap the decimal point to match the current locale
-      * if that locale doesn't use 0x2e
-      */
-+#ifndef __BIONIC__
-     if ((dot = strchr (s, 0x2e)) &&
- 	(locale_data = localeconv ()) &&
- 	(locale_data->decimal_point[0] != 0x2e ||
-@@ -1358,6 +1361,7 @@ FcStrtod (char *s, char **end)
- 	}
-     }
-     else
-+#endif
- 	v = strtod (s, end);
-     return v;
- }
--- 
-1.9.0
-