[gimp/meson] Fix build, pkgbuild.

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

commit 06943b8d4bc85e9cc80bbacd3e06b960a314cbbc
Author: Félix Piédallu <felix piedallu me>
Date:   Thu Feb 15 10:53:21 2018 +0100

    Fix build, pkgbuild.

 build/mingw/PKGBUILD |   14 +++++++-------
 meson.build          |    8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/build/mingw/PKGBUILD b/build/mingw/PKGBUILD
index 6b76eaf..90f6bf6 100644
--- a/build/mingw/PKGBUILD
+++ b/build/mingw/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname='gimp'
 pkgname="${MINGW_PACKAGE_PREFIX}-${_pkgname}-git"
 epoch=1
-pkgver=d9d1d1ab6c
+pkgver=2ca726dd32
 pkgrel=1
 pkgdesc='GNU Image Manipulation Program'
 arch=('i686' 'x86_64')
@@ -39,17 +39,17 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-poppler>=0.12.4"
 )
 optdepends=(
-  "${MINGW_PACKAGE_PREFIX}-alsa-lib: for MIDI event controller module"
+  # "${MINGW_PACKAGE_PREFIX}-alsa-lib: for MIDI event controller module"
   "${MINGW_PACKAGE_PREFIX}-curl: for URI support"
   "${MINGW_PACKAGE_PREFIX}-ghostscript: for postscript support"
-  "${MINGW_PACKAGE_PREFIX}-gutenprint: for sophisticated printing only as gimp has built-in cups print 
support"
+  # "${MINGW_PACKAGE_PREFIX}-gutenprint: for sophisticated printing only as gimp has built-in cups print 
support"
   "${MINGW_PACKAGE_PREFIX}-poppler-glib: for pdf support"
 )
 options=('!libtool')
-provides=('gimp')
-conflicts=('gimp')
+provides=("${MINGW_PACKAGE_PREFIX}-${_pkgname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-${_pkgname}")
 
-_gitname='gimp_mesonport'
+_gitname='gimp'
 source=(
   'git://git.gnome.org/gimp#branch=meson'
   'linux.gpl'
@@ -101,7 +101,7 @@ build() {
     -Dwith-screenshot=false
     -Dwith-vala=false
     -Dwith-wmf=false
-    -Dwith-xmc=false
+    -Dwith-xcursor=false
     -Dwith-xpm=false
   )
 
diff --git a/meson.build b/meson.build
index 0350d26..3acd2a5 100644
--- a/meson.build
+++ b/meson.build
@@ -357,10 +357,10 @@ conf.set('HAVE_LIBSOCKET', libsocket.found())
 
 drmingw = dependency('', required: false)
 if platform_win32
-  exchndl_ld = cc.find_library('exchndl')
+  exchndl = cc.find_library('exchndl')
   exchndl_fn = cc.has_function('ExcHndlSetLogFileNameA', dependencies: exchndl)
-  if exchndl_ld.found() and exchndl_fn
-    drmingw = declare_dependency(link_with: exchndl_ld)
+  if exchndl.found() and exchndl_fn
+    drmingw = declare_dependency(dependencies: exchndl)
   endif
 endif
 conf.set('HAVE_EXCHNDL', drmingw.found())
@@ -930,7 +930,7 @@ add_project_arguments(
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
-if platform_win32 and cc.get_id() == gcc
+if platform_win32 and cc.get_id() == 'gcc'
   msvc_compat_args = cc.first_supported_argument([
     '-fnative-struct',
     '-mms-bitfielads',