Merge branch 'amos/win32-static-build' into 'master'

Set CAIRO_WIN32_STATIC_BUILD when doing a static build on windows

See merge request cairo/cairo!265

src/meson.build

@@ -307,9 +307,15 @@ libcairo = library('cairo', cairo_sources,
 
 cairo_headers += [configure_file(output: 'cairo-features.h', configuration: feature_conf)]
 
+cairo_static_args = []
+if get_option('default_library') == 'static' and host_machine.system() == 'windows'
+  cairo_static_args += ['-DCAIRO_WIN32_STATIC_BUILD']
+endif
+
 libcairo_dep = declare_dependency(link_with: libcairo,
   dependencies: deps,
-  include_directories: incsrc
+  include_directories: incsrc,
+  compile_args: cairo_static_args,
 )
 
 pkgmod.generate(libcairo,

subprojects/expat.wrap

@@ -3,7 +3,9 @@ directory = expat-2.2.9
 source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz
 source_filename = expat-2.2.9.tar.bz2
 source_hash = 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/expat/2.2.9/3/get_zip
-patch_filename = expat-2.2.9-3-wrap.zip
-patch_hash = e9aaace62e9a158b5e96f5c38c9f81f369179206acd87697653d777c0d3975d3
+patch_filename = expat_2.2.9-4_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.2.9-4/get_patch
+patch_hash = 8337fcf3928bbf9048a1a6a93b41a55588a5c9838a860bcc7c57f0e2a9517e95
 
+[provide]
+expat = expat_dep
\ No newline at end of file