[gimp/meson: 112/112] Fix mypaint_brushes use. Wno-deprecated-declarations.

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

commit 5f46b1a4fc6ad1c9ea88316a9aa3f97b3c703905
Author: Salamandar <felix piedallu me>
Date:   Fri Apr 20 16:42:19 2018 +0200

    Fix mypaint_brushes use. Wno-deprecated-declarations.

 app/config/meson.build |    2 +-
 meson.build            |   10 ++++++----
 meson_options.txt      |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/app/config/meson.build b/app/config/meson.build
index d811a68..9409152 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -31,7 +31,7 @@ libappconfig = static_library('appconfig',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: [ '-DG_LOG_DOMAIN="Gimp-Config"', ],
   dependencies: [
-    cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2, libmypaint, libmypaint_brushes,
+    cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2, libmypaint,
   ],
 )
 
diff --git a/meson.build b/meson.build
index 6045d7f..cfd5d52 100644
--- a/meson.build
+++ b/meson.build
@@ -277,15 +277,17 @@ lcms              = dependency('lcms2',              version: '>=2.8')
 
 libmypaint_name   = platform_win32 ? 'libmypaint' : 'libmypaint-1.3'
 libmypaint        = dependency(libmypaint_name,      version: '>=1.3.0')
-libmypaint_brushes= dependency('mypaint-brushes-1.0',required: false)
 
 libmypaint_brushes_bundled = get_option('with-bundled-mypaint-brushes')
 conf.set('ENABLE_BUNDLED_MYPAINT_BRUSHES', libmypaint_brushes_bundled)
 
 if libmypaint_brushes_bundled
+  libmypaint_brushes = dependency('', required: false)
   libmypaint_brushes_dir = join_paths(
-    '${gimp_installation_dir}', 'share', 'mypaint-data', '1.0', 'brushes')
-elif libmypaint_brushes.found()
+    '${gimp_installation_dir}', 'share', 'mypaint-data', '1.0', 'brushes'
+  )
+else
+  libmypaint_brushes= dependency('mypaint-brushes-1.0',version: '>=1.3.0', required: false)
   libmypaint_brushes_dir = libmypaint_brushes.get_pkgconfig_variable('brushesdir')
 endif
 conf.set_quoted('MYPAINT_BRUSHES_DIR', libmypaint_brushes_dir)
@@ -927,7 +929,7 @@ warning_cflags_common = [
   '-Wtype-limits',
 
   # You can uncomment this to debug with less warning outputs
-  # '-Wno-deprecated-declarations',
+  '-Wno-deprecated-declarations',
 
   '-Werror=implicit-function-declaration',
 ]
diff --git a/meson_options.txt b/meson_options.txt
index 02e8dee..4921f2c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,7 +8,7 @@ option('windows-installer', type: 'boolean', value: false,description: 'Generate
 option('with-aa',           type: 'boolean', value: true, description: 'AA plugin')
 option('with-alsa',         type: 'boolean', value: true, description: 'Alsa support in midi input 
controller')
 option('with-appdata-test', type: 'boolean', value: true, description: 'Validate the appdata file')
-option('with-bundled-mypaint-brushes', type: 'boolean', value: true, description: 'Treat MyPaint brushes as 
bundled in the install prefix')
+option('with-bundled-mypaint-brushes', type: 'boolean', value: false, description: 'Treat MyPaint brushes as 
bundled in the install prefix')
 option('with-cairo-pdf',    type: 'boolean', value: true, description: 'Cairo-pdf support')
 option('with-directx-sdk',  type: 'string',  value: '',   description: 'Prefix where the DirectX SDK is 
installed(optional)')
 option('with-ghostscript',  type: 'boolean', value: true, description: 'Ghostscript support')