From 52eed57d80a2c96579d785414b3b7e4055f7a6bd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 10 Sep 2025 23:32:10 +0200 Subject: [PATCH] package/cwiid: remove wmgui support, needs libgtk2 As we're about to remove libgtk2, let's drop the wmgui support from cwiid, which is libgtk2 only. Note that cwiid hasn't seen a commit in the past 16 years, so there's no real hope to see wmgui fixed to have support for a more recent Gtk version. And perhaps this separately calls for removing cwiid entirely from Buildroot. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 7 +++++++ package/cwiid/Config.in | 14 -------------- package/cwiid/cwiid.mk | 9 +-------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 895e42fc30..b150e40206 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.11" +config BR2_PACKAGE_CWIID_WMGUI + bool "cwiid wmgui has been removed" + select BR2_LEGACY + help + The wmgui part of cwiid required libgtk2, which has been + removed from Buildroot. + config BR2_LINUX_KERNEL_EXT_AUFS bool "Aufs Filesystem Module patch has been removed" select BR2_LEGACY diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 44148eb188..0c1a97402a 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -14,20 +14,6 @@ config BR2_PACKAGE_CWIID https://github.com/abstrakraft/cwiid -if BR2_PACKAGE_CWIID -config BR2_PACKAGE_CWIID_WMGUI - bool "wmgui" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz - depends on BR2_PACKAGE_XORG7 # libgtk2 - depends on BR2_USE_WCHAR # libgtk2 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 - depends on BR2_USE_MMU # libgtk2 -> libglib2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGTK2 -endif - comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ diff --git a/package/cwiid/cwiid.mk b/package/cwiid/cwiid.mk index a11c56c0aa..e552da3b46 100644 --- a/package/cwiid/cwiid.mk +++ b/package/cwiid/cwiid.mk @@ -17,13 +17,6 @@ CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez5_utils # Disable python support. This disables the 2 following things: # - wminput Python plugin support # - cwiid Python module -CWIID_CONF_OPTS = --without-python --disable-ldconfig - -ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y) -CWIID_DEPENDENCIES += libgtk2 libglib2 -CWIID_CONF_OPTS += --enable-wmgui -else -CWIID_CONF_OPTS += --disable-wmgui -endif +CWIID_CONF_OPTS = --without-python --disable-ldconfig --disable-wmgui $(eval $(autotools-package))