GNOME.org
 

[gimp/meson: 111/112] Post-merge commit, backport autotools modifs

commit 79f44ddd1d81a116279c0716d3545f646c6a06c8
Author: Salamandar <felix piedallu me>
Date:   Fri Apr 20 16:06:27 2018 +0200

    Post-merge commit, backport autotools modifs

 app/core/meson.build                     |    4 +++-
 app/operations/meson.build               |    2 +-
 app/pdb/meson.build                      |    1 +
 app/tools/meson.build                    |    6 +++---
 build/windows/installer/lang/meson.build |    1 +
 cursors/meson.build                      |    2 +-
 icons/Legacy/meson.build                 |    4 ++--
 icons/meson.build                        |    8 ++++----
 libgimp/meson.build                      |    1 +
 meson.build                              |    6 +++---
 pdb/meson.build                          |    1 +
 11 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/app/core/meson.build b/app/core/meson.build
index f6d71dd..1583d15 100644
--- a/app/core/meson.build
+++ b/app/core/meson.build
@@ -70,14 +70,15 @@ libappcore_sources = [
   'gimpdata.c',
   'gimpdatafactory.c',
   'gimpdocumentlist.c',
-  'gimpdrawable-blend.c',
   'gimpdrawable-bucket-fill.c',
   'gimpdrawable-combine.c',
+  'gimpdrawable-edit.c',
   'gimpdrawable-equalize.c',
   'gimpdrawable-fill.c',
   'gimpdrawable-filters.c',
   'gimpdrawable-floating-selection.c',
   'gimpdrawable-foreground-extract.c',
+  'gimpdrawable-gradient.c',
   'gimpdrawable-histogram.c',
   'gimpdrawable-levels.c',
   'gimpdrawable-offset.c',
@@ -119,6 +120,7 @@ libappcore_sources = [
   'gimpimage-convert-type.c',
   'gimpimage-crop.c',
   'gimpimage-duplicate.c',
+  'gimpimage-fade.c',
   'gimpimage-flip.c',
   'gimpimage-grid.c',
   'gimpimage-guides.c',
diff --git a/app/operations/meson.build b/app/operations/meson.build
index 5abcc09..8cb2710 100644
--- a/app/operations/meson.build
+++ b/app/operations/meson.build
@@ -16,7 +16,6 @@ libappoperations_sources = [
   'gimpcurvesconfig.c',
   'gimphuesaturationconfig.c',
   'gimplevelsconfig.c',
-  'gimpoperationblend.c',
   'gimpoperationborder.c',
   'gimpoperationbrightnesscontrast.c',
   'gimpoperationbuffersourcevalidate.c',
@@ -29,6 +28,7 @@ libappoperations_sources = [
   'gimpoperationdesaturate.c',
   'gimpoperationequalize.c',
   'gimpoperationflood.c',
+  'gimpoperationgradient.c',
   'gimpoperationgrow.c',
   'gimpoperationhistogramsink.c',
   'gimpoperationhuesaturation.c',
diff --git a/app/pdb/meson.build b/app/pdb/meson.build
index 941b502..9367725 100644
--- a/app/pdb/meson.build
+++ b/app/pdb/meson.build
@@ -20,6 +20,7 @@ libappinternalprocs_sources = [
   'display-cmds.c',
   'drawable-cmds.c',
   'drawable-color-cmds.c',
+  'drawable-edit-cmds.c',
   'drawable-transform-cmds.c',
   'dynamics-cmds.c',
   'edit-cmds.c',
diff --git a/app/tools/meson.build b/app/tools/meson.build
index bdfb651..c2fe75e 100644
--- a/app/tools/meson.build
+++ b/app/tools/meson.build
@@ -11,9 +11,6 @@ libapptools_sources = [
   'gimpairbrushtool.c',
   'gimpalignoptions.c',
   'gimpaligntool.c',
-  'gimpblendoptions.c',
-  'gimpblendtool-editor.c',
-  'gimpblendtool.c',
   'gimpbrightnesscontrasttool.c',
   'gimpbrushtool.c',
   'gimpbucketfilloptions.c',
@@ -49,6 +46,9 @@ libapptools_sources = [
   'gimpfuzzyselecttool.c',
   'gimpgegltool.c',
   'gimpgenerictransformtool.c',
+  'gimpgradientoptions.c',
+  'gimpgradienttool-editor.c',
+  'gimpgradienttool.c',
   'gimpguidetool.c',
   'gimphandletransformoptions.c',
   'gimphandletransformtool.c',
diff --git a/build/windows/installer/lang/meson.build b/build/windows/installer/lang/meson.build
index 0b48c83..1c1917a 100644
--- a/build/windows/installer/lang/meson.build
+++ b/build/windows/installer/lang/meson.build
@@ -35,6 +35,7 @@ languages = [
   [ 'sl',   '[sl]',     'WINDOWS-1250', ],
   [ 'sv',   '[sv]',     'WINDOWS-1252', ],
   [ 'tr',   '[tr]',     'WINDOWS-1254', ],
+  [ 'zh_CN','[zh_CN]',  'WINDOWS-936',  ],
 ]
 
 extractlang = find_program('extractlang.sh')
diff --git a/cursors/meson.build b/cursors/meson.build
index b085989..01b6cbd 100644
--- a/cursors/meson.build
+++ b/cursors/meson.build
@@ -41,7 +41,6 @@ tool_cursors = [
   'modifier-zoom.png',
 
   'tool-airbrush.png',
-  'tool-blend.png',
   'tool-blur.png',
   'tool-bucket-fill.png',
   'tool-burn.png',
@@ -55,6 +54,7 @@ tool_cursors = [
   'tool-flip-vertical.png',
   'tool-free-select.png',
   'tool-fuzzy-select.png',
+  'tool-gradient.png',
   'tool-hand.png',
   'tool-heal.png',
   'tool-ink.png',
diff --git a/icons/Legacy/meson.build b/icons/Legacy/meson.build
index 43afa81..ac1dd59 100644
--- a/icons/Legacy/meson.build
+++ b/icons/Legacy/meson.build
@@ -147,7 +147,6 @@ legacy_icons_16 = [
   '16/gimp-toilet-paper.png',
   '16/gimp-tool-airbrush.png',
   '16/gimp-tool-align.png',
-  '16/gimp-tool-blend.png',
   '16/gimp-tool-blur.png',
   '16/gimp-tool-brightness-contrast.png',
   '16/gimp-tool-bucket-fill.png',
@@ -167,6 +166,7 @@ legacy_icons_16 = [
   '16/gimp-tool-foreground-select.png',
   '16/gimp-tool-free-select.png',
   '16/gimp-tool-fuzzy-select.png',
+  '16/gimp-tool-gradient.png',
   '16/gimp-tool-handle-transform.png',
   '16/gimp-tool-heal.png',
   '16/gimp-tool-hue-saturation.png',
@@ -266,7 +266,6 @@ legacy_tools_22 = [
   '22/gimp-gegl.png',
   '22/gimp-tool-airbrush.png',
   '22/gimp-tool-align.png',
-  '22/gimp-tool-blend.png',
   '22/gimp-tool-blur.png',
   '22/gimp-tool-brightness-contrast.png',
   '22/gimp-tool-bucket-fill.png',
@@ -286,6 +285,7 @@ legacy_tools_22 = [
   '22/gimp-tool-foreground-select.png',
   '22/gimp-tool-free-select.png',
   '22/gimp-tool-fuzzy-select.png',
+  '22/gimp-tool-gradient.png',
   '22/gimp-tool-handle-transform.png',
   '22/gimp-tool-heal.png',
   '22/gimp-tool-hue-saturation.png',
diff --git a/icons/meson.build b/icons/meson.build
index 49208d6..e0872c7 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -220,7 +220,6 @@ vector_scalable = [
   'scalable/gimp-toilet-paper.svg',
   'scalable/gimp-tool-airbrush.svg',
   'scalable/gimp-tool-align.svg',
-  'scalable/gimp-tool-blend.svg',
   'scalable/gimp-tool-blur.svg',
   'scalable/gimp-tool-brightness-contrast.svg',
   'scalable/gimp-tool-bucket-fill.svg',
@@ -242,6 +241,7 @@ vector_scalable = [
   'scalable/gimp-tool-foreground-select.svg',
   'scalable/gimp-tool-free-select.svg',
   'scalable/gimp-tool-fuzzy-select.svg',
+  'scalable/gimp-tool-gradient.svg',
   'scalable/gimp-tool-handle-transform.svg',
   'scalable/gimp-tool-heal.svg',
   'scalable/gimp-tool-hue-saturation.svg',
@@ -429,7 +429,6 @@ vector_24 = [
   '24/gimp-text-layer.svg',
   '24/gimp-tool-airbrush.svg',
   '24/gimp-tool-align.svg',
-  '24/gimp-tool-blend.svg',
   '24/gimp-tool-blur.svg',
   '24/gimp-tool-brightness-contrast.svg',
   '24/gimp-tool-bucket-fill.svg',
@@ -450,6 +449,7 @@ vector_24 = [
   '24/gimp-tool-foreground-select.svg',
   '24/gimp-tool-free-select.svg',
   '24/gimp-tool-fuzzy-select.svg',
+  '24/gimp-tool-gradient.svg',
   '24/gimp-tool-handle-transform.svg',
   '24/gimp-tool-heal.svg',
   '24/gimp-tool-hue-saturation.svg',
@@ -676,7 +676,6 @@ bitmap_16 = [
   '16/gimp-toilet-paper.png',
   '16/gimp-tool-airbrush.png',
   '16/gimp-tool-align.png',
-  '16/gimp-tool-blend.png',
   '16/gimp-tool-blur.png',
   '16/gimp-tool-brightness-contrast.png',
   '16/gimp-tool-bucket-fill.png',
@@ -698,6 +697,7 @@ bitmap_16 = [
   '16/gimp-tool-foreground-select.png',
   '16/gimp-tool-free-select.png',
   '16/gimp-tool-fuzzy-select.png',
+  '16/gimp-tool-gradient.png',
   '16/gimp-tool-handle-transform.png',
   '16/gimp-tool-heal.png',
   '16/gimp-tool-hue-saturation.png',
@@ -910,7 +910,6 @@ bitmap_24 = [
   '24/gimp-toilet-paper.png',
   '24/gimp-tool-airbrush.png',
   '24/gimp-tool-align.png',
-  '24/gimp-tool-blend.png',
   '24/gimp-tool-blur.png',
   '24/gimp-tool-brightness-contrast.png',
   '24/gimp-tool-bucket-fill.png',
@@ -930,6 +929,7 @@ bitmap_24 = [
   '24/gimp-tool-foreground-select.png',
   '24/gimp-tool-free-select.png',
   '24/gimp-tool-fuzzy-select.png',
+  '24/gimp-tool-gradient.png',
   '24/gimp-tool-handle-transform.png',
   '24/gimp-tool-heal.png',
   '24/gimp-tool-hue-saturation.png',
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 5c5588d..a725715 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -43,6 +43,7 @@ libgimp_top_pdbwrappers = [
   'gimpdisplay_pdb.c',
   'gimpdrawable_pdb.c',
   'gimpdrawablecolor_pdb.c',
+  'gimpdrawableedit_pdb.c',
   'gimpdrawabletransform_pdb.c',
   'gimpdynamics_pdb.c',
   'gimpedit_pdb.c',
diff --git a/meson.build b/meson.build
index a775490..6045d7f 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@
 project('gimp', ['c', 'cpp'], version: '2.10.0',
   meson_version: '>=0.44.0',
   default_options: [
-    'cpp_std=gnu++11',
+    'cpp_std=gnu++14',
     'sysconfdir=/etc',
     'localstatedir=/var',
     'sharedstatedir=/var/lib',
@@ -43,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-git'
+gimp_version  = gimp_version + '-RC2-git'
 
 gimp_command  = 'gimp-' + app_version
 gimp_api_name = 'gimp-' + api_version
@@ -256,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.31'
+gegl_minver       = '>=0.3.34'
 gegl              = dependency('gegl-0.3',           version: gegl_minver)
 
 gexiv2            = dependency('gexiv2',             version: '>=0.10.6')
diff --git a/pdb/meson.build b/pdb/meson.build
index 0a5e4c7..520a76e 100644
--- a/pdb/meson.build
+++ b/pdb/meson.build
@@ -12,6 +12,7 @@ pdb_names = [
   'debug',
   'display',
   'drawable_color',
+  'drawable_edit',
   'drawable_transform',
   'drawable',
   'dynamics',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]