[gimp/meson: 134/135] Backport master modifs to meson branch.

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

commit 4aefa2341b3f64266869458b692523f63662979b
Author: Salamandar <felix piedallu me>
Date:   Wed Apr 11 16:23:46 2018 +0200

    Backport master modifs to meson branch.

 app/core/meson.build    |    3 ++-
 app/display/meson.build |    1 +
 app/gegl/meson.build    |    2 +-
 app/paint/meson.build   |    3 ++-
 app/propgui/meson.build |    1 +
 app/tools/meson.build   |    1 +
 cursors/meson.build     |    2 ++
 desktop/meson.build     |    2 +-
 etc/meson.build         |    9 ++++++++-
 meson.build             |   32 ++++++++++++++++++++++----------
 themes/meson.build      |   26 +++++++++++---------------
 11 files changed, 52 insertions(+), 30 deletions(-)
---
diff --git a/app/core/meson.build b/app/core/meson.build
index f02fbf6..f6d71dd 100644
--- a/app/core/meson.build
+++ b/app/core/meson.build
@@ -27,6 +27,7 @@ libappcore_sources = [
   'gimp-memsize.c',
   'gimp-modules.c',
   'gimp-palettes.c',
+  'gimp-parallel.cc',
   'gimp-parasites.c',
   'gimp-spawn.c',
   'gimp-tags.c',
@@ -41,7 +42,7 @@ libappcore_sources = [
   'gimpboundary.c',
   'gimpbrush-boundary.c',
   'gimpbrush-load.c',
-  'gimpbrush-transform.c',
+  'gimpbrush-transform.cc',
   'gimpbrush.c',
   'gimpbrushcache.c',
   'gimpbrushclipboard.c',
diff --git a/app/display/meson.build b/app/display/meson.build
index bc8f763..482aef0 100644
--- a/app/display/meson.build
+++ b/app/display/meson.build
@@ -81,6 +81,7 @@ libappdisplay_sources = [
   'gimptoolcompass.c',
   'gimptooldialog.c',
   'gimptoolgui.c',
+  'gimptoolgyroscope.c',
   'gimptoolhandlegrid.c',
   'gimptoolline.c',
   'gimptoolpath.c',
diff --git a/app/gegl/meson.build b/app/gegl/meson.build
index a7a99fb..531e600 100644
--- a/app/gegl/meson.build
+++ b/app/gegl/meson.build
@@ -11,7 +11,7 @@ libappgegl_sources = [
   'gimp-babl.c',
   'gimp-gegl-apply-operation.c',
   'gimp-gegl-loops-sse2.c',
-  'gimp-gegl-loops.c',
+  'gimp-gegl-loops.cc',
   'gimp-gegl-mask-combine.c',
   'gimp-gegl-mask.c',
   'gimp-gegl-nodes.c',
diff --git a/app/paint/meson.build b/app/paint/meson.build
index e59ef75..7cfd4ff 100644
--- a/app/paint/meson.build
+++ b/app/paint/meson.build
@@ -11,6 +11,7 @@ libapppaint_sources = [
   'gimp-paint.c',
   'gimpairbrush.c',
   'gimpairbrushoptions.c',
+  'gimpbrushcore-loops.cc',
   'gimpbrushcore.c',
   'gimpclone.c',
   'gimpcloneoptions.c',
@@ -29,7 +30,7 @@ libapppaint_sources = [
   'gimpmybrushoptions.c',
   'gimpmybrushsurface.c',
   'gimppaintbrush.c',
-  'gimppaintcore-loops.c',
+  'gimppaintcore-loops.cc',
   'gimppaintcore-stroke.c',
   'gimppaintcore.c',
   'gimppaintcoreundo.c',
diff --git a/app/propgui/meson.build b/app/propgui/meson.build
index 035780e..baea92f 100644
--- a/app/propgui/meson.build
+++ b/app/propgui/meson.build
@@ -8,6 +8,7 @@ libapppropgui_sources = [
   'gimppropgui-eval.c',
   'gimppropgui-generic.c',
   'gimppropgui-hue-saturation.c',
+  'gimppropgui-panorama-projection.c',
   'gimppropgui-recursive-transform.c',
   'gimppropgui-shadows-highlights.c',
   'gimppropgui-spiral.c',
diff --git a/app/tools/meson.build b/app/tools/meson.build
index 5e5110b..bdfb651 100644
--- a/app/tools/meson.build
+++ b/app/tools/meson.build
@@ -72,6 +72,7 @@ libapptools_sources = [
   'gimpoperationtool.c',
   'gimppaintbrushtool.c',
   'gimppaintoptions-gui.c',
+  'gimppainttool-paint.c',
   'gimppainttool.c',
   'gimppenciltool.c',
   'gimpperspectiveclonetool.c',
diff --git a/cursors/meson.build b/cursors/meson.build
index d563f1b..b085989 100644
--- a/cursors/meson.build
+++ b/cursors/meson.build
@@ -36,7 +36,9 @@ tool_cursors = [
   'modifier-pattern.png',
   'modifier-plus.png',
   'modifier-resize.png',
+  'modifier-rotate.png',
   'modifier-select.png',
+  'modifier-zoom.png',
 
   'tool-airbrush.png',
   'tool-blend.png',
diff --git a/desktop/meson.build b/desktop/meson.build
index c784506..8d39fd4 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -61,7 +61,7 @@ appdatafile = custom_target(appdatafilename,
     '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
   ],
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata'),
+  install_dir: join_paths(get_option('datadir'), 'metainfo'),
 )
 
 metainfofilename = 'gimp-data-extras.metainfo.xml'
diff --git a/etc/meson.build b/etc/meson.build
index fb21c5a..ad11e05 100644
--- a/etc/meson.build
+++ b/etc/meson.build
@@ -1,7 +1,14 @@
+etcconf = configuration_data()
+
+
 install_data(
   [
     'controllerrc',
-    'gimprc',
+    configure_file(
+      input : 'gimprc.in',
+      output: 'gimprc',
+      configuration: etcconf,
+    ),
     'gtkrc',
     'menurc',
     'sessionrc',
diff --git a/meson.build b/meson.build
index 535b32b..4cea0c3 100644
--- a/meson.build
+++ b/meson.build
@@ -4,9 +4,10 @@
 project('gimp', ['c', 'cpp'], version: '2.10.0',
   meson_version: '>=0.44.0',
   default_options: [
+    'cpp_std=gnu++11',
     'sysconfdir=/etc',
     'localstatedir=/var',
-    'sharedstatedir=/var/lib'
+    'sharedstatedir=/var/lib',
   ],
 )
 
@@ -42,7 +43,7 @@ user_version  = '@0@.@1@'.format(major_version, minor_version)
 gimp_version  = '@0@.@1@.@2@'.format(major_version, minor_version, micro_version)
 
 # Override for Release-candidates
-gimp_version  = gimp_version + '-RC1'
+gimp_version  = gimp_version + '-RC1-git'
 
 gimp_command  = 'gimp-' + app_version
 gimp_api_name = 'gimp-' + api_version
@@ -237,7 +238,7 @@ math              = cc.find_library('m')
 
 atk               = dependency('atk',                version: '>=2.2.0')
 
-babl_minver       = '>=0.1.44'
+babl_minver       = '>=0.1.46'
 babl              = dependency('babl',               version: babl_minver)
 
 cairo_minver      = '>=1.12.2'
@@ -255,7 +256,7 @@ freetype2         = dependency('freetype2',          version: '>=2.1.7')
 gdk_pixbuf_minver = '>=2.30.8'
 gdk_pixbuf        = dependency('gdk-pixbuf-2.0',     version: gdk_pixbuf_minver)
 
-gegl_minver       = '>=0.3.30'
+gegl_minver       = '>=0.3.31'
 gegl              = dependency('gegl-0.3',           version: gegl_minver)
 
 gexiv2            = dependency('gexiv2',             version: '>=0.10.6')
@@ -908,29 +909,40 @@ if get_option('ansi')
   add_project_arguments('-ansi', '-pedantic', language: [ 'c', 'cpp', ])
 endif
 
-warning_cflags = [
+warning_cflags_common = [
   '-fdiagnostics-show-option',
   '-fno-common',
 
-  '-Wdeclaration-after-statement',
   '-Wformat-security',
   '-Winit-self',
   '-Wlogical-op',
   '-Wmissing-declarations',
   '-Wmissing-format-attribute',
-  '-Wold-style-definition',
   '-Wpointer-arith',
   '-Wreturn-type',
   '-Wtype-limits',
 
   # You can uncomment this to debug with less warning outputs
   # '-Wno-deprecated-declarations',
-  '-Wno-strict-prototypes',
 
   '-Werror=implicit-function-declaration',
 ]
-add_project_arguments(cc .get_supported_arguments(warning_cflags), language: 'c')
-add_project_arguments(cxx.get_supported_arguments(warning_cflags), language: 'cpp')
+warning_cflags_c = [
+  '-Wdeclaration-after-statement',
+  '-Wold-style-definition',
+  '-Wno-strict-prototypes',
+]
+warning_cflags_cpp = [
+]
+
+add_project_arguments(
+  cc .get_supported_arguments(warning_cflags_common + warning_cflags_c),
+  language: 'c'
+)
+add_project_arguments(
+  cxx.get_supported_arguments(warning_cflags_common + warning_cflags_cpp),
+  language: 'cpp'
+)
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
diff --git a/themes/meson.build b/themes/meson.build
index a161d96..d97c9af 100644
--- a/themes/meson.build
+++ b/themes/meson.build
@@ -1,25 +1,21 @@
 
-theme_names = [
-  [ 'Lighter',  '00-Lighter' ],
-  [ 'Light',    '01-Light' ],
-  [ 'Gray',     '02-Gray' ],
-  [ 'Dark',     '03-Dark' ],
-  [ 'Darker',   '04-Darker' ],
-  [ 'System',   'System' ],
+themes = [
+  'Dark',
+  'Light',
+  'Gray',
+  'System',
 ]
 
-foreach theme : theme_names
-  theme_srcdir = theme[0]
-  theme_bindir = theme[1]
+foreach theme : themes
   install_data(
-    join_paths(theme_srcdir, 'gtkrc'),
-    install_dir: join_paths(gimpdatadir, 'themes', theme_bindir)
+    join_paths(theme, 'gtkrc'),
+    install_dir: join_paths(gimpdatadir, 'themes', theme)
   )
 
-  if run_command('[', '-d', join_paths(theme_srcdir, 'ui'), ']').returncode() == 0
+  if run_command('[', '-d', join_paths(theme, 'ui'), ']').returncode() == 0
     install_subdir(
-      join_paths(theme_srcdir, 'ui'),
-      install_dir: join_paths(gimpdatadir, 'themes', theme_bindir)
+      join_paths(theme, 'ui'),
+      install_dir: join_paths(gimpdatadir, 'themes', theme)
     )
   endif
 endforeach