[gtk/wip/nirbheek/gtk-3-24-meson] meson: win32 fixes

[Nirbheek Chauhan <nirbheekc src gnome org>]

commit e06cc8c32f6bc9b0f311a2d206e22c79f2e6a932
Author: Nirbheek Chauhan <nirbheek centricular com>
Date:   Tue Nov 20 16:38:35 2018 +0530

    meson: win32 fixes

 demos/gtk-demo/meson.build       | 3 +--
 demos/icon-browser/meson.build   | 1 -
 demos/widget-factory/meson.build | 1 -
 gdk/meson.build                  | 9 +++++++++
 gtk/meson.build                  | 7 -------
 testsuite/gtk/meson.build        | 9 +++++++--
 6 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index ee44a8530f..4a4489231a 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -75,7 +75,7 @@ gtkdemo_deps = [libgtk_dep]
 
 if harfbuzz_dep.found() and pangoft_dep.found()
   demos += files('font_features.c')
-  gtkdemo_deps += harfbuzz_dep
+  gtkdemo_deps += [harfbuzz_dep, pangoft_dep]
 endif
 
 if os_unix
@@ -108,6 +108,5 @@ gtkdemo = executable(
   gtkdemo_resources,
   dependencies: gtkdemo_deps,
   include_directories : confinc,
-  gui_app: true,
   install: true
 )
diff --git a/demos/icon-browser/meson.build b/demos/icon-browser/meson.build
index 661e5208c8..8bd7e9e5bb 100644
--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -17,6 +17,5 @@ iconbrowser = executable(
   iconbrowser_resources,
   dependencies: libgtk_dep,
   include_directories : confinc,
-  gui_app: true,
   install: true
 )
diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index 170a59e4bc..184a8abbb4 100644
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -15,6 +15,5 @@ widget_factory = executable(
   widgetfactory_resources,
   dependencies: libgtk_dep,
   include_directories : confinc,
-  gui_app: true,
   install: true
 )
diff --git a/gdk/meson.build b/gdk/meson.build
index 01b84788aa..8f3614f6a8 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -204,6 +204,15 @@ gdk_deps = [
   pangocairo_dep
 ]
 
+if win32_enabled
+  gdk_deps += [cc.find_library('advapi32'),
+               cc.find_library('comctl32'),
+               cc.find_library('dwmapi'),
+               cc.find_library('imm32'),
+               cc.find_library('setupapi'),
+               cc.find_library('winmm')]
+endif
+
 gdk_sources = [
   # Generated
   gdkconfig,
diff --git a/gtk/meson.build b/gtk/meson.build
index de3988cf42..9526c049f7 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -840,13 +840,6 @@ if win32_enabled
   gtk_cargs += []
   gtk_sources += gtk_use_win32_sources
   gtk_deps += [ giowin32_dep, pangowin32_dep ]
-
-  gtk_deps += [cc.find_library('advapi32'),
-               cc.find_library('comctl32'),
-               cc.find_library('dwmapi'),
-               cc.find_library('imm32'),
-               cc.find_library('setupapi'),
-               cc.find_library('winmm')]
 else
   gtk_deps += [ atkbridge_dep, ]
 endif
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index cf7d79fd09..ad1789c48c 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -15,7 +15,6 @@ tests = [
   ['cellarea'],
   ['check-icon-names'],
   ['check-cursor-names'],
-  ['clipboard'],
   ['cssprovider'],
   ['defaultvalue'],
   ['entry'],
@@ -31,7 +30,6 @@ tests = [
   ['notify'],
   ['no-gtk-init'],
   ['object'],
-  ['objects-finalize', ['../../gdk/x11/gdkdisplaymanager-x11.c'], ['-DGDK_COMPILATION', '-UG_ENABLE_DEBUG']],
   ['papersize'],
   ['rbtree', ['../../gtk/gtkrbtree.c'], ['-DGTK_COMPILATION', '-UG_ENABLE_DEBUG']],
   ['recentmanager'],
@@ -59,6 +57,13 @@ if os_unix
   test_cargs += ['-DHAVE_UNIX_PRINT_WIDGETS']
 endif
 
+if x11_enabled
+  tests += [
+    ['clipboard'],
+    ['objects-finalize', ['../../gdk/x11/gdkdisplaymanager-x11.c'], ['-DGDK_COMPILATION', 
'-UG_ENABLE_DEBUG']],
+  ]
+endif
+
 foreach t : tests
   test_name = t.get(0)
   test_srcs = ['@0@.c'.format(test_name)] + t.get(1, [])