From 0150d47204ecf1e9c3d3b88a3331ab3bbf6c40d8 Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <sebastian@ramacher.at>
Date: Tue, 5 Jan 2021 09:46:31 +0100
Subject: [PATCH] Refactor Gtk OSX Application support

---
 meson.build                | 14 +++++---------
 zathura/main.c             |  5 ++++-
 zathura/os-dependency.h.in |  8 --------
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 zathura/os-dependency.h.in

diff --git a/meson.build b/meson.build
index c7d060a..0066bad 100644
--- a/meson.build
+++ b/meson.build
@@ -50,7 +50,6 @@ build_dependencies = [libm, girara, glib, gio, gthread, gmodule, gtk3, cairo]
 if host_machine.system() == 'darwin'
     gtk_mac_integration = dependency('gtk-mac-integration-gtk3')
     build_dependencies += gtk_mac_integration
-    conf_data.set('GTKOSXAPPLICATION', true)
 endif
 
 
@@ -62,6 +61,10 @@ defines = [
   '-D_DEFAULT_SOURCE',
 ]
 
+if host_machine.system() == 'darwin'
+  defines += '-DGTKOSXAPPLICATION'
+endif
+
 # compile flags
 flags = [
   '-Werror=implicit-function-declaration',
@@ -109,12 +112,6 @@ version_header = configure_file(
   configuration: conf_data
 )
 
-os_dependency_header = configure_file(
-  input: 'zathura/os-dependency.h.in',
-  output: 'zathura-os-dependency.h',
-  configuration: conf_data
-)
-
 include_directories = [
   include_directories('.')
 ]
@@ -157,7 +154,7 @@ sources = files(
 sources += zathura_resources
 sources += additional_sources
 
-# header fiels to install
+# header files to install
 headers = files(
   'zathura/document.h',
   'zathura/links.h',
@@ -167,7 +164,6 @@ headers = files(
   'zathura/types.h',
 )
 headers += version_header
-headers += os_dependency_header
 
 # zathura helper library
 libzathura = static_library('zathura',
diff --git a/zathura/main.c b/zathura/main.c
index 1cfd6cb..8134e89 100644
--- a/zathura/main.c
+++ b/zathura/main.c
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: Zlib */
 
-#include "zathura-os-dependency.h"
+#ifdef GTKOSXAPPLICATION
+#include <gtkosxapplication.h>
+#endif
+
 #include <girara/settings.h>
 #include <girara/log.h>
 
diff --git a/zathura/os-dependency.h.in b/zathura/os-dependency.h.in
deleted file mode 100644
index 2a71da4..0000000
--- a/zathura/os-dependency.h.in
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: Zlib */
-
-#mesondefine GTKOSXAPPLICATION
-
-#ifdef GTKOSXAPPLICATION
-#include <gtkosxapplication.h>
-#endif
-