Revert "first changes for macOS"

Author: dterrahe

DefineOptions.cmake

@@ -44,8 +44,8 @@ else ()
     set(TESTBUILD_OPENCL_PROGRAMS OFF)
 endif ()
 
-# if(APPLE)
-#     option(USE_MAC_INTEGRATION "Enable macOS integration" ON)
-# else(APPLE)
-#     set(USE_MAC_INTEGRATION OFF)
-# endif(APPLE)
+if(APPLE)
+    option(USE_MAC_INTEGRATION "Enable macOS integration" ON)
+else(APPLE)
+    set(USE_MAC_INTEGRATION OFF)
+endif(APPLE)

build.sh

@@ -35,7 +35,7 @@ CMAKE_OPTIONS_FROM_CMDLINE=""
 
 PRINT_HELP=0
 
-FEATURES="CAMERA COLORD GRAPHICSMAGICK IMAGEMAGICK JXL KWALLET LIBSECRET LUA MAP OPENCL OPENEXR OPENMP UNITY WEBP"
+FEATURES="CAMERA COLORD GRAPHICSMAGICK IMAGEMAGICK JXL KWALLET LIBSECRET LUA MAC_INTEGRATION MAP OPENCL OPENEXR OPENMP UNITY WEBP"
 
 # prepare a lowercase version with a space before and after
 # it's very important for parse_feature, has no impact in for loop expansions

cmake/modules/FindMacIntegration.cmake

@@ -0,0 +1,27 @@
+# - Find the native GtkOSXApplication includes and library
+#
+# This module defines
+#  MacIntegration_INCLUDE_DIR, where to find gtkosxapplication.h, etc.
+#  MacIntegration_LIBRARIES, the libraries to link against to use GtkOSXApplication.
+#  MacIntegration_FOUND, If false, do not try to use GtkOSXApplication.
+
+#=============================================================================
+# Copyright 2010 henrik andersson
+#=============================================================================
+
+find_path(MACINTEGRATION_INCLUDE_DIR gtkosxapplication.h PATH_SUFFIXES gtkmacintegration gtkmacintegration-gtk3 gtkmacintegration-gtk3/gtkmacintegration)
+mark_as_advanced(MACINTEGRATION_INCLUDE_DIR)
+
+set(MACINTEGRATION_NAMES ${MACINTEGRATION_NAMES} gtkmacintegration libgtkmacintegration gtkmacintegration-gtk3 libgtkmacintegration-gtk3 PATH_SUFFIXES gtkmacintegration-gtk3)
+find_library(MACINTEGRATION_LIBRARY NAMES ${MACINTEGRATION_NAMES})
+mark_as_advanced(MACINTEGRATION_LIBRARY)
+
+# handle the QUIETLY and REQUIRED arguments and set MacIntegration_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MacIntegration DEFAULT_MSG MACINTEGRATION_LIBRARY MACINTEGRATION_INCLUDE_DIR)
+
+IF(MacIntegration_FOUND)
+  SET(MacIntegration_LIBRARIES ${MACINTEGRATION_LIBRARY})
+  SET(MacIntegration_INCLUDE_DIRS ${MACINTEGRATION_INCLUDE_DIR})
+ENDIF(MacIntegration_FOUND)

src/CMakeLists.txt

@@ -530,20 +530,20 @@ if(WIN32)
   add_definitions("-DHAVE_WINDOWS_CREDENTIALS")
 endif(WIN32)
 
-# if(USE_MAC_INTEGRATION)
-#   find_package(MacIntegration)
-#   if(MacIntegration_FOUND)
-#     include_directories(SYSTEM ${MacIntegration_INCLUDE_DIRS})
-#     list(APPEND LIBS ${MacIntegration_LIBRARIES})
-#     add_definitions("-DMAC_INTEGRATION")
-#     find_package(P11Kit)
-#     if(P11Kit_FOUND)
-#       include_directories(SYSTEM ${P11Kit_INCLUDE_DIRS})
-#       list(APPEND LIBS ${P11Kit_LINK_LIBRARIES})
-#       add_definitions("-DHAVE_P11KIT")
-#     endif()
-#   endif(MacIntegration_FOUND)
-# endif(USE_MAC_INTEGRATION)
+if(USE_MAC_INTEGRATION)
+  find_package(MacIntegration)
+  if(MacIntegration_FOUND)
+    include_directories(SYSTEM ${MacIntegration_INCLUDE_DIRS})
+    list(APPEND LIBS ${MacIntegration_LIBRARIES})
+    add_definitions("-DMAC_INTEGRATION")
+    find_package(P11Kit)
+    if(P11Kit_FOUND)
+      include_directories(SYSTEM ${P11Kit_INCLUDE_DIRS})
+      list(APPEND LIBS ${P11Kit_LINK_LIBRARIES})
+      add_definitions("-DHAVE_P11KIT")
+    endif()
+  endif(MacIntegration_FOUND)
+endif(USE_MAC_INTEGRATION)
 
 if(USE_UNITY)
   find_package(Unity)

src/common/darktable.h

@@ -1427,7 +1427,6 @@ typedef union GdkEventOld
 #define gtk_layout_new(...) NULL
 #define gtk_layout_put(...)
 #define gtk_main_do_event(...)
-#define gtk_menu_bar_new(...) NULL
 #define gtk_menu_item_get_label(...) NULL
 #define gtk_menu_item_get_submenu(...) NULL
 #define gtk_menu_item_new_with_label(...) NULL

src/control/progress.c

@@ -23,6 +23,9 @@
 #ifdef HAVE_UNITY
 #include <unity/unity/unity.h>
 #endif
+#ifdef MAC_INTEGRATION
+#include <gtkosxapplication.h>
+#endif
 
 #ifdef _WIN32
 #include <gdk/gdkwin32.h>