Start of Gtk3 to Gtk4

CMakeLists.txt

@@ -188,7 +188,8 @@ if (WIN32)
   #
   set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "")
   set(CMAKE_FRAMEWORK_PATH_TMP ${CMAKE_PREFIX_PATH})
-  set(DEV_SUBDIRS aqbanking gnome guile gwenhywfar libgsf libofx libsoup libxslt webkit)
+#  set(DEV_SUBDIRS aqbanking gnome guile gwenhywfar libgsf libofx libsoup libxslt webkit)
+  set(DEV_SUBDIRS aqbanking gnome guile gwenhywfar libgsf libofx libsoup libxslt)
   foreach(subdir ${DEV_SUBDIRS})
     list(APPEND CMAKE_FRAMEWORK_PATH_TMP ${CMAKE_PREFIX_PATH}/${subdir})
   endforeach()
@@ -216,7 +217,7 @@ if (NOT PKG_CONFIG_FOUND)
 
 # glib et al.
 set(GLIB_MIN_VERSION 2.56.1)
-set(GTK_MIN_VERSION 3.22.30)
+set(GTK_MIN_VERSION 4.8.3)
 
 pkg_check_modules (GLIB2 REQUIRED IMPORTED_TARGET glib-2.0>=${GLIB_MIN_VERSION})
 pkg_check_modules (GIO REQUIRED gio-2.0)
@@ -227,18 +228,18 @@ pkg_check_modules (GTHREAD REQUIRED gthread-2.0)
 pkg_check_modules (LIBXML2 REQUIRED libxml-2.0>=2.9.4)
 pkg_check_modules (LIBXSLT REQUIRED libxslt)
 if (WITH_GNUCASH)
-  if (WIN32)
-    pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkitgtk-3.0)
-    set(WEBKIT1 1 CACHE INTERNAL "WebKitGtk")
-  else()
-    pkg_check_modules (WEBKIT IMPORTED_TARGET webkit2gtk-4.0>=2.14.0)
-    if (NOT WEBKIT_FOUND)
-      pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.1)
-    endif()
-    set(WEBKIT2 1 CACHE INTERNAL "WebKit2Gtk4")
-  endif()
-
-  pkg_check_modules (GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0>=${GTK_MIN_VERSION})
+#  if (WIN32)
+#    pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkitgtk-3.0)
+#    set(WEBKIT1 1 CACHE INTERNAL "WebKitGtk")
+#  else()
+#    pkg_check_modules (WEBKIT IMPORTED_TARGET webkit2gtk-4.0>=2.14.0)
+#    if (NOT WEBKIT_FOUND)
+#      pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.1)
+#    endif()
+#    set(WEBKIT2 1 CACHE INTERNAL "WebKit2Gtk4")
+#  endif()
+
+  pkg_check_modules (GTK4 REQUIRED IMPORTED_TARGET gtk4>=${GTK_MIN_VERSION})
 endif()
 
 pkg_check_modules (ZLIB REQUIRED zlib)
@@ -407,7 +408,7 @@ if (WITH_AQBANKING)
   set(CMAKE_REQUIRED_INCLUDES)
   set(CMAKE_REQUIRED_LIBRARIES)
   if(WITH_GNUCASH)
-    pkg_check_modules (GWEN_GTK3 REQUIRED gwengui-gtk3)
+    pkg_check_modules (GWEN_GTK4 REQUIRED gwengui-gtk4)
   endif()
 endif()
 
@@ -606,12 +607,12 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
 
 if (UNIX)
-  set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
-  set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations ${CMAKE_CXX_FLAGS}")
+  set( CMAKE_C_FLAGS "-Werror  -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED ${CMAKE_C_FLAGS}")
+  set( CMAKE_CXX_FLAGS "-Werror -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED ${CMAKE_CXX_FLAGS}")
   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
 endif()
 if (MINGW)
-  set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
+  set( CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}")
   set( CMAKE_CXX_FLAGS "-DWINVER=0x0500 -D_EMULATE_GLIBC=0 ${CMAKE_CXX_FLAGS}") # Workaround for bug in gtest on mingw, see https://github.com/google/googletest/issues/893 and https://github.com/google/googletest/issues/920
 endif()
 
@@ -730,7 +731,6 @@ set(gnucash_DOCS
     ChangeLog.2023
     DOCUMENTERS
     HACKING
-    LICENSE
     NEWS
     README.dependencies
 )
@@ -835,7 +835,7 @@ set_property(TARGET PkgConfig::GLIB2 PROPERTY INTERFACE_COMPILE_DEFINITIONS
 if (WITH_GNUCASH)
 string(REGEX MATCH "^([0-9]+)\.([0-9]+)" GTK_MIN_MATCH ${GTK_MIN_VERSION})
 set(GTK_API ${CMAKE_MATCH_1}_${CMAKE_MATCH_2})
-set_property(TARGET PkgConfig::GTK3 PROPERTY INTERFACE_COMPILE_DEFINITIONS
+set_property(TARGET PkgConfig::GTK4 PROPERTY INTERFACE_COMPILE_DEFINITIONS
   GDK_VERSION_MIN_REQUIRED=GDK_VERSION_${GTK_API}
   GDK_VERSION_MAX_ALLOWED=GDK_VERSION_${GTK_API})
 endif()
@@ -995,21 +995,6 @@ if (WIN32)
   )
 endif()
 
-#Link LICENSE to COPYING so that people expecting to find it,
-#will. COPYING is normally linked by autogen.sh to the latest
-#automake-provided version.
-set (_CMD create_symlink)
-if (WIN32)
-  set(_CMD copy)
-endif()
-
-install(CODE
-" execute_process(
-      COMMAND ${CMAKE_COMMAND} -E ${_CMD} LICENSE COPYING
-      WORKING_DIRECTORY ${CMAKE_INSTALL_DOCDIR}
-  )"
-)
-
 #For windows, copy in some DLLs from Mingw
 
 if (WIN32)
@@ -1036,3 +1021,14 @@ if(UNIX)
 endif()
 
 include (CPack)
+
+message(STATUS "<<< Gentoo configuration >>>
+Build type      ${CMAKE_BUILD_TYPE}
+Install path    ${CMAKE_INSTALL_PREFIX}
+Compiler flags:
+C               ${CMAKE_C_FLAGS}
+C++             ${CMAKE_CXX_FLAGS}
+Linker flags:
+Executable      ${CMAKE_EXE_LINKER_FLAGS}
+Module          ${CMAKE_MODULE_LINKER_FLAGS}
+Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")

borrowed/goffice/go-charmap-sel.c

@@ -257,7 +257,7 @@ struct _GOCharmapSel
 {
     GtkBox box;
     GOOptionMenu *encodings;
-    GtkMenu *encodings_menu;
+//FIXME gtk4    GtkMenu *encodings_menu;
     GOCharmapSelTestDirection test;
 };
 
@@ -361,10 +361,12 @@ static void go_charmap_sel_init(GOCharmapSel *cs)
     cs->encodings = GO_OPTION_MENU(go_option_menu_new());
 
     g_signal_connect(G_OBJECT(cs->encodings), "changed",
-            G_CALLBACK(encodings_changed_cb), cs);
-    gtk_box_pack_start(GTK_BOX(cs), GTK_WIDGET(cs->encodings), TRUE, TRUE, 0);
-}
+                     G_CALLBACK(encodings_changed_cb), cs);
 
+    gtk_box_append (GTK_BOX(cs), GTK_WIDGET(cs->encodings));
+}
+//FIXME gtk4
+#ifdef skip
 static void cs_build_menu(GOCharmapSel *cs)
 {
     GtkWidget *item;
@@ -398,11 +400,11 @@ static void cs_build_menu(GOCharmapSel *cs)
                             _(charset_trans->charset_title));
                     gtk_check_menu_item_set_draw_as_radio(
                             GTK_CHECK_MENU_ITEM(subitem), TRUE);
-                    gtk_widget_show(subitem);
+                    gtk_widget_set_visible (GTK_WIDGET(subitem), TRUE);
                     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), subitem);
                     if (charset_trans->imp == CI_MAJOR)
                         cs_emphasize_label(
-                                GTK_LABEL(gtk_bin_get_child(GTK_BIN(subitem))));
+                                GTK_LABEL(gtk_widget_get_first_child(GTK_WIDGET(subitem))));
                     g_object_set_data(G_OBJECT(subitem), CHARMAP_NAME_KEY,
                             (gpointer) name);
                 }
@@ -419,14 +421,14 @@ static void cs_build_menu(GOCharmapSel *cs)
                     _(lgroup->group_name));
 
             gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), GTK_WIDGET(submenu));
-            gtk_widget_show(item);
+            gtk_widget_set_visible (GTK_WIDGET(item), TRUE);
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
             lg_cnt++;
         }
         lgroup++;
     }
     item = gtk_separator_menu_item_new();
-    gtk_widget_show(item);
+    gtk_widget_set_visible (GTK_WIDGET(item), TRUE);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
     lg_cnt++;
 
@@ -437,17 +439,17 @@ static void cs_build_menu(GOCharmapSel *cs)
         item = gtk_check_menu_item_new_with_label(locale_encoding_menu_title);
         gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item), TRUE);
         g_free(locale_encoding_menu_title);
-        gtk_widget_show(item);
+        gtk_widget_set_visible (GTK_WIDGET(item), TRUE);
         gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
         lg_cnt++;
-        cs_emphasize_label(GTK_LABEL(gtk_bin_get_child(GTK_BIN(item))));
+        cs_emphasize_label(GTK_LABEL(gtk_widget_get_first_child(GTK_WIDGET(item))));
     }
 
     go_option_menu_set_menu(cs->encodings, GTK_WIDGET(menu));
     cs->encodings_menu = menu;
     set_menu_to_default(cs, lg_cnt);
 }
-
+#endif
 static void go_charmap_sel_class_init(GOCharmapSelClass *klass)
 {
     CharsetInfo *ci;
@@ -589,18 +591,19 @@ go_charmap_sel_new(GOCharmapSelTestDirection test)
 gchar const *
 go_charmap_sel_get_encoding(GOCharmapSel *cs)
 {
-    GtkMenuItem *selection;
+//FIXME gtk4    GtkMenuItem *selection;
     char const *locale_encoding;
     char const *encoding;
 
     g_get_charset(&locale_encoding);
 
     g_return_val_if_fail(GO_IS_CHARMAP_SEL(cs), locale_encoding);
 
-    selection = GTK_MENU_ITEM(go_option_menu_get_history(cs->encodings));
-    encoding = (char const *) g_object_get_data(G_OBJECT(selection),
-    CHARMAP_NAME_KEY);
-    return encoding ? encoding : locale_encoding;
+//    selection = GTK_MENU_ITEM(go_option_menu_get_history(cs->encodings));
+//    encoding = (char const *) g_object_get_data(G_OBJECT(selection),
+//    CHARMAP_NAME_KEY);
+//    return encoding ? encoding : locale_encoding;
+return NULL;
 }
 
 struct cb_find_entry
@@ -610,7 +613,8 @@ struct cb_find_entry
     int i;
     GSList *path;
 };
-
+//FIXME gtk4
+#ifdef skip
 static void cb_find_entry(GtkMenuItem *w, struct cb_find_entry *cl)
 {
     GtkWidget *sub;
@@ -625,8 +629,8 @@ static void cb_find_entry(GtkMenuItem *w, struct cb_find_entry *cl)
                 GINT_TO_POINTER(cl->i));
         cl->i = 0;
 
-        gtk_container_foreach(GTK_CONTAINER(sub), (GtkCallback) cb_find_entry,
-                cl);
+//FIXME gtk4        gtk_container_foreach(GTK_CONTAINER(sub), (GtkCallback) cb_find_entry,
+//                cl);
         if (cl->found)
             return;
 
@@ -647,7 +651,7 @@ static void cb_find_entry(GtkMenuItem *w, struct cb_find_entry *cl)
     }
     cl->i++;
 }
-
+#endif
 gboolean go_charmap_sel_set_encoding(GOCharmapSel *cs, const char *enc)
 {
     struct cb_find_entry cl;
@@ -669,8 +673,8 @@ gboolean go_charmap_sel_set_encoding(GOCharmapSel *cs, const char *enc)
     cl.i = 0;
     cl.path = NULL;
 
-    gtk_container_foreach(GTK_CONTAINER(cs->encodings_menu),
-            (GtkCallback) cb_find_entry, &cl);
+//FIXME gtk4    gtk_container_foreach(GTK_CONTAINER(cs->encodings_menu),
+//            (GtkCallback) cb_find_entry, &cl);
     if (!cl.found)
         return FALSE;
 
@@ -689,7 +693,7 @@ static void cs_set_property(GObject *object, guint prop_id, const GValue *value,
     {
     case PROP_TEST_DIRECTION:
         cs->test = g_value_get_uint(value);
-        cs_build_menu(cs);
+//FIXME gtk4        cs_build_menu(cs);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);