[dia/wip/jtojnar/mac-integration] build: Re-add Mac GTK integration

[Jan Tojnar <jtojnar src gnome org>]

commit 7c4578d028aea3041ca2c7b551747e358d16f512
Author: Jan Tojnar <jtojnar gmail com>
Date:   Tue Apr 7 22:54:43 2020 +0200

    build: Re-add Mac GTK integration
    
    This was forgotten during Meson port.
    
    Co-Authored-By: Dmitry Kalinkin <dmitry kalinkin gmail com>

 app/interface.c |  2 +-
 app/meson.build |  2 +-
 meson.build     | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/app/interface.c b/app/interface.c
index 2ba87e85..7f86d5a6 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -1057,7 +1057,7 @@ _create_mac_integration (GtkWidget *menubar)
     gtk_widget_hide (menubar); /* not working, it's shown elsewhere */
     /* setup the dock icon */
     gtkosx_application_set_dock_icon_pixbuf (theOsxApp,
-       gdk_pixbuf_new_from_inline (-1, dia_app_icon, FALSE, NULL));
+       pixbuf_from_resource ("/org/gnome/Dia/icons/org.gnome.Dia.png"));
   }
   /* Don't quit without asking to save files first */
   g_signal_connect (theOsxApp, "NSApplicationBlockTermination",
diff --git a/app/meson.build b/app/meson.build
index 6690a247..c113bfaa 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -95,7 +95,7 @@ resources = gnome.compile_resources('dia-resources', 'dia.gresource.xml',
 
 diaapp_lib = both_libraries('diaapp',
                             dia_sources + [diamarshal_h, config_h],
-                            dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep],
+                            dependencies: [libgtk_dep, libxml_dep, libm_dep, libdia_dep, gtk_mac_dep],
                             link_args: dia_link_args,
                             export_dynamic: true,  # some plugins require this.
                             include_directories: [configuration_inc])
diff --git a/meson.build b/meson.build
index 3bf55e75..05c68fd1 100644
--- a/meson.build
+++ b/meson.build
@@ -33,6 +33,17 @@ conf.set('HAVE_OGDF', libogdf_dep.found())
 libxslt_dep = dependency('libxslt', required: false)
 conf.set('HAVE_XSLT', libxslt_dep.found())
 
+libgdk_dep  = dependency('gdk-2.0')
+gdk_target = libgdk_dep.get_pkgconfig_variable('target')
+
+if gdk_target == 'quartz'
+    gtk_mac_dep = dependency('gtk-mac-integration')
+    conf.set('HAVE_MAC_INTEGRATION', true)
+else
+    # non-dependency
+    gtk_mac_dep = dependency('', required: false)
+endif
+
 prefix = get_option('prefix')
 datadir = prefix / get_option('datadir')