[gimp/meson: 782/805] Fix Windows build: missing dependency (pangoft2, mypaint-brushes)

[Félix Piédallu <fpiedallu src gnome org>]

commit e6aaa4e18b1cc4fad5e2c4c040474783d8416402
Author: Félix Piédallu <felix piedallu me>
Date:   Tue Jan 30 14:12:50 2018 +0100

    Fix Windows build: missing dependency (pangoft2, mypaint-brushes)

 app/config/meson.build           |    6 +++++-
 app/meson.build                  |    2 +-
 app/operations/tests/meson.build |    2 +-
 app/tests/meson.build            |    2 +-
 app/text/meson.build             |    2 +-
 meson.build                      |    8 ++++++--
 6 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/app/config/meson.build b/app/config/meson.build
index ef5d150..805ff41 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -26,6 +26,10 @@ libappconfig_sources = [
   appconfigenums,
 ]
 
+mypaint_args = libmypaint_brushes.found() ? [] : [
+  '-DMYPAINT_BRUSHES_DIR="@0@"'.format(mypaint_brushes_dir),
+]
+
 libappconfig = static_library('appconfig',
   libappconfig_sources,
   include_directories: [ rootInclude, rootAppInclude, ],
@@ -73,4 +77,4 @@ test('app-config',
     install: false,
   ),
   suite: 'app'
-)
\ No newline at end of file
+)
diff --git a/app/meson.build b/app/meson.build
index c114077..c4101e3 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -146,7 +146,7 @@ app_gui_links = [
 ]
 
 app_deps = [
-  gio, gtk2, pangocairo, gegl, lcms, gexiv2,
+  gio, gtk2, pangocairo, pangoft2, gegl, lcms, gexiv2,
 ]
 
 # Executables
diff --git a/app/operations/tests/meson.build b/app/operations/tests/meson.build
index 52a759c..65bc8b6 100644
--- a/app/operations/tests/meson.build
+++ b/app/operations/tests/meson.build
@@ -4,7 +4,7 @@ executable('test-operations',
   include_directories: [ rootInclude, rootAppInclude, ],
 
   dependencies: [
-    cairo, gegl, gdk_pixbuf, glib, pangocairo,
+    cairo, gegl, gdk_pixbuf, glib, pangocairo, pangoft2,
   ],
   build_by_default: false,
 )
diff --git a/app/tests/meson.build b/app/tests/meson.build
index d8bee9c..6002304 100644
--- a/app/tests/meson.build
+++ b/app/tests/meson.build
@@ -3,7 +3,7 @@ apptests_includes = [
   rootInclude, rootAppInclude
 ]
 apptests_deps = [
-  pangocairo, gtk2, dbus_glib, gegl,
+  pangocairo, pangoft2, gtk2, dbus_glib, gegl,
 ]
 apptests_links = [
   libapp,
diff --git a/app/text/meson.build b/app/text/meson.build
index bad3648..a6ae8f5 100644
--- a/app/text/meson.build
+++ b/app/text/meson.build
@@ -33,6 +33,6 @@ libapptext = static_library('apptext',
     '-DG_LOG_DOMAIN="Gimp-Text"',
   ],
   dependencies: [
-    gegl, gdk_pixbuf, harfbuzz, pangocairo,
+    gegl, gdk_pixbuf, harfbuzz, pangocairo, pangoft2,
   ],
 )
diff --git a/meson.build b/meson.build
index 9b89dbb..fcee026 100644
--- a/meson.build
+++ b/meson.build
@@ -154,12 +154,16 @@ harfbuzz          = dependency('harfbuzz',           version: '>=0.9.19')
 lcms              = dependency('lcms2',              version: '>=2.8')
 
 libmypaint_name   = platform_win32 ? 'libmypaint' : 'libmypaint-1.3'
-libmypaint      = [ dependency(libmypaint_name,     version: '>=1.3.0'),
-                    dependency('mypaint-brushes-1.0', required: false) ]
+libmypaint        = dependency(libmypaint_name,      version: '>=1.3.0')
+libmypaint_brushes= dependency('mypaint-brushes-1.0',required: false)
 pangocairo        = dependency('pangocairo',         version: '>=1.29.4')
+pangoft2          = dependency('pangoft2',           version: '>=1.29.4')
 rsvg              = dependency('librsvg-2.0',        version: '>=2.40.6')
 
 # xgettext           = dependency('xgettext',           version: '>=0.19')
+if not libmypaint_brushes.found()
+  mypaint_brushes_dir = '/usr/share/mypaint-data/1.0/brushes'
+endif
 
 ################################################################################
 # Check for GLib Networking