[gimp/meson] –Fix build (Add missing Define, conditional build)

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

commit 717eaa445fa3ded7b3d978bf8e05cd01e22d3d65
Author: Félix Piédallu <felix piedallu me>
Date:   Mon Feb 12 23:24:47 2018 +0100

    –Fix build (Add missing Define, conditional build)

 build/archlinux/PKGBUILD    |   30 ++++++++++--------------------
 meson.build                 |    1 +
 plug-ins/common/meson.build |   27 +++++++++++++++++----------
 tools/meson.build           |   20 --------------------
 4 files changed, 28 insertions(+), 50 deletions(-)
---
diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD
index 40626f0..99c9de2 100644
--- a/build/archlinux/PKGBUILD
+++ b/build/archlinux/PKGBUILD
@@ -3,6 +3,7 @@
 # Contributor: Alessio Biancalana <dottorblaster gmail com>
 # Contributor: Salamandar <felix piedallu me>
 
+_pkgname='gimp'
 pkgname='gimp-meson-git'
 epoch=1
 pkgver=d9d1d1ab6c
@@ -78,26 +79,15 @@ prepare() {
 
 build() {
   mesonOptions=(
-    '--prefix=/usr'
-    '--sysconfdir=/etc'
-
-    '--buildtype=release'
-    '--strip'
-    '-Db_lto=true'
-
-    '-Denable-mp=true'
-    '-Denable-console-bin=true'
-    # '-Dwith-gimp-remote=true'
-    '-Dwith-python=true'
-    # '-Dwith-gif-compression=lzw'
-    # '-Dwith-libcurl=true'
-    '-Dwith-aa=false'
-    # '-Dwith-hal=false'
-    # '-Dwith-gvfs=false'
-    # '-Dwith-gnomevfs=false'
-
-    '-Dwith-webkit=false'
-    '-Dwith-xvfb-run=false'
+    --prefix=/usr
+    --sysconfdir=/etc
+    --buildtype=release
+    --strip
+    -Db_lto=true
+
+    -Dwith-aa=false
+    -Dwith-webkit=false
+    -Dwith-xvfb-run=false
   )
 
   meson    "${srcdir}/build" "${srcdir}/${_gitname}" "${mesonOptions[@]}"
diff --git a/meson.build b/meson.build
index 1a1272c..b23c542 100644
--- a/meson.build
+++ b/meson.build
@@ -789,6 +789,7 @@ config_defines = [
 
   # Names
   '-DGIMP_PACKAGE='         +'"'+ meson.project_name()  +'"',
+  '-DPACKAGE_NAME='         +'"'+ meson.project_name()  +'"',
   '-DPACKAGE_STRING='       +'"'+ package_string        +'"',
   '-DGIMP_COMMAND='         +'"'+ gimp_command          +'"',
 
diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
index 6fe873d..8834c53 100644
--- a/plug-ins/common/meson.build
+++ b/plug-ins/common/meson.build
@@ -271,11 +271,6 @@ common_exes_list = [
     [ gtk2, gegl, gdk_pixbuf, ],
   ],
   [
-    'file-xpm',
-    [ 'file-xpm.c', ],
-    [ gtk2, gegl, libxpm, ],
-  ],
-  [
     'file-xwd',
     [ 'file-xwd.c', ],
     [ gtk2, gegl, gdk_pixbuf, ],
@@ -447,6 +442,16 @@ common_exes_list = [
   ],
 ]
 
+if webkit.found()
+  common_exes_list += [
+    [
+      'web-page',
+      [ 'web-page.c', ],
+      [ gtk2, gegl, gdk_pixbuf, webkit, ],
+    ]
+  ]
+endif
+
 if wmf.found()
   common_exes_list += [
     [
@@ -456,6 +461,7 @@ if wmf.found()
     ],
   ]
 endif
+
 if xmc.found()
   common_exes_list += [
     [
@@ -466,15 +472,16 @@ if xmc.found()
   ]
 endif
 
-if webkit.found()
+if libxpm.found()
   common_exes_list += [
     [
-      'web-page',
-      [ 'web-page.c', ],
-      [ gtk2, gegl, gdk_pixbuf, webkit, ],
-    ]
+      'file-xpm',
+      [ 'file-xpm.c', ],
+      [ gtk2, gegl, libxpm, ],
+    ],
   ]
 endif
+
 foreach exe : common_exes_list
   exe_name = exe[0]
   exe_sources = exe[1]
diff --git a/tools/meson.build b/tools/meson.build
index 7ee6d8e..886866e 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -18,26 +18,6 @@ gimptool = executable('gimptool-' + api_version,
   install: true,
 )
 
-gimpdebug = executable('gimp-debug-tool-' + api_version,
-  [
-    '../app/gimp-version.c',
-    '../app/widgets/gimpcriticaldialog.c',
-    'gimpdebug.c',
-  ],
-  include_directories: [ rootInclude, appInclude, ],
-  dependencies: [
-    fontconfig,
-    gegl,
-    gio,
-    gtk2,
-  ],
-  link_with: [
-    libgimpbase,
-  ],
-  install: true,
-)
-
-
 executable('kernelgen',
   'kernelgen.c',
   include_directories: rootInclude,