meson, macos: missing libraries and directories

These changes make it possible to build against homebrew for mac
libraries. Homebrew stores it's libraries in seperate folders and so
blanket includes were not working.

PYTHONPATH is not needed and interferes with homebrew build.

app/dialogs/meson.build

@@ -76,7 +76,9 @@ libappdialogs = static_library('appdialogs',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Dialogs"',
   dependencies: [
-    gegl, gtk3,
     appstream_glib,
+    gegl,
+    gexiv2,
+    gtk3,
   ],
 )

app/display/gimpcanvasbufferpreview.c

@@ -22,7 +22,7 @@
 
 #include <gegl.h>
 #include <gtk/gtk.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"

app/display/meson.build

@@ -114,6 +114,6 @@ libappdisplay = static_library('appdisplay',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Display"',
   dependencies: [
-    gegl, gtk3,
+    gegl, gtk3, cairo,
   ],
 )

app/meson.build

@@ -68,7 +68,7 @@ libapp = static_library('app',
   include_directories: [ rootInclude, rootAppInclude, configInclude, ],
   c_args: [ '-DG_LOG_DOMAIN="Gimp"', '-DGIMP_APP_GLUE_COMPILATION', ],
   dependencies: [
-    gegl, gdk_pixbuf, gtk3,
+    gdk_pixbuf, gegl, gexiv2, gtk3,
   ],
 )
 
@@ -89,6 +89,7 @@ endif
 
 libapp_dep = declare_dependency(
   dependencies: [
+    cairo,
     dbghelp,
     drmingw,
     gegl,

meson.build

@@ -1018,7 +1018,11 @@ endif
 
 # Check for GTK Mac Integration
 if platform_osx and (gtk3.get_pkgconfig_variable('targets').contains('quartz'))
-  gtk3_macos = dependency('gtk-mac-integration', version: '>=2.0.0')
+  # Support for homebrew version of gtk-mac-integration
+  gtk3_macos = dependency('gtk-mac-integration-gtk3', version: '>=3.0.1', required: false)
+  if not gtk3_macos.found()
+    gtk3_macos = dependency('gtk-mac-integration', version: '>=3.0.1')
+  endif
 else
   gtk3_macos = no_dep
 endif