WIP Gtk4 transition

DefineOptions.cmake

@@ -1,20 +1,20 @@
-option(USE_CAMERA_SUPPORT "Detect and use camera support if available." ON)
-option(USE_COLORD "Enable colord support" ON)
-option(USE_MAP "Build Map View parts" ON)
-option(USE_LUA "Build lua scripting support" ON)
+option(USE_CAMERA_SUPPORT "Detect and use camera support if available." OFF)
+option(USE_COLORD "Enable colord support" OFF)
+option(USE_MAP "Build Map View parts" OFF)
+option(USE_LUA "Build lua scripting support" OFF)
 option(DONT_USE_INTERNAL_LUA "Never fall back to the intree copy of lua" ON)
-option(USE_KWALLET "Build kwallet password storage back-end" ON)
-option(USE_LIBSECRET "Build libsecret password storage back-end" ON)
+option(USE_KWALLET "Build kwallet password storage back-end" OFF)
+option(USE_LIBSECRET "Build libsecret password storage back-end" OFF)
 option(USE_UNITY "Use libunity to report progress in the launcher" OFF)
 option(USE_OPENMP "Use OpenMP threading support." ON)
 option(USE_OPENCL "Use OpenCL support." ON)
-option(USE_GRAPHICSMAGICK "Use GraphicsMagick library for image import." ON)
+option(USE_GRAPHICSMAGICK "Use GraphicsMagick library for image import." OFF)
 option(USE_IMAGEMAGICK "Use ImageMagick library for image import." OFF)
 option(USE_DARKTABLE_PROFILING OFF)
 option(CUSTOM_CFLAGS "Don't override compiler optimization flags." OFF)
 option(BINARY_PACKAGE_BUILD "Sets march optimization to generic" OFF)
 option(USE_XMLLINT "Run xmllint to test if darktableconfig.xml is valid" ON)
-option(USE_PORTMIDI "Enable MIDI device support using PortMidi" ON)
+option(USE_PORTMIDI "Enable MIDI device support using PortMidi" OFF)
 option(USE_OPENJPEG "Enable JPEG 2000 support" ON)
 option(USE_JXL "Enable JPEG XL support" ON)
 option(USE_WEBP "Enable WebP support" ON)
@@ -26,17 +26,17 @@ option(USE_LIBRAW "Enable LibRaw support" ON)
 option(DONT_USE_INTERNAL_LIBRAW "If possible, use system instead of intree copy of LibRaw" OFF)
 option(BUILD_CMSTEST "Build a test program to check your system's color management setup" ON)
 option(USE_OPENEXR "Enable OpenEXR support" ON)
-option(BUILD_PRINT "Build the print module" ON)
+option(BUILD_PRINT "Build the print module" OFF)
 option(BUILD_RS_IDENTIFY "Build the darktable-rs-identify debug aid" ON)
 option(BUILD_SSE2_CODEPATHS "(EXPERIMENTAL OPTION, DO NOT DISABLE) Building SSE2-optimized codepaths" ON)
 option(VALIDATE_APPDATA_FILE "Use appstream-util (if found) to validate the .appdata file" OFF)
 option(BUILD_MSYS2_INSTALL "Build an MSYS2 version of the install, aka for Windows platform, but without dependency installs" OFF)
 option(BUILD_NOISE_TOOLS "Build tools for generating noise profiles" OFF)
 option(BUILD_CURVE_TOOLS "Build tools for generating base and tone curves" OFF)
-option(USE_GMIC "Use G'MIC image processing framework." ON)
+option(USE_GMIC "Use G'MIC image processing framework." OFF)
 option(USE_ICU "Use ICU - International Components for Unicode." ON)
 option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
-option(USE_SDL2 "Enable SDL2 support" ON)
+option(USE_SDL2 "Enable SDL2 support" OFF)
 
 if (USE_OPENCL)
     option(TESTBUILD_OPENCL_PROGRAMS "Test-compile OpenCL programs (needs LLVM and Clang 7+)" ON)
@@ -45,7 +45,7 @@ else ()
 endif ()
 
 if(APPLE)
-    option(USE_MAC_INTEGRATION "Enable macOS integration" ON)
+  option(USE_MAC_INTEGRATION "Enable macOS integration" OFF)
 else(APPLE)
     set(USE_MAC_INTEGRATION OFF)
 endif(APPLE)

cmake/modules/FindGTK4.cmake

@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.18)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK4 REQUIRED IMPORTED_TARGET gtk4)

src/CMakeLists.txt

@@ -124,7 +124,6 @@ FILE(GLOB SOURCE_FILES
   "dtgtk/drawingarea.c"
   "dtgtk/expander.c"
   "dtgtk/gradientslider.c"
-  "dtgtk/icon.c"
   "dtgtk/paint.c"
   "dtgtk/range.c"
   "dtgtk/resetlabel.c"
@@ -295,11 +294,11 @@ include_directories(SYSTEM ${Glib_INCLUDE_DIRS})
 list(APPEND LIBS ${Glib_LIBRARIES})
 
 # GTK3 pulls in ATK, GDK, GDK-PIXBUF, CAIRO, GLIB, PANGO
-find_package(GTK3 3.24.15 REQUIRED)
-add_definitions("-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_24")
-#add_definitions("-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_MIN_REQUIRED")
-include_directories(SYSTEM ${GTK3_INCLUDE_DIRS})
-list(APPEND LIBS ${GTK3_LIBRARIES})
+find_package(GTK4 4.8.3 REQUIRED)
+add_definitions("-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0")
+add_definitions("-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_18")
+include_directories(SYSTEM ${GTK4_INCLUDE_DIRS})
+list(APPEND LIBS ${GTK4_LIBRARIES})
 
 # Check for libxml2 / broken cmake module can't be included in the foreach() below
 find_package(LibXml2 2.6 REQUIRED)