Merge pull request #38 from pkgw/v2.13.1-and-msvc

V2.13.1 and msvc

.ci_support/win_target_platformwin-64.yaml

@@ -6,15 +6,21 @@ channel_targets:
 - conda-forge main
 freetype:
 - 2.9.1
+icu:
+- '58'
+libiconv:
+- '1.15'
 libpng:
 - 1.6.34
 libxml2:
 - '2.9'
-m2w64_c_compiler:
-- m2w64-toolchain
 pin_run_as_build:
   freetype:
     max_pin: x
+  icu:
+    max_pin: x
+  libiconv:
+    max_pin: x.x
   libpng:
     max_pin: x.x
   libxml2:

recipe/0001-Disable-test-bz106632.patch

@@ -0,0 +1,36 @@
+From 46ba4853753a4b173d4f74c6b89cf3c1fe0968ca Mon Sep 17 00:00:00 2001
+From: Peter Williams <peter@newton.cx>
+Date: Tue, 11 Sep 2018 12:50:30 -0400
+Subject: [PATCH 1/5] Disable test bz106632
+
+It fails on macOS and Windows.
+---
+ test/Makefile.am | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 79bcede..56129d7 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -79,18 +79,6 @@ test_hash_CFLAGS = -I$(top_builddir) -I$(top_builddir)/src $(UUID_CFLAGS)
+ test_hash_LDADD = $(UUID_LIBS)
+ TESTS += test-hash
+
+-check_PROGRAMS += test-bz106632
+-test_bz106632_CFLAGS =					\
+-	-I$(top_builddir)				\
+-	-I$(top_builddir)/src				\
+-	-I$(top_srcdir)					\
+-	-I$(top_srcdir)/src				\
+-	-DFONTFILE='"$(abs_top_srcdir)/test/4x6.pcf"'	\
+-	-DHAVE_CONFIG_H					\
+-	$(NULL)
+-test_bz106632_LDADD = $(top_builddir)/src/libfontconfig.la
+-TESTS += test-bz106632
+-
+ EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
+
+ CLEANFILES=out out1 out2 fonts.conf out.expected
+-- 
+2.17.1
+

recipe/0002-Disable-some-more-Windows-unfriendly-tests.patch

@@ -0,0 +1,37 @@
+From ed82c63c43018dc8c1270f12f6d667bafd232e4d Mon Sep 17 00:00:00 2001
+From: Peter Williams <peter@newton.cx>
+Date: Tue, 11 Sep 2018 12:51:29 -0400
+Subject: [PATCH 2/5] Disable some more Windows-unfriendly tests.
+
+---
+ test/Makefile.am | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 56129d7..93382de 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -11,7 +11,7 @@ AM_TESTS_ENVIRONMENT= \
+ BUILT_SOURCES = $(builddir)/out.expected
+
+ SH_LOG_COMPILER = sh
+-TESTS=run-test.sh
++TESTS=
+
+ TESTDATA =			\
+ 	4x6.pcf			\
+@@ -74,11 +74,6 @@ endif
+ check_PROGRAMS += test-bz106618
+ test_bz106618_LDADD = $(top_builddir)/src/libfontconfig.la
+
+-check_PROGRAMS += test-hash
+-test_hash_CFLAGS = -I$(top_builddir) -I$(top_builddir)/src $(UUID_CFLAGS)
+-test_hash_LDADD = $(UUID_LIBS)
+-TESTS += test-hash
+-
+ EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
+
+ CLEANFILES=out out1 out2 fonts.conf out.expected
+-- 
+2.17.1
+