Merge pull request #31 from zisoft/gtk4_compile

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 MAC_INTEGRATION MAP OPENCL OPENEXR OPENMP UNITY WEBP"
+FEATURES="CAMERA COLORD GRAPHICSMAGICK IMAGEMAGICK JXL KWALLET LIBSECRET LUA 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

@@ -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/CMakeLists.txt

@@ -1427,6 +1427,7 @@ 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/common/darktable.h

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