Warn about deprecated gtk, glib

- G_DISABLE_DEPRECATED no longer exists (as of glib 2.61.2)
- Turn off aqbanking global deprecation

Spoilers:

- gtk
 - (3.22) gdk_screen_width
 - (3.22) gdk_screen_height

- glib
 - (2.68) g_binding_get_target -> g_binding_dup_target

- aqbanking
 - AB_Banking_LoadSharedConfig

CMakeLists.txt

@@ -52,8 +52,8 @@ option (WITH_OFX "compile with ofx support (needs LibOFX)" ON)
 option (WITH_PYTHON "enable python plugin and bindings" OFF)
 option (ENABLE_BINRELOC "compile with binary relocation support" ON)
 option (DISABLE_NLS "do not use Native Language Support" OFF)
-option (DISABLE_DEPRECATED_GLIB "don't use deprecated glib functions" OFF)
-option (DISABLE_DEPRECATED_GTK "don't use deprecated gtk, gdk or gdk-pixbuf functions" OFF)
+option (WARN_DEPRECATED_GLIB "warn about deprecated glib functions" OFF)
+option (WARN_DEPRECATED_GTK "warn about deprecated gtk, gdk or gdk-pixbuf functions" OFF)
 # ############################################################
 
 # These are also settable from the command line in a similar way.
@@ -196,7 +196,10 @@ if (NOT PKG_CONFIG_FOUND)
  endif()
 
 # glib et al.
-pkg_check_modules (GLIB2 REQUIRED IMPORTED_TARGET glib-2.0>=2.56.1)
+set(GLIB_MIN_VERSION 2.56.1)
+set(GTK_MIN_VERSION 3.22.30)
+
+pkg_check_modules (GLIB2 REQUIRED IMPORTED_TARGET glib-2.0>=${GLIB_MIN_VERSION})
 pkg_check_modules (GIO REQUIRED gio-2.0)
 pkg_check_modules (GOBJECT REQUIRED gobject-2.0)
 pkg_check_modules (GMODULE REQUIRED gmodule-2.0)
@@ -216,7 +219,7 @@ if (WITH_GNUCASH)
     set(WEBKIT2 1 CACHE INTERNAL "WebKit2Gtk4")
   endif()
 
-  pkg_check_modules (GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0>=3.22.30)
+  pkg_check_modules (GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0>=${GTK_MIN_VERSION})
 endif()
 
 pkg_check_modules (ZLIB REQUIRED zlib)
@@ -772,15 +775,28 @@ set(PLATFORM_OSX 1)
 set(HAVE_OSX_KEYCHAIN 1)
 endif()
 
+if(WARN_DEPRECATED_GLIB)
+  string(REGEX MATCH "^([0-9]+)\.([0-9]+)" GLIB_MIN_MATCH ${GLIB_MIN_VERSION})
+  set(GLIB_API ${CMAKE_MATCH_1}_${CMAKE_MATCH_2})
 
-if(DISABLE_DEPRECATED_GTK)
-set(GTK_DISABLE_DEPRECATED 1)
-set(GDK_DISABLE_DEPRECATED 1)
-set(GDK_PIXMAP_DISABLE_DEPRECATED 1)
+  target_compile_definitions(PkgConfig::GLIB2 INTERFACE
+      GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_${GLIB_API}
+      GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_${GLIB_API})
+else()
+  target_compile_definitions(PkgConfig::GLIB2 INTERFACE
+      GLIB_DISABLE_DEPRECATION_WARNINGS)
 endif()
 
-if(DISABLE_DEPRECATED_GLIB)
-set(G_DISABLE_DEPRECATED 1)
+if (WARN_DEPRECATED_GTK)
+  string(REGEX MATCH "^([0-9]+)\.([0-9]+)" GTK_MIN_MATCH ${GTK_MIN_VERSION})
+  set(GTK_API ${CMAKE_MATCH_1}_${CMAKE_MATCH_2})
+
+  target_compile_definitions(PkgConfig::GTK3 INTERFACE
+      GDK_VERSION_MIN_REQUIRED=GDK_VERSION_${GTK_API}
+      GDK_VERSION_MAX_ALLOWED=GDK_VERSION_${GTK_API})
+else()
+  target_compile_definitions(PkgConfig::GTK3 INTERFACE
+      GDK_DISABLE_DEPRECATION_WARNINGS)
 endif()
 
 add_definitions (-DHAVE_CONFIG_H)

common/config.h.cmake.in

@@ -15,12 +15,6 @@
 /* always defined to indicate that i18n is enabled */
 #cmakedefine ENABLE_NLS 1
 
-/* Don't use deprecated gdk functions */
-#cmakedefine GDK_DISABLE_DEPRECATED 1
-
-/* Don't use deprecated gdk-pixbuf functions */
-#cmakedefine GDK_PIXBUF_DISABLE_DEPRECATED 1
-
 /* Using GDK Quartz (not X11) */
 #cmakedefine GDK_QUARTZ
 
@@ -54,12 +48,6 @@
 /* GnuCash prefix to use for GLib resources */
 #define GNUCASH_RESOURCE_PREFIX "@GNUCASH_RESOURCE_PREFIX@"
 
-/* Don't use deprecated gtk functions */
-#cmakedefine GTK_DISABLE_DEPRECATED 1
-
-/* Don't use deprecated glib functions */
-#cmakedefine G_DISABLE_DEPRECATED 1
-
 /* define if the Boost library is available */
 #cmakedefine HAVE_BOOST
 

gnucash/gnome-utils/CMakeLists.txt

@@ -220,7 +220,6 @@ target_link_libraries(gnc-gnome-utils
     ${LIBSECRET_LDFLAGS}
     ${GTK_MAC_LDFLAGS})
 
-target_compile_options(gnc-gnome-utils PRIVATE -Wno-deprecated-declarations)
 target_compile_definitions(gnc-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
   PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\")
 

gnucash/gnome/CMakeLists.txt

@@ -146,7 +146,6 @@ target_link_libraries(gnc-gnome
     ${GTK_MAC_LDFLAGS})
 
 target_compile_definitions (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
-target_compile_options(gnc-gnome PRIVATE -Wno-deprecated-declarations)
 
 target_include_directories(gnc-gnome
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}

gnucash/import-export/aqb/CMakeLists.txt

@@ -69,8 +69,8 @@ if(WITH_AQBANKING)
          ${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS}
          ${AQB_LIBSTDCXX})
 
-  target_compile_definitions(gncmod-aqbanking PRIVATE -DG_LOG_DOMAIN=\"gnc.import.aqbanking\")
-  target_compile_options(gncmod-aqbanking PRIVATE -Wno-deprecated-declarations)
+  target_compile_definitions(gncmod-aqbanking PRIVATE G_LOG_DOMAIN=\"gnc.import.aqbanking\")
+  target_compile_definitions(gncmod-aqbanking PRIVATE AQBANKING_NOWARN_DEPRECATED)
 
   target_include_directories(gncmod-aqbanking PRIVATE
     ${AQBANKING_INCLUDE_DIRS}