From e25a2f95b3d1f39c5abc208d797f6c065d67713e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 22 May 2018 17:20:56 -0400
Subject: [PATCH] Revert "Meson: Fix cocoa and carbon support"

This reverts commit 2e3769a4f79e563a4a0630587a7c486919cf3d88.
---
 gio/meson.build |  8 +++---
 meson.build     | 66 ++++++++++++++++++++-----------------------------
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/gio/meson.build b/gio/meson.build
index b8baaa639..8d542bcfe 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -417,11 +417,10 @@ if host_system != 'windows'
     contenttype_sources += files('gcontenttype.c')
     appinfo_sources += files('gdesktopappinfo.c')
     gio_unix_include_headers += files('gdesktopappinfo.h')
+    subdir('xdgmime')
+    internal_deps += [xdgmime_lib]
   endif
 
-  subdir('xdgmime')
-  internal_deps += [xdgmime_lib]
-
   install_headers(gio_unix_include_headers, subdir : 'gio-unix-2.0/gio')
 
   if glib_conf.has('HAVE_NETLINK')
@@ -795,7 +794,6 @@ libgio = library('gio-2.0',
                   libgobject_dep, libgmodule_dep, selinux_dep, xattr_dep,
                   platform_deps, network_libs],
   c_args : gio_c_args,
-  objc_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
   link_args : [noseh_link_args, glib_link_flags],
 )
@@ -941,7 +939,7 @@ executable('gdbus', 'gdbus-tool.c',
   link_args : noseh_link_args,
   dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
 
-if host_system != 'windows' and not glib_have_cocoa
+if host_system != 'windows'
   executable('gapplication', 'gapplication-tool.c',
     install : true,
     c_args : gio_c_args,
diff --git a/meson.build b/meson.build
index b36b177e6..f0ffe77a5 100644
--- a/meson.build
+++ b/meson.build
@@ -572,49 +572,37 @@ if host_system == 'linux'
 endif
 
 osx_ldflags = []
+
+# Mac OS X Carbon support
+glib_have_carbon = cc.compiles('''#include <Carbon/Carbon.h>
+                                  #include <CoreServices/CoreServices.h>''',
+                               name : 'Mac OS X Carbon support')
+
 glib_have_os_x_9_or_later = false
-glib_have_carbon = false
-glib_have_cocoa = false
-if host_system == 'darwin'
-  add_languages('objc')
-  objcc = meson.get_compiler('objc')
 
-  # FIXME: Should this be conditional? glib-gettext.m4 has some checks
-  osx_ldflags += ['-Wl,-framework,CoreFoundation']
-
-  # Mac OS X Carbon support
-  glib_have_carbon = objcc.compiles('''#include <Carbon/Carbon.h>
-                                       #include <CoreServices/CoreServices.h>''',
-                                    name : 'Mac OS X Carbon support')
-
-  if glib_have_carbon
-    glib_conf.set('HAVE_CARBON', true)
-    osx_ldflags += '-Wl,-framework,Carbon'
-    glib_have_os_x_9_or_later = objcc.compiles('''#include <AvailabilityMacros.h>
-                                                  #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-                                                  #error Compiling for minimum OS X version before 10.9
-                                                  #endif''',
-                                               name : 'OS X 9 or later')
-  endif
-
-  # Mac OS X Cocoa support
-  glib_have_cocoa = objcc.compiles('''#include <Cocoa/Cocoa.h>
-                                      #ifdef GNUSTEP_BASE_VERSION
-                                      #error "Detected GNUstep, not Cocoa"
-                                      #endif''',
-                                   name : 'Mac OS X Cocoa support')
-
-  if glib_have_cocoa
-    glib_conf.set('HAVE_COCOA', true)
-    osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-  endif
-
-  # FIXME: libgio mix C and objC source files and there is no way to reliably
-  # know which language flags it's going to use to link. Add to both languages
-  # for now. See https://github.com/mesonbuild/meson/issues/3585.
-  add_project_link_arguments(osx_ldflags, language : ['objc', 'c'])
+if glib_have_carbon
+  glib_conf.set('HAVE_CARBON', true)
+  osx_ldflags += '-Wl,-framework,Carbon'
+  glib_have_os_x_9_or_later = cc.compiles('''#include <AvailabilityMacros.h>
+                                             #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+                                             #error Compiling for minimum OS X version before 10.9
+                                             #endif''', name : 'OS X 9 or later')
 endif
 
+# Mac OS X Cocoa support
+glib_have_cocoa = cc.compiles('''#include <Cocoa/Cocoa.h>
+                                 #ifdef GNUSTEP_BASE_VERSION
+                                 #error "Detected GNUstep, not Cocoa"
+                                 #endif''',
+                              name : 'Mac OS X Cocoa support')
+
+if glib_have_cocoa
+  glib_conf.set('HAVE_COCOA', true)
+  osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
+endif
+
+add_project_link_arguments(osx_ldflags, language : 'c')
+
 # Check for futex(2)
 if cc.links('''#include <linux/futex.h>
                #include <sys/syscall.h>