From 5f5bb69aef24f60346502421a5feba2bdd3b479b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Sep 2025 19:17:00 +0200 Subject: [PATCH] package/gkrellm: remove client, needs libgtk2 The gkrellm client needs libgtk2, which we are about to drop from Buildroot. Even though gkrellm has a somewhat active upstream at https://git.srcbox.net/gkrellm/gkrellm, it isn't clear whether it is compatible with Gtk 3 or not. Signed-off-by: Bernd Kuhls [Arnout: reword help text, drop legacy for BR2_PACKAGE_GKRELLM_SERVER] Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 7 +++++++ package/gkrellm/Config.in | 33 +++------------------------------ package/gkrellm/gkrellm.mk | 12 ------------ 3 files changed, 10 insertions(+), 42 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b150e40206..2ee9533fa8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.11" +config BR2_PACKAGE_GKRELLM_CLIENT + bool "gkrellm client has been removed" + select BR2_LEGACY + help + The gkrellm client option has been removed, as it required + libgtk2, which was removed from Buildroot. + config BR2_PACKAGE_CWIID_WMGUI bool "cwiid wmgui has been removed" select BR2_LEGACY diff --git a/package/gkrellm/Config.in b/package/gkrellm/Config.in index e957c058de..9e90b2810e 100644 --- a/package/gkrellm/Config.in +++ b/package/gkrellm/Config.in @@ -3,41 +3,14 @@ config BR2_PACKAGE_GKRELLM depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 - select BR2_PACKAGE_GKRELLM_SERVER if !BR2_PACKAGE_GKRELLM_CLIENT select BR2_PACKAGE_LIBGLIB2 help - GKrellM is a single process stack of system monitors which - supports applying themes to match its appearance to your - window manager, Gtk, or any other theme. + GKrellM is a single process stack of system monitors. + This package only contains the server part. The client + can run on a different machine. http://gkrellm.srcbox.net/ -if BR2_PACKAGE_GKRELLM - -config BR2_PACKAGE_GKRELLM_SERVER - bool "server" - help - Enable gkrellm server. - -config BR2_PACKAGE_GKRELLM_CLIENT - bool "client" - depends on BR2_PACKAGE_XORG7 # libgtk2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 - select BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_XLIB_LIBSM - help - Enable gkrellm client. - -comment "client needs a toolchain w/ C++, gcc >= 4.8" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_XORG7 - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -endif # BR2_PACKAGE_GKRELLM - comment "gkrellm needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 165b71c7c8..257ebadfc4 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -32,19 +32,7 @@ else GKRELLM_BUILD_OPTS += enable_nls=0 endif -ifeq ($(BR2_PACKAGE_GKRELLM_SERVER)$(BR2_PACKAGE_GKRELLM_CLIENT),yy) -GKRELLM_BUILD_DIR = $(@D) -else ifeq ($(BR2_PACKAGE_GKRELLM_SERVER),y) GKRELLM_BUILD_DIR = $(@D)/server -else -GKRELLM_BUILD_DIR = $(@D)/src -endif - -ifeq ($(BR2_PACKAGE_GKRELLM_CLIENT),y) -GKRELLM_DEPENDENCIES += libgtk2 xlib_libSM -GKRELLM_BUILD_OPTS += X11_LIBS="-lX11 -lSM -lICE" -GKRELLM_LICENSE += GPL (base64.c), Public Domain (md5.h, md5c.c) -endif define GKRELLM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) \