Updated Unix sysinfo backend to treat GTK3 as the only GTK target by:

narrowing the GDK include guard to #if defined(HAVE_GTK3), and

    removing legacy HAVE_GTK2 / HAVE_GTK toolkit label branches from sysinfo_detect_toolkit(),

    narrowing GDK display probing guard in sysinfo_detect_display_backend() to GTK3-only.

Updated Windows and macOS sysinfo backends to remove HAVE_GTK2 / HAVE_GTK fallback labels so sysinfo_detect_toolkit() now returns only "GTK3" (or NULL).

Updated API docs for sysinfo_backend_get_ui() to remove the outdated "GTK2 / X11" example so comments match runtime behavior.

    Removed the deprecated Meson option option('gtk3', ... deprecated: true) from meson_options.txt, leaving gtk-frontend/text-frontend options intact.

    Removed -Dgtk3=true from Debian’s Meson configure flags in debian/rules (override_dh_auto_configure).

    Removed remaining active -Dgtk3=true packaging consumers in Flatpak config:

        dropped it from config-opts

        dropped -Dgtk3=true from cflags.

    Removed -Dgtk3=true from Solus packaging Meson configure args.

    Committed changes on the current branch (e018bfd) and created a PR record via the make_pr tool.
This commit is contained in:
2026-02-22 15:38:05 -07:00
parent 1b66b136dc
commit be7b5e62be
8 changed files with 4 additions and 22 deletions

1
debian/rules vendored
View File

@@ -7,7 +7,6 @@ export DH_VERBOSE=1
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- \ dh_auto_configure -- \
-Dgtk3=true \
-Dinstall-plugin-metainfo=false \ -Dinstall-plugin-metainfo=false \
-Dwith-lua=lua53 -Dwith-lua=lua53

View File

@@ -56,14 +56,13 @@
"name": "zoitechat", "name": "zoitechat",
"buildsystem": "meson", "buildsystem": "meson",
"config-opts": [ "config-opts": [
"-Dgtk3=true",
"-Ddbus-service-use-appid=true", "-Ddbus-service-use-appid=true",
"-Dwith-perl=false", "-Dwith-perl=false",
"-Dwith-python=false", "-Dwith-python=false",
"-Dwith-lua=lua" "-Dwith-lua=lua"
], ],
"build-options": { "build-options": {
"cflags": "-Dgtk3=true -Wno-error=missing-include-dirs" "cflags": "-Wno-error=missing-include-dirs"
}, },
"cleanup": [ "cleanup": [
"/share/man" "/share/man"

View File

@@ -2,9 +2,6 @@
option('gtk-frontend', type: 'boolean', option('gtk-frontend', type: 'boolean',
description: 'Main graphical interface' description: 'Main graphical interface'
) )
option('gtk3', type: 'boolean', value: true, deprecated: true,
description: 'Deprecated: GTK frontend always builds against GTK 3'
)
option('text-frontend', type: 'boolean', value: false, option('text-frontend', type: 'boolean', value: false,
description: 'Text interface (not generally useful)' description: 'Text interface (not generally useful)'
) )

View File

@@ -26,7 +26,6 @@ builddeps :
setup : | setup : |
%meson_configure \ %meson_configure \
-Dgtk-frontend=true \ -Dgtk-frontend=true \
-Dgtk3=true \
-Dinstall-appdata=true -Dinstall-appdata=true
build : | build : |
%ninja_build %ninja_build

View File

@@ -278,10 +278,6 @@ static const char *sysinfo_detect_toolkit(void)
{ {
#if defined(HAVE_GTK3) #if defined(HAVE_GTK3)
return "GTK3"; return "GTK3";
#elif defined(HAVE_GTK2)
return "GTK2";
#elif defined(HAVE_GTK)
return "GTK";
#else #else
return NULL; return NULL;
#endif #endif

View File

@@ -32,7 +32,7 @@ char *sysinfo_backend_get_network(void);
/* /*
* Short description of the UI/toolkit + display backend. * Short description of the UI/toolkit + display backend.
* Examples: "GTK3 / Wayland", "GTK2 / X11", "Windows / GTK3". * Examples: "GTK3 / Wayland", "Windows / GTK3".
*/ */
char *sysinfo_backend_get_ui(void); char *sysinfo_backend_get_ui(void);

View File

@@ -19,7 +19,7 @@
#include <glib.h> #include <glib.h>
#if defined(HAVE_GTK3) || defined(HAVE_GTK2) || defined(HAVE_GTK) #if defined(HAVE_GTK3)
#include <gdk/gdk.h> #include <gdk/gdk.h>
#endif #endif
#include "parse.h" #include "parse.h"
@@ -177,10 +177,6 @@ static const char *sysinfo_detect_toolkit(void)
{ {
#if defined(HAVE_GTK3) #if defined(HAVE_GTK3)
return "GTK3"; return "GTK3";
#elif defined(HAVE_GTK2)
return "GTK2";
#elif defined(HAVE_GTK)
return "GTK";
#else #else
return NULL; return NULL;
#endif #endif
@@ -194,7 +190,7 @@ static const char *sysinfo_detect_display_backend(void)
const gboolean session_wayland = session && g_ascii_strcasecmp(session, "wayland") == 0; const gboolean session_wayland = session && g_ascii_strcasecmp(session, "wayland") == 0;
/* Best-effort: ask GDK what it actually opened, if available. */ /* Best-effort: ask GDK what it actually opened, if available. */
#if defined(HAVE_GTK3) || defined(HAVE_GTK2) || defined(HAVE_GTK) #if defined(HAVE_GTK3)
{ {
GdkDisplay *display = gdk_display_get_default(); GdkDisplay *display = gdk_display_get_default();
if (display) if (display)

View File

@@ -108,10 +108,6 @@ static const char *sysinfo_detect_toolkit(void)
{ {
#if defined(HAVE_GTK3) #if defined(HAVE_GTK3)
return "GTK3"; return "GTK3";
#elif defined(HAVE_GTK2)
return "GTK2";
#elif defined(HAVE_GTK)
return "GTK";
#else #else
return NULL; return NULL;
#endif #endif