* [Buildroot] [PATCH 01/23] package/adwaita-icon-theme: drop reference to libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 19:34 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 02/23] package/cwiid: remove wmgui support, needs libgtk2 Thomas Petazzoni via buildroot
` (22 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Eric Le Bihan
As we are about to drop support for libgtk2, let's drop the reference
to libgtk2 from the adwaita-icon-theme package.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/adwaita-icon-theme/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/adwaita-icon-theme/Config.in b/package/adwaita-icon-theme/Config.in
index 71b839d996..0eb856ad9e 100644
--- a/package/adwaita-icon-theme/Config.in
+++ b/package/adwaita-icon-theme/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_ADWAITA_ICON_THEME
bool "adwaita icon theme"
- depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
+ depends on BR2_PACKAGE_LIBGTK3
# host-libgtk3 -> host-librsvg -> host-pango -> host-harfbuzz
depends on BR2_HOST_GCC_AT_LEAST_4_9
help
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 01/23] package/adwaita-icon-theme: drop reference to libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 01/23] package/adwaita-icon-theme: drop reference to libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 19:34 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 19:34 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Eric Le Bihan
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we are about to drop support for libgtk2, let's drop the reference
> to libgtk2 from the adwaita-icon-theme package.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/adwaita-icon-theme/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/adwaita-icon-theme/Config.in b/package/adwaita-icon-theme/Config.in
> index 71b839d996..0eb856ad9e 100644
> --- a/package/adwaita-icon-theme/Config.in
> +++ b/package/adwaita-icon-theme/Config.in
> @@ -1,6 +1,6 @@
> config BR2_PACKAGE_ADWAITA_ICON_THEME
> bool "adwaita icon theme"
> - depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
> + depends on BR2_PACKAGE_LIBGTK3
> # host-libgtk3 -> host-librsvg -> host-pango -> host-harfbuzz
> depends on BR2_HOST_GCC_AT_LEAST_4_9
> help
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 02/23] package/cwiid: remove wmgui support, needs libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 01/23] package/adwaita-icon-theme: drop reference to libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 19:35 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 03/23] package/gkrellm: remove package, " Thomas Petazzoni via buildroot
` (21 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
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 <thomas.petazzoni@bootlin.com>
---
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 33b60dfd42..4bb160c4a3 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_EV3DEV_LINUX_DRIVERS
bool "ev3dev Linux drivers have 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))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 02/23] package/cwiid: remove wmgui support, needs libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 02/23] package/cwiid: remove wmgui support, needs libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 19:35 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 19:35 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> 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 <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> 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 33b60dfd42..4bb160c4a3 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_EV3DEV_LINUX_DRIVERS
> bool "ev3dev Linux drivers have 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))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 03/23] package/gkrellm: remove package, needs libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 01/23] package/adwaita-icon-theme: drop reference to libgtk2 Thomas Petazzoni via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 02/23] package/cwiid: remove wmgui support, needs libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 19:36 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 04/23] package/gtk2-engines: " Thomas Petazzoni via buildroot
` (20 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Bernd Kuhls
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.
Since building just the server isn't very useful, this commit drops
the gkrellm package entirely, which is anyway not fitting well within
the scope of Buildroot, which doesn't include building a full desktop
environment: gkrellm is unlikely to be useful in typical embedded
use-cases.
Cc: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 8 +++++
DEVELOPERS | 1 -
package/Config.in | 1 -
package/gkrellm/Config.in | 43 --------------------------
package/gkrellm/gkrellm.hash | 4 ---
package/gkrellm/gkrellm.mk | 60 ------------------------------------
6 files changed, 8 insertions(+), 109 deletions(-)
delete mode 100644 package/gkrellm/Config.in
delete mode 100644 package/gkrellm/gkrellm.hash
delete mode 100644 package/gkrellm/gkrellm.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 4bb160c4a3..5badcfe259 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_GKRELLM
+ bool "gkrellm has been removed"
+ select BR2_LEGACY
+ help
+ The gkrellm package has been removed, as its client required
+ libgtk2, which was removed from Buildroot, and just the
+ gkrellm server isn't that useful.
+
config BR2_PACKAGE_CWIID_WMGUI
bool "cwiid wmgui has been removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 16d9ee892b..7374e389fe 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -381,7 +381,6 @@ F: package/freetype/
F: package/fstrcmp/
F: package/ghostscript/
F: package/giflib/
-F: package/gkrellm/
F: package/gpsd/
F: package/gptfdisk/
F: package/hddtemp/
diff --git a/package/Config.in b/package/Config.in
index 5ac6dc6972..1b740c02f5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2870,7 +2870,6 @@ menu "System tools"
source "package/fluent-bit/Config.in"
source "package/ftop/Config.in"
source "package/getent/Config.in"
- source "package/gkrellm/Config.in"
source "package/htop/Config.in"
source "package/hwclock-initscript/Config.in"
source "package/ibm-sw-tpm2/Config.in"
diff --git a/package/gkrellm/Config.in b/package/gkrellm/Config.in
deleted file mode 100644
index e957c058de..0000000000
--- a/package/gkrellm/Config.in
+++ /dev/null
@@ -1,43 +0,0 @@
-config BR2_PACKAGE_GKRELLM
- bool "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.
-
- 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.hash b/package/gkrellm/gkrellm.hash
deleted file mode 100644
index 27ba276efa..0000000000
--- a/package/gkrellm/gkrellm.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Locally computed
-sha256 6f83665760b936ad4b55f9182b1ec7601faf38a0f25ea1e4bddc9965088f032d gkrellm-2.4.0.tar.bz2
-sha256 691de85c3c6eeda5b6982c751548575344739ce4b4418d78905e599359f6c435 COPYING
-sha256 a4bb0b604fe7d40ca4469ffd5e2e2de70ff8ece43e47980ab2c8962d5e913330 COPYRIGHT
diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk
deleted file mode 100644
index 165b71c7c8..0000000000
--- a/package/gkrellm/gkrellm.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-################################################################################
-#
-# gkrellm
-#
-################################################################################
-
-GKRELLM_VERSION = 2.4.0
-GKRELLM_SITE = http://gkrellm.srcbox.net/releases
-GKRELLM_SOURCE = gkrellm-$(GKRELLM_VERSION).tar.bz2
-GKRELLM_LICENSE = GPL-3.0+
-GKRELLM_LICENSE_FILES = COPYING COPYRIGHT
-GKRELLM_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES)
-GKRELLM_BUILD_OPTS = \
- STRIP="" \
- SYS_LIBS="$(GKRELLM_SYS_LIBS)"
-
-GKRELLM_SYS_LIBS = $(TARGET_NLS_LIBS)
-
-ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-GKRELLM_SYS_LIBS += -latomic
-endif
-
-ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
-GKRELLM_DEPENDENCIES += lm-sensors
-else
-GKRELLM_BUILD_OPTS += without-libsensors=yes
-endif
-
-ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
-GKRELLM_BUILD_OPTS += enable_nls=1
-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) \
- -C $(GKRELLM_BUILD_DIR) $(GKRELLM_BUILD_OPTS)
-endef
-
-define GKRELLM_INSTALL_TARGET_CMDS
- $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) \
- -C $(GKRELLM_BUILD_DIR) $(GKRELLM_BUILD_OPTS) \
- INSTALLROOT=$(TARGET_DIR)/usr install
-endef
-
-$(eval $(generic-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 03/23] package/gkrellm: remove package, needs libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 03/23] package/gkrellm: remove package, " Thomas Petazzoni via buildroot
@ 2025-09-11 19:36 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 19:36 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Bernd Kuhls
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> 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.
>
> Since building just the server isn't very useful, this commit drops
> the gkrellm package entirely, which is anyway not fitting well within
> the scope of Buildroot, which doesn't include building a full desktop
> environment: gkrellm is unlikely to be useful in typical embedded
> use-cases.
>
> Cc: Bernd Kuhls <bernd@kuhls.net>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Replaced by Bernd's patch.
Regards,
Arnout
> ---
> Config.in.legacy | 8 +++++
> DEVELOPERS | 1 -
> package/Config.in | 1 -
> package/gkrellm/Config.in | 43 --------------------------
> package/gkrellm/gkrellm.hash | 4 ---
> package/gkrellm/gkrellm.mk | 60 ------------------------------------
> 6 files changed, 8 insertions(+), 109 deletions(-)
> delete mode 100644 package/gkrellm/Config.in
> delete mode 100644 package/gkrellm/gkrellm.hash
> delete mode 100644 package/gkrellm/gkrellm.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 4bb160c4a3..5badcfe259 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,14 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_GKRELLM
> + bool "gkrellm has been removed"
> + select BR2_LEGACY
> + help
> + The gkrellm package has been removed, as its client required
> + libgtk2, which was removed from Buildroot, and just the
> + gkrellm server isn't that useful.
> +
> config BR2_PACKAGE_CWIID_WMGUI
> bool "cwiid wmgui has been removed"
> select BR2_LEGACY
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 16d9ee892b..7374e389fe 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -381,7 +381,6 @@ F: package/freetype/
> F: package/fstrcmp/
> F: package/ghostscript/
> F: package/giflib/
> -F: package/gkrellm/
> F: package/gpsd/
> F: package/gptfdisk/
> F: package/hddtemp/
> diff --git a/package/Config.in b/package/Config.in
> index 5ac6dc6972..1b740c02f5 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -2870,7 +2870,6 @@ menu "System tools"
> source "package/fluent-bit/Config.in"
> source "package/ftop/Config.in"
> source "package/getent/Config.in"
> - source "package/gkrellm/Config.in"
> source "package/htop/Config.in"
> source "package/hwclock-initscript/Config.in"
> source "package/ibm-sw-tpm2/Config.in"
> diff --git a/package/gkrellm/Config.in b/package/gkrellm/Config.in
> deleted file mode 100644
> index e957c058de..0000000000
> --- a/package/gkrellm/Config.in
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -config BR2_PACKAGE_GKRELLM
> - bool "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.
> -
> - 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.hash b/package/gkrellm/gkrellm.hash
> deleted file mode 100644
> index 27ba276efa..0000000000
> --- a/package/gkrellm/gkrellm.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# Locally computed
> -sha256 6f83665760b936ad4b55f9182b1ec7601faf38a0f25ea1e4bddc9965088f032d gkrellm-2.4.0.tar.bz2
> -sha256 691de85c3c6eeda5b6982c751548575344739ce4b4418d78905e599359f6c435 COPYING
> -sha256 a4bb0b604fe7d40ca4469ffd5e2e2de70ff8ece43e47980ab2c8962d5e913330 COPYRIGHT
> diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk
> deleted file mode 100644
> index 165b71c7c8..0000000000
> --- a/package/gkrellm/gkrellm.mk
> +++ /dev/null
> @@ -1,60 +0,0 @@
> -################################################################################
> -#
> -# gkrellm
> -#
> -################################################################################
> -
> -GKRELLM_VERSION = 2.4.0
> -GKRELLM_SITE = http://gkrellm.srcbox.net/releases
> -GKRELLM_SOURCE = gkrellm-$(GKRELLM_VERSION).tar.bz2
> -GKRELLM_LICENSE = GPL-3.0+
> -GKRELLM_LICENSE_FILES = COPYING COPYRIGHT
> -GKRELLM_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES)
> -GKRELLM_BUILD_OPTS = \
> - STRIP="" \
> - SYS_LIBS="$(GKRELLM_SYS_LIBS)"
> -
> -GKRELLM_SYS_LIBS = $(TARGET_NLS_LIBS)
> -
> -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> -GKRELLM_SYS_LIBS += -latomic
> -endif
> -
> -ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
> -GKRELLM_DEPENDENCIES += lm-sensors
> -else
> -GKRELLM_BUILD_OPTS += without-libsensors=yes
> -endif
> -
> -ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
> -GKRELLM_BUILD_OPTS += enable_nls=1
> -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) \
> - -C $(GKRELLM_BUILD_DIR) $(GKRELLM_BUILD_OPTS)
> -endef
> -
> -define GKRELLM_INSTALL_TARGET_CMDS
> - $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) \
> - -C $(GKRELLM_BUILD_DIR) $(GKRELLM_BUILD_OPTS) \
> - INSTALLROOT=$(TARGET_DIR)/usr install
> -endef
> -
> -$(eval $(generic-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 04/23] package/gtk2-engines: remove package, needs libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (2 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 03/23] package/gkrellm: remove package, " Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 19:43 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 05/23] package/gtkiostream: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
` (19 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
As we're about to remove libgtk2, let's drop gtk2-engines, which
obviously relies on libgtk2.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 7 ++
package/Config.in | 3 -
package/gtk2-engines/Config.in | 5 --
package/gtk2-engines/gtk2-engines.hash | 4 --
package/gtk2-engines/gtk2-engines.mk | 88 --------------------------
5 files changed, 7 insertions(+), 100 deletions(-)
delete mode 100644 package/gtk2-engines/Config.in
delete mode 100644 package/gtk2-engines/gtk2-engines.hash
delete mode 100644 package/gtk2-engines/gtk2-engines.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 5badcfe259..ea23ae1b2c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_GTK2_ENGINES
+ bool "gtk2-engines has been removed"
+ select BR2_LEGACY
+ help
+ The gtk2-engines package has been removed, as libgtk2 has
+ been removed as well.
+
config BR2_PACKAGE_GKRELLM
bool "gkrellm has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 1b740c02f5..e42ef67d7d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -279,9 +279,6 @@ comment "Sounds"
source "package/sound-theme-borealis/Config.in"
source "package/sound-theme-freedesktop/Config.in"
-comment "Themes"
- source "package/gtk2-engines/Config.in"
-
endmenu
menu "Games"
diff --git a/package/gtk2-engines/Config.in b/package/gtk2-engines/Config.in
deleted file mode 100644
index 756a7d00f1..0000000000
--- a/package/gtk2-engines/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_PACKAGE_GTK2_ENGINES
- bool "gtk engines"
- depends on BR2_PACKAGE_LIBGTK2
- help
- A collection of basic theme engines for GTK+.
diff --git a/package/gtk2-engines/gtk2-engines.hash b/package/gtk2-engines/gtk2-engines.hash
deleted file mode 100644
index 71a0ecd213..0000000000
--- a/package/gtk2-engines/gtk2-engines.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# From https://download.gnome.org/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum
-sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2
-# Locally computed
-sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
deleted file mode 100644
index ea41bccaea..0000000000
--- a/package/gtk2-engines/gtk2-engines.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-################################################################################
-#
-# gtk2-engines
-#
-################################################################################
-
-GTK2_ENGINES_VERSION_MAJOR = 2.20
-GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2
-GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
-GTK2_ENGINES_SITE = https://download.gnome.org/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR)
-GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool
-GTK2_ENGINES_LICENSE = LGPL-2.1+
-GTK2_ENGINES_LICENSE_FILES = COPYING
-
-GTK2_ENGINES_CONF_ENV = \
- ac_cv_func_posix_getpwuid_r=yes \
- glib_cv_stack_grows=no \
- glib_cv_uscore=no \
- ac_cv_func_strtod=yes \
- ac_fsusage_space=yes \
- fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no \
- ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no \
- ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes \
- ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes \
- ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=no \
- ac_cv_have_decl_strnlen=yes \
- ac_cv_func_strnlen_working=yes \
- ac_cv_func_lstat_dereferences_slashed_symlink=yes \
- ac_cv_func_lstat_empty_string_bug=no \
- ac_cv_func_stat_empty_string_bug=no \
- vb_cv_func_rename_trailing_slash_bug=no \
- ac_cv_have_decl_nanosleep=yes \
- jm_cv_func_nanosleep_works=yes \
- gl_cv_func_working_utimes=yes \
- ac_cv_func_utime_null=yes \
- ac_cv_have_decl_strerror_r=yes \
- ac_cv_func_strerror_r_char_p=no \
- jm_cv_func_svid_putenv=yes \
- ac_cv_func_getcwd_null=yes \
- ac_cv_func_getdelim=yes \
- ac_cv_func_mkstemp=yes \
- utils_cv_func_mkstemp_limitations=no \
- utils_cv_func_mkdir_trailing_slash_bug=no \
- jm_cv_func_gettimeofday_clobber=no \
- gl_cv_func_working_readdir=yes \
- jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no \
- ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no \
- gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes \
- ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no \
- am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no \
- gl_cv_func_mkstemp_limitations=no \
- ac_cv_func_working_mktime=yes \
- jm_cv_func_working_re_compile_pattern=yes \
- ac_use_included_regex=no \
- gl_cv_c_restrict=no \
- ac_cv_path_CUPS_CONFIG=no
-
-GTK2_ENGINES_CONF_OPTS = \
- --with-x \
- --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib \
- --disable-glibtest \
- --enable-explicit-deps=no \
- --enable-clearlooks \
- --disable-crux \
- --disable-hc \
- --disable-industrial \
- --disable-mist \
- --disable-redmond \
- --disable-smooth \
- --disable-glide \
- --disable-thinice \
- --enable-animation \
- --disable-development \
- --disable-paranoia \
- --disable-deprecated
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 04/23] package/gtk2-engines: remove package, needs libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 04/23] package/gtk2-engines: " Thomas Petazzoni via buildroot
@ 2025-09-11 19:43 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 19:43 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, let's drop gtk2-engines, which
> obviously relies on libgtk2.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> Config.in.legacy | 7 ++
> package/Config.in | 3 -
> package/gtk2-engines/Config.in | 5 --
> package/gtk2-engines/gtk2-engines.hash | 4 --
> package/gtk2-engines/gtk2-engines.mk | 88 --------------------------
> 5 files changed, 7 insertions(+), 100 deletions(-)
> delete mode 100644 package/gtk2-engines/Config.in
> delete mode 100644 package/gtk2-engines/gtk2-engines.hash
> delete mode 100644 package/gtk2-engines/gtk2-engines.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 5badcfe259..ea23ae1b2c 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_GTK2_ENGINES
> + bool "gtk2-engines has been removed"
> + select BR2_LEGACY
> + help
> + The gtk2-engines package has been removed, as libgtk2 has
> + been removed as well.
> +
> config BR2_PACKAGE_GKRELLM
> bool "gkrellm has been removed"
> select BR2_LEGACY
> diff --git a/package/Config.in b/package/Config.in
> index 1b740c02f5..e42ef67d7d 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -279,9 +279,6 @@ comment "Sounds"
> source "package/sound-theme-borealis/Config.in"
> source "package/sound-theme-freedesktop/Config.in"
>
> -comment "Themes"
> - source "package/gtk2-engines/Config.in"
> -
> endmenu
>
> menu "Games"
> diff --git a/package/gtk2-engines/Config.in b/package/gtk2-engines/Config.in
> deleted file mode 100644
> index 756a7d00f1..0000000000
> --- a/package/gtk2-engines/Config.in
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -config BR2_PACKAGE_GTK2_ENGINES
> - bool "gtk engines"
> - depends on BR2_PACKAGE_LIBGTK2
> - help
> - A collection of basic theme engines for GTK+.
> diff --git a/package/gtk2-engines/gtk2-engines.hash b/package/gtk2-engines/gtk2-engines.hash
> deleted file mode 100644
> index 71a0ecd213..0000000000
> --- a/package/gtk2-engines/gtk2-engines.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# From https://download.gnome.org/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum
> -sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2
> -# Locally computed
> -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING
> diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
> deleted file mode 100644
> index ea41bccaea..0000000000
> --- a/package/gtk2-engines/gtk2-engines.mk
> +++ /dev/null
> @@ -1,88 +0,0 @@
> -################################################################################
> -#
> -# gtk2-engines
> -#
> -################################################################################
> -
> -GTK2_ENGINES_VERSION_MAJOR = 2.20
> -GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2
> -GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
> -GTK2_ENGINES_SITE = https://download.gnome.org/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR)
> -GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool
> -GTK2_ENGINES_LICENSE = LGPL-2.1+
> -GTK2_ENGINES_LICENSE_FILES = COPYING
> -
> -GTK2_ENGINES_CONF_ENV = \
> - ac_cv_func_posix_getpwuid_r=yes \
> - glib_cv_stack_grows=no \
> - glib_cv_uscore=no \
> - ac_cv_func_strtod=yes \
> - ac_fsusage_space=yes \
> - fu_cv_sys_stat_statfs2_bsize=yes \
> - ac_cv_func_closedir_void=no \
> - ac_cv_func_getloadavg=no \
> - ac_cv_lib_util_getloadavg=no \
> - ac_cv_lib_getloadavg_getloadavg=no \
> - ac_cv_func_getgroups=yes \
> - ac_cv_func_getgroups_works=yes \
> - ac_cv_func_chown_works=yes \
> - ac_cv_have_decl_euidaccess=no \
> - ac_cv_func_euidaccess=no \
> - ac_cv_have_decl_strnlen=yes \
> - ac_cv_func_strnlen_working=yes \
> - ac_cv_func_lstat_dereferences_slashed_symlink=yes \
> - ac_cv_func_lstat_empty_string_bug=no \
> - ac_cv_func_stat_empty_string_bug=no \
> - vb_cv_func_rename_trailing_slash_bug=no \
> - ac_cv_have_decl_nanosleep=yes \
> - jm_cv_func_nanosleep_works=yes \
> - gl_cv_func_working_utimes=yes \
> - ac_cv_func_utime_null=yes \
> - ac_cv_have_decl_strerror_r=yes \
> - ac_cv_func_strerror_r_char_p=no \
> - jm_cv_func_svid_putenv=yes \
> - ac_cv_func_getcwd_null=yes \
> - ac_cv_func_getdelim=yes \
> - ac_cv_func_mkstemp=yes \
> - utils_cv_func_mkstemp_limitations=no \
> - utils_cv_func_mkdir_trailing_slash_bug=no \
> - jm_cv_func_gettimeofday_clobber=no \
> - gl_cv_func_working_readdir=yes \
> - jm_ac_cv_func_link_follows_symlink=no \
> - utils_cv_localtime_cache=no \
> - ac_cv_struct_st_mtim_nsec=no \
> - gl_cv_func_tzset_clobber=no \
> - gl_cv_func_getcwd_null=yes \
> - gl_cv_func_getcwd_path_max=yes \
> - ac_cv_func_fnmatch_gnu=yes \
> - am_getline_needs_run_time_check=no \
> - am_cv_func_working_getline=yes \
> - gl_cv_func_mkdir_trailing_slash_bug=no \
> - gl_cv_func_mkstemp_limitations=no \
> - ac_cv_func_working_mktime=yes \
> - jm_cv_func_working_re_compile_pattern=yes \
> - ac_use_included_regex=no \
> - gl_cv_c_restrict=no \
> - ac_cv_path_CUPS_CONFIG=no
> -
> -GTK2_ENGINES_CONF_OPTS = \
> - --with-x \
> - --x-includes=$(STAGING_DIR)/usr/include/X11 \
> - --x-libraries=$(STAGING_DIR)/usr/lib \
> - --disable-glibtest \
> - --enable-explicit-deps=no \
> - --enable-clearlooks \
> - --disable-crux \
> - --disable-hc \
> - --disable-industrial \
> - --disable-mist \
> - --disable-redmond \
> - --disable-smooth \
> - --disable-glide \
> - --disable-thinice \
> - --enable-animation \
> - --disable-development \
> - --disable-paranoia \
> - --disable-deprecated
> -
> -$(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 05/23] package/gtkiostream: drop optional dependency on libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (3 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 04/23] package/gtk2-engines: " Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 19:51 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 06/23] package/gtkperf: remove package Thomas Petazzoni via buildroot
` (18 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Angelo Compagnucci, Matt Flax
As we're about to remove libgtk2, let's drop the optional dependency
of gtkiostream on libgtk2.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/gtkiostream/gtkiostream.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk
index bc3d859d4e..c748c7a000 100644
--- a/package/gtkiostream/gtkiostream.mk
+++ b/package/gtkiostream/gtkiostream.mk
@@ -39,10 +39,6 @@ ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
GTKIOSTREAM_DEPENDENCIES += libglib2
endif
-ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-GTKIOSTREAM_DEPENDENCIES += libgtk2
-endif
-
ifeq ($(BR2_PACKAGE_LIBGTK3),y)
GTKIOSTREAM_DEPENDENCIES += libgtk3
endif
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 05/23] package/gtkiostream: drop optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 05/23] package/gtkiostream: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 19:51 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 19:51 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Angelo Compagnucci, Matt Flax
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, let's drop the optional dependency
> of gtkiostream on libgtk2.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/gtkiostream/gtkiostream.mk | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk
> index bc3d859d4e..c748c7a000 100644
> --- a/package/gtkiostream/gtkiostream.mk
> +++ b/package/gtkiostream/gtkiostream.mk
> @@ -39,10 +39,6 @@ ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
> GTKIOSTREAM_DEPENDENCIES += libglib2
> endif
>
> -ifeq ($(BR2_PACKAGE_LIBGTK2),y)
> -GTKIOSTREAM_DEPENDENCIES += libgtk2
> -endif
> -
> ifeq ($(BR2_PACKAGE_LIBGTK3),y)
> GTKIOSTREAM_DEPENDENCIES += libgtk3
> endif
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 06/23] package/gtkperf: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (4 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 05/23] package/gtkiostream: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 07/23] package/leafpad: " Thomas Petazzoni via buildroot
` (17 subsequent siblings)
23 siblings, 0 replies; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
This package requires libgtk2, which we are about to remove.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/Config.in | 1 -
package/gtkperf/Config.in | 11 -----------
package/gtkperf/gtkperf.hash | 3 ---
package/gtkperf/gtkperf.mk | 15 ---------------
4 files changed, 30 deletions(-)
delete mode 100644 package/gtkperf/Config.in
delete mode 100644 package/gtkperf/gtkperf.hash
delete mode 100644 package/gtkperf/gtkperf.mk
diff --git a/package/Config.in b/package/Config.in
index e42ef67d7d..b2c1be89a0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -401,7 +401,6 @@ comment "X applications"
source "package/dillo/Config.in"
source "package/docker/Config.in"
source "package/feh/Config.in"
- source "package/gtkperf/Config.in"
source "package/leafpad/Config.in"
source "package/mupdf/Config.in"
source "package/nodm/Config.in"
diff --git a/package/gtkperf/Config.in b/package/gtkperf/Config.in
deleted file mode 100644
index a763e305c7..0000000000
--- a/package/gtkperf/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_GTKPERF
- bool "gtkperf (performance test for GTK2)"
- depends on BR2_PACKAGE_LIBGTK2
- help
- GtkPerf is an application designed to test GTK+ performance.
- The point is to create common testing platform to run
- predefined GTK+ widgets
- e.g. (opening comboboxes, toggling buttons, scrolling text
- yms.) and this way define the speed of device/platform.
-
- http://gtkperf.sourceforge.net/
diff --git a/package/gtkperf/gtkperf.hash b/package/gtkperf/gtkperf.hash
deleted file mode 100644
index 72f35a26f2..0000000000
--- a/package/gtkperf/gtkperf.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256 9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b gtkperf_0.40.tar.gz
-sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
deleted file mode 100644
index cc0433984c..0000000000
--- a/package/gtkperf/gtkperf.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# gtkperf
-#
-################################################################################
-
-GTKPERF_VERSION = 0.40
-GTKPERF_SOURCE = gtkperf_$(GTKPERF_VERSION).tar.gz
-GTKPERF_SITE = http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION)
-GTKPERF_DEPENDENCIES = libgtk2 $(TARGET_NLS_DEPENDENCIES)
-GTKPERF_LICENSE = GPL-2.0
-GTKPERF_LICENSE_FILES = COPYING
-GTKPERF_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* [Buildroot] [PATCH 07/23] package/leafpad: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (5 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 06/23] package/gtkperf: remove package Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 19:52 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 08/23] package/libcanberra: remove optional dependency on libgtk2 Thomas Petazzoni via buildroot
` (16 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
This package needs libgtk2, which we are about to remove.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 7 +++++++
package/Config.in | 1 -
package/leafpad/Config.in | 7 -------
package/leafpad/leafpad.hash | 4 ----
package/leafpad/leafpad.mk | 13 -------------
5 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 package/leafpad/Config.in
delete mode 100644 package/leafpad/leafpad.hash
delete mode 100644 package/leafpad/leafpad.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index ea23ae1b2c..a30755e608 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_LEAFPAD
+ bool "leafpad has been removed"
+ select BR2_LEGACY
+ help
+ The leafpad package has been removed, as libgtk2 has been
+ removed as well.
+
config BR2_PACKAGE_GTK2_ENGINES
bool "gtk2-engines has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index b2c1be89a0..4974c32a37 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -401,7 +401,6 @@ comment "X applications"
source "package/dillo/Config.in"
source "package/docker/Config.in"
source "package/feh/Config.in"
- source "package/leafpad/Config.in"
source "package/mupdf/Config.in"
source "package/nodm/Config.in"
source "package/pcmanfm/Config.in"
diff --git a/package/leafpad/Config.in b/package/leafpad/Config.in
deleted file mode 100644
index a4408547cd..0000000000
--- a/package/leafpad/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_LEAFPAD
- bool "leafpad"
- depends on BR2_PACKAGE_LIBGTK2
- help
- GTK+ based simple text editor
-
- http://savannah.nongnu.org/download/leafpad
diff --git a/package/leafpad/leafpad.hash b/package/leafpad/leafpad.hash
deleted file mode 100644
index 4f6e68f0a2..0000000000
--- a/package/leafpad/leafpad.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Locally calculated after checking pgp signature
-sha256 07d3f712f4dbd0a33251fd1dee14e21afdc9f92090fc768c11ab0ac556adbe97 leafpad-0.8.19.tar.gz
-# Locally computed
-sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
deleted file mode 100644
index 608fa37be4..0000000000
--- a/package/leafpad/leafpad.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# leafpad
-#
-################################################################################
-
-LEAFPAD_VERSION = 0.8.19
-LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
-LEAFPAD_DEPENDENCIES = libgtk2 host-intltool
-LEAFPAD_LICENSE = GPL-2.0+
-LEAFPAD_LICENSE_FILES = COPYING
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 07/23] package/leafpad: remove package
2025-09-10 21:32 ` [Buildroot] [PATCH 07/23] package/leafpad: " Thomas Petazzoni via buildroot
@ 2025-09-11 19:52 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 19:52 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> This package needs libgtk2, which we are about to remove.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> Config.in.legacy | 7 +++++++
> package/Config.in | 1 -
> package/leafpad/Config.in | 7 -------
> package/leafpad/leafpad.hash | 4 ----
> package/leafpad/leafpad.mk | 13 -------------
> 5 files changed, 7 insertions(+), 25 deletions(-)
> delete mode 100644 package/leafpad/Config.in
> delete mode 100644 package/leafpad/leafpad.hash
> delete mode 100644 package/leafpad/leafpad.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index ea23ae1b2c..a30755e608 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_LEAFPAD
> + bool "leafpad has been removed"
> + select BR2_LEGACY
> + help
> + The leafpad package has been removed, as libgtk2 has been
> + removed as well.
> +
> config BR2_PACKAGE_GTK2_ENGINES
> bool "gtk2-engines has been removed"
> select BR2_LEGACY
> diff --git a/package/Config.in b/package/Config.in
> index b2c1be89a0..4974c32a37 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -401,7 +401,6 @@ comment "X applications"
> source "package/dillo/Config.in"
> source "package/docker/Config.in"
> source "package/feh/Config.in"
> - source "package/leafpad/Config.in"
> source "package/mupdf/Config.in"
> source "package/nodm/Config.in"
> source "package/pcmanfm/Config.in"
> diff --git a/package/leafpad/Config.in b/package/leafpad/Config.in
> deleted file mode 100644
> index a4408547cd..0000000000
> --- a/package/leafpad/Config.in
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -config BR2_PACKAGE_LEAFPAD
> - bool "leafpad"
> - depends on BR2_PACKAGE_LIBGTK2
> - help
> - GTK+ based simple text editor
> -
> - http://savannah.nongnu.org/download/leafpad
> diff --git a/package/leafpad/leafpad.hash b/package/leafpad/leafpad.hash
> deleted file mode 100644
> index 4f6e68f0a2..0000000000
> --- a/package/leafpad/leafpad.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# Locally calculated after checking pgp signature
> -sha256 07d3f712f4dbd0a33251fd1dee14e21afdc9f92090fc768c11ab0ac556adbe97 leafpad-0.8.19.tar.gz
> -# Locally computed
> -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
> diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
> deleted file mode 100644
> index 608fa37be4..0000000000
> --- a/package/leafpad/leafpad.mk
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -################################################################################
> -#
> -# leafpad
> -#
> -################################################################################
> -
> -LEAFPAD_VERSION = 0.8.19
> -LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
> -LEAFPAD_DEPENDENCIES = libgtk2 host-intltool
> -LEAFPAD_LICENSE = GPL-2.0+
> -LEAFPAD_LICENSE_FILES = COPYING
> -
> -$(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 08/23] package/libcanberra: remove optional dependency on libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (6 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 07/23] package/leafpad: " Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:00 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 09/23] package/{libfm, pcmanfm}: handle libgtk2 removal Thomas Petazzoni via buildroot
` (15 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Takumi Takahashi
As we're about to drop libgtk2, let's remove the optional dependency
of libcanberra to libgtk2.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/libcanberra/libcanberra.mk | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/package/libcanberra/libcanberra.mk b/package/libcanberra/libcanberra.mk
index 2505e58eb0..456d08563b 100644
--- a/package/libcanberra/libcanberra.mk
+++ b/package/libcanberra/libcanberra.mk
@@ -12,7 +12,12 @@ LIBCANBERRA_LICENSE_FILES = LGPL
LIBCANBERRA_INSTALL_STAGING = YES
LIBCANBERRA_DEPENDENCIES = host-pkgconf libtool libvorbis
-LIBCANBERRA_CONF_OPTS = --disable-oss --disable-null --disable-tdb --disable-lynx
+LIBCANBERRA_CONF_OPTS = \
+ --disable-oss \
+ --disable-null \
+ --disable-tdb \
+ --disable-lynx \
+ --disable-gtk
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LIBCANBERRA_CONF_OPTS += --enable-udev
@@ -42,13 +47,6 @@ else
LIBCANBERRA_CONF_OPTS += --disable-gstreamer
endif
-ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-LIBCANBERRA_CONF_OPTS += --enable-gtk
-LIBCANBERRA_DEPENDENCIES += libgtk2
-else
-LIBCANBERRA_CONF_OPTS += --disable-gtk
-endif
-
ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
LIBCANBERRA_CONF_OPTS += --enable-gtk3
LIBCANBERRA_DEPENDENCIES += libgtk3
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 08/23] package/libcanberra: remove optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 08/23] package/libcanberra: remove optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 20:00 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:00 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Takumi Takahashi
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to drop libgtk2, let's remove the optional dependency
> of libcanberra to libgtk2.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/libcanberra/libcanberra.mk | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/package/libcanberra/libcanberra.mk b/package/libcanberra/libcanberra.mk
> index 2505e58eb0..456d08563b 100644
> --- a/package/libcanberra/libcanberra.mk
> +++ b/package/libcanberra/libcanberra.mk
> @@ -12,7 +12,12 @@ LIBCANBERRA_LICENSE_FILES = LGPL
> LIBCANBERRA_INSTALL_STAGING = YES
>
> LIBCANBERRA_DEPENDENCIES = host-pkgconf libtool libvorbis
> -LIBCANBERRA_CONF_OPTS = --disable-oss --disable-null --disable-tdb --disable-lynx
> +LIBCANBERRA_CONF_OPTS = \
> + --disable-oss \
> + --disable-null \
> + --disable-tdb \
> + --disable-lynx \
> + --disable-gtk
>
> ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
> LIBCANBERRA_CONF_OPTS += --enable-udev
> @@ -42,13 +47,6 @@ else
> LIBCANBERRA_CONF_OPTS += --disable-gstreamer
> endif
>
> -ifeq ($(BR2_PACKAGE_LIBGTK2),y)
> -LIBCANBERRA_CONF_OPTS += --enable-gtk
> -LIBCANBERRA_DEPENDENCIES += libgtk2
> -else
> -LIBCANBERRA_CONF_OPTS += --disable-gtk
> -endif
> -
> ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
> LIBCANBERRA_CONF_OPTS += --enable-gtk3
> LIBCANBERRA_DEPENDENCIES += libgtk3
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 09/23] package/{libfm, pcmanfm}: handle libgtk2 removal
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (7 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 08/23] package/libcanberra: remove optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:03 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 10/23] package/libglade: remove package Thomas Petazzoni via buildroot
` (14 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Fabrice Fontaine
As we're about to remove libgtk2, the libfm and pcmanfm packages need
to be adjusted so that they work with libgtk3 only. This requires a
bit of re-arrangment of the dependencies, to properly propagate the
libgtk3 dependencies.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/libfm/Config.in | 34 ++++++++++++++++++++++------------
package/libfm/libfm.mk | 11 ++---------
package/pcmanfm/Config.in | 35 ++++++++++++++++++++++-------------
package/pcmanfm/pcmanfm.mk | 11 ++---------
4 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/package/libfm/Config.in b/package/libfm/Config.in
index e78bc99b76..f35e9a17fd 100644
--- a/package/libfm/Config.in
+++ b/package/libfm/Config.in
@@ -1,15 +1,19 @@
config BR2_PACKAGE_LIBFM
bool "libfm"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_WCHAR # libglib2
- depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
- depends on BR2_USE_MMU # libglib2
- depends on BR2_INSTALL_LIBSTDCPP # libgtk2
- 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_HOST_RUSTC_ARCH_SUPPORTS # libgtk3
+ depends on BR2_USE_WCHAR # libgtk3, libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk3, libglib2
+ depends on BR2_USE_MMU # libgtk3, libglib2
+ depends on BR2_INSTALL_LIBSTDCPP # libgtk3
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk3
+ depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libgtk3
+ depends on BR2_PACKAGE_XORG7 # libgtk3-x11
+ depends on BR2_PACKAGE_HAS_LIBGL # libgtk3-x1
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
+ select BR2_PACKAGE_LIBGTK3
+ select BR2_PACKAGE_LIBGTK3_X11
select BR2_PACKAGE_MENU_CACHE
help
A glib/gio-based library providing some file management
@@ -22,9 +26,15 @@ config BR2_PACKAGE_LIBFM
http://wiki.lxde.org/en/Libfm
-comment "libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+comment "libfm a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+ depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
- !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_XORG7
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+comment "libfm needs X.org with an OpenGL backend"
+ depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+ depends on BR2_USE_MMU
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_HAS_LIBGL
diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk
index 29f6d7d56a..419fce59d8 100644
--- a/package/libfm/libfm.mk
+++ b/package/libfm/libfm.mk
@@ -7,12 +7,13 @@
LIBFM_VERSION = 1.3.2
LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
-LIBFM_DEPENDENCIES = menu-cache libglib2 cairo
+LIBFM_DEPENDENCIES = menu-cache libglib2 cairo libgtk3
LIBFM_LICENSE = GPL-2.0+, LGPL-2.1+
LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
LIBFM_INSTALL_STAGING = YES
# We're patching src/modules/Makefile.am
LIBFM_AUTORECONF = YES
+LIBFM_CONF_OPTS = --with-gtk=3
ifeq ($(BR2_PACKAGE_LIBEXIF),y)
LIBFM_CONF_OPTS += --enable-exif
@@ -21,12 +22,4 @@ else
LIBFM_CONF_OPTS += --disable-exif
endif
-ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
-LIBFM_CONF_OPTS += --with-gtk=3
-LIBFM_DEPENDENCIES += libgtk3
-else
-LIBFM_CONF_OPTS += --with-gtk=2
-LIBFM_DEPENDENCIES += libgtk2
-endif
-
$(eval $(autotools-package))
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index 73b8c7c04c..a4522d88f4 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -1,16 +1,20 @@
config BR2_PACKAGE_PCMANFM
bool "pcmanfm"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_WCHAR # libglib2
- depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
- depends on BR2_USE_MMU # libglib2
- depends on BR2_INSTALL_LIBSTDCPP # libgtk2
- 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_HOST_RUSTC_ARCH_SUPPORTS # libfm
+ depends on BR2_USE_WCHAR # libfm
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libfm
+ depends on BR2_USE_MMU # libfm
+ depends on BR2_INSTALL_LIBSTDCPP # libfm
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libfm
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libfm
+ depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libfm
+ depends on BR2_PACKAGE_XORG7 # libfm
+ depends on BR2_PACKAGE_HAS_LIBGL # libfm
select BR2_PACKAGE_LIBFM
select BR2_PACKAGE_MENU_CACHE
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
+ select BR2_PACKAGE_LIBGTK3
+ select BR2_PACKAGE_LIBGTK3_X11
help
PCMan File Manager (PCManFM) is a file manager application
developed by Hong Jen Yee from Taiwan which is meant to be a
@@ -18,10 +22,15 @@ config BR2_PACKAGE_PCMANFM
http://wiki.lxde.org/en/PCManFM
-comment "pcmanfm needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+comment "pcmanfm a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+ depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
depends on BR2_USE_MMU
- depends on BR2_PACKAGE_XORG7
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
- !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+comment "pcmanfm needs X.org with an OpenGL backend"
+ depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+ depends on BR2_USE_MMU
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_HAS_LIBGL
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 9b233f614d..46d750b1e6 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -7,18 +7,11 @@
PCMANFM_VERSION = 1.3.2
PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz
PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files
-PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm $(TARGET_NLS_DEPENDENCIES)
+PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm libgtk3 $(TARGET_NLS_DEPENDENCIES)
PCMANFM_LICENSE = GPL-2.0+
PCMANFM_LICENSE_FILES = COPYING
PCMANFM_CPE_ID_VALID = YES
PCMANFM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
-
-ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
-PCMANFM_CONF_OPTS += --with-gtk=3
-PCMANFM_DEPENDENCIES += libgtk3
-else
-PCMANFM_CONF_OPTS += --with-gtk=2
-PCMANFM_DEPENDENCIES += libgtk2
-endif
+PCMANFM_CONF_OPTS = --with-gtk=3
$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 09/23] package/{libfm, pcmanfm}: handle libgtk2 removal
2025-09-10 21:32 ` [Buildroot] [PATCH 09/23] package/{libfm, pcmanfm}: handle libgtk2 removal Thomas Petazzoni via buildroot
@ 2025-09-11 20:03 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:03 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Fabrice Fontaine
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, the libfm and pcmanfm packages need
> to be adjusted so that they work with libgtk3 only. This requires a
> bit of re-arrangment of the dependencies, to properly propagate the
> libgtk3 dependencies.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/libfm/Config.in | 34 ++++++++++++++++++++++------------
> package/libfm/libfm.mk | 11 ++---------
> package/pcmanfm/Config.in | 35 ++++++++++++++++++++++-------------
> package/pcmanfm/pcmanfm.mk | 11 ++---------
> 4 files changed, 48 insertions(+), 43 deletions(-)
>
> diff --git a/package/libfm/Config.in b/package/libfm/Config.in
> index e78bc99b76..f35e9a17fd 100644
> --- a/package/libfm/Config.in
> +++ b/package/libfm/Config.in
> @@ -1,15 +1,19 @@
> config BR2_PACKAGE_LIBFM
> bool "libfm"
> - depends on BR2_PACKAGE_XORG7
> - depends on BR2_USE_WCHAR # libglib2
> - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> - depends on BR2_USE_MMU # libglib2
> - depends on BR2_INSTALL_LIBSTDCPP # libgtk2
> - 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_HOST_RUSTC_ARCH_SUPPORTS # libgtk3
> + depends on BR2_USE_WCHAR # libgtk3, libglib2
> + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk3, libglib2
> + depends on BR2_USE_MMU # libgtk3, libglib2
> + depends on BR2_INSTALL_LIBSTDCPP # libgtk3
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk3
> + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libgtk3
> + depends on BR2_PACKAGE_XORG7 # libgtk3-x11
> + depends on BR2_PACKAGE_HAS_LIBGL # libgtk3-x1
> select BR2_PACKAGE_CAIRO
> select BR2_PACKAGE_LIBGLIB2
> - select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
> + select BR2_PACKAGE_LIBGTK3
> + select BR2_PACKAGE_LIBGTK3_X11
> select BR2_PACKAGE_MENU_CACHE
> help
> A glib/gio-based library providing some file management
> @@ -22,9 +26,15 @@ config BR2_PACKAGE_LIBFM
>
> http://wiki.lxde.org/en/Libfm
>
> -comment "libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
> +comment "libfm a toolchain w/ wchar, threads, C++, gcc >= 4.9"
> + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
> depends on BR2_USE_MMU
> depends on BR2_TOOLCHAIN_HAS_SYNC_4
> - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
> - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
> - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_XORG7
> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
> + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
> +
> +comment "libfm needs X.org with an OpenGL backend"
> + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
> + depends on BR2_USE_MMU
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4
> + depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_HAS_LIBGL
> diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk
> index 29f6d7d56a..419fce59d8 100644
> --- a/package/libfm/libfm.mk
> +++ b/package/libfm/libfm.mk
> @@ -7,12 +7,13 @@
> LIBFM_VERSION = 1.3.2
> LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
> LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
> -LIBFM_DEPENDENCIES = menu-cache libglib2 cairo
> +LIBFM_DEPENDENCIES = menu-cache libglib2 cairo libgtk3
> LIBFM_LICENSE = GPL-2.0+, LGPL-2.1+
> LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
> LIBFM_INSTALL_STAGING = YES
> # We're patching src/modules/Makefile.am
> LIBFM_AUTORECONF = YES
> +LIBFM_CONF_OPTS = --with-gtk=3
>
> ifeq ($(BR2_PACKAGE_LIBEXIF),y)
> LIBFM_CONF_OPTS += --enable-exif
> @@ -21,12 +22,4 @@ else
> LIBFM_CONF_OPTS += --disable-exif
> endif
>
> -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
> -LIBFM_CONF_OPTS += --with-gtk=3
> -LIBFM_DEPENDENCIES += libgtk3
> -else
> -LIBFM_CONF_OPTS += --with-gtk=2
> -LIBFM_DEPENDENCIES += libgtk2
> -endif
> -
> $(eval $(autotools-package))
> diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
> index 73b8c7c04c..a4522d88f4 100644
> --- a/package/pcmanfm/Config.in
> +++ b/package/pcmanfm/Config.in
> @@ -1,16 +1,20 @@
> config BR2_PACKAGE_PCMANFM
> bool "pcmanfm"
> - depends on BR2_PACKAGE_XORG7
> - depends on BR2_USE_WCHAR # libglib2
> - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> - depends on BR2_USE_MMU # libglib2
> - depends on BR2_INSTALL_LIBSTDCPP # libgtk2
> - 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_HOST_RUSTC_ARCH_SUPPORTS # libfm
> + depends on BR2_USE_WCHAR # libfm
> + depends on BR2_TOOLCHAIN_HAS_THREADS # libfm
> + depends on BR2_USE_MMU # libfm
> + depends on BR2_INSTALL_LIBSTDCPP # libfm
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libfm
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libfm
> + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libfm
> + depends on BR2_PACKAGE_XORG7 # libfm
> + depends on BR2_PACKAGE_HAS_LIBGL # libfm
> select BR2_PACKAGE_LIBFM
> select BR2_PACKAGE_MENU_CACHE
> select BR2_PACKAGE_LIBGLIB2
> - select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
> + select BR2_PACKAGE_LIBGTK3
> + select BR2_PACKAGE_LIBGTK3_X11
> help
> PCMan File Manager (PCManFM) is a file manager application
> developed by Hong Jen Yee from Taiwan which is meant to be a
> @@ -18,10 +22,15 @@ config BR2_PACKAGE_PCMANFM
>
> http://wiki.lxde.org/en/PCManFM
>
> -comment "pcmanfm needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
> +comment "pcmanfm a toolchain w/ wchar, threads, C++, gcc >= 4.9"
> + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
> depends on BR2_USE_MMU
> - depends on BR2_PACKAGE_XORG7
> depends on BR2_TOOLCHAIN_HAS_SYNC_4
> - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
> - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
> - !BR2_TOOLCHAIN_HAS_THREADS
> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
> + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
> +
> +comment "pcmanfm needs X.org with an OpenGL backend"
> + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
> + depends on BR2_USE_MMU
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4
> + depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_HAS_LIBGL
> diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
> index 9b233f614d..46d750b1e6 100644
> --- a/package/pcmanfm/pcmanfm.mk
> +++ b/package/pcmanfm/pcmanfm.mk
> @@ -7,18 +7,11 @@
> PCMANFM_VERSION = 1.3.2
> PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz
> PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files
> -PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm $(TARGET_NLS_DEPENDENCIES)
> +PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm libgtk3 $(TARGET_NLS_DEPENDENCIES)
> PCMANFM_LICENSE = GPL-2.0+
> PCMANFM_LICENSE_FILES = COPYING
> PCMANFM_CPE_ID_VALID = YES
> PCMANFM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
> -
> -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
> -PCMANFM_CONF_OPTS += --with-gtk=3
> -PCMANFM_DEPENDENCIES += libgtk3
> -else
> -PCMANFM_CONF_OPTS += --with-gtk=2
> -PCMANFM_DEPENDENCIES += libgtk2
> -endif
> +PCMANFM_CONF_OPTS = --with-gtk=3
>
> $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 10/23] package/libglade: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (8 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 09/23] package/{libfm, pcmanfm}: handle libgtk2 removal Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:03 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 11/23] package/libsexy: " Thomas Petazzoni via buildroot
` (13 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
libglade requires libgtk2, which we're about to remove, so let's drop
libglade.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 7 +++++++
package/Config.in | 1 -
package/libglade/Config.in | 21 ---------------------
package/libglade/libglade.hash | 5 -----
package/libglade/libglade.mk | 23 -----------------------
5 files changed, 7 insertions(+), 50 deletions(-)
delete mode 100644 package/libglade/Config.in
delete mode 100644 package/libglade/libglade.hash
delete mode 100644 package/libglade/libglade.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index a30755e608..f1f9dd2cfa 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_LIBGLADE
+ bool "libglade has been removed"
+ select BR2_LEGACY
+ help
+ The libglade package has been removed, as libgtk2 has been
+ removed as well.
+
config BR2_PACKAGE_LEAFPAD
bool "leafpad has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 4974c32a37..d54c579b82 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1760,7 +1760,6 @@ menu "Graphics"
source "package/libfreeimage/Config.in"
source "package/libgdiplus/Config.in"
source "package/libgeotiff/Config.in"
- source "package/libglade/Config.in"
source "package/libglew/Config.in"
source "package/libglfw/Config.in"
source "package/libglu/Config.in"
diff --git a/package/libglade/Config.in b/package/libglade/Config.in
deleted file mode 100644
index 0f889542fa..0000000000
--- a/package/libglade/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-config BR2_PACKAGE_LIBGLADE
- bool "libglade"
- depends on BR2_PACKAGE_LIBGTK2
- depends on BR2_USE_WCHAR # glib2
- depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
- depends on BR2_USE_MMU # glib2
- depends on !BR2_STATIC_LIBS # at-spi2-core
- select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_AT_SPI2_CORE
- select BR2_PACKAGE_LIBXML2
- help
- Libglade allows you to load glade interface files in a program
- at runtime. It doesn't require GLADE to be used, but GLADE is
- by far the easiest way to create the interface files.
-
- https://download.gnome.org/sources/libglade/
-
-comment "libglade needs a toolchain w/ wchar, threads, dynamic library"
- depends on BR2_USE_MMU
- depends on BR2_PACKAGE_LIBGTK2
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/libglade/libglade.hash b/package/libglade/libglade.hash
deleted file mode 100644
index b04087e286..0000000000
--- a/package/libglade/libglade.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From https://download.gnome.org/sources/libglade/2.6/libglade-2.6.4.sha256sum
-sha256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec libglade-2.6.4.tar.bz2
-
-# Hash for license file:
-sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
deleted file mode 100644
index af73d8bd00..0000000000
--- a/package/libglade/libglade.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#
-# libglade
-#
-################################################################################
-
-LIBGLADE_VERSION_MAJOR = 2.6
-LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4
-LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
-LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR)
-LIBGLADE_INSTALL_STAGING = YES
-LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2
-LIBGLADE_LICENSE = LGPL-2.0+
-LIBGLADE_LICENSE_FILES = COPYING
-
-define LIBGLADE_INSTALL_FIX
- rm -rf $(TARGET_DIR)/usr/share/xml/libglade \
- $(TARGET_DIR)/usr/bin/libglade-convert
-endef
-
-LIBGLADE_POST_INSTALL_TARGET_HOOKS += LIBGLADE_INSTALL_FIX
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 10/23] package/libglade: remove package
2025-09-10 21:32 ` [Buildroot] [PATCH 10/23] package/libglade: remove package Thomas Petazzoni via buildroot
@ 2025-09-11 20:03 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:03 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> libglade requires libgtk2, which we're about to remove, so let's drop
> libglade.
I extended the commit message a bit to say how long it's dead already. Same
for the other patches in the series, I'm not going to repeat that every time :-)
Applied to master, thanks.
Regards,
Arnout
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Config.in.legacy | 7 +++++++
> package/Config.in | 1 -
> package/libglade/Config.in | 21 ---------------------
> package/libglade/libglade.hash | 5 -----
> package/libglade/libglade.mk | 23 -----------------------
> 5 files changed, 7 insertions(+), 50 deletions(-)
> delete mode 100644 package/libglade/Config.in
> delete mode 100644 package/libglade/libglade.hash
> delete mode 100644 package/libglade/libglade.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index a30755e608..f1f9dd2cfa 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_LIBGLADE
> + bool "libglade has been removed"
> + select BR2_LEGACY
> + help
> + The libglade package has been removed, as libgtk2 has been
> + removed as well.
> +
> config BR2_PACKAGE_LEAFPAD
> bool "leafpad has been removed"
> select BR2_LEGACY
> diff --git a/package/Config.in b/package/Config.in
> index 4974c32a37..d54c579b82 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1760,7 +1760,6 @@ menu "Graphics"
> source "package/libfreeimage/Config.in"
> source "package/libgdiplus/Config.in"
> source "package/libgeotiff/Config.in"
> - source "package/libglade/Config.in"
> source "package/libglew/Config.in"
> source "package/libglfw/Config.in"
> source "package/libglu/Config.in"
> diff --git a/package/libglade/Config.in b/package/libglade/Config.in
> deleted file mode 100644
> index 0f889542fa..0000000000
> --- a/package/libglade/Config.in
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -config BR2_PACKAGE_LIBGLADE
> - bool "libglade"
> - depends on BR2_PACKAGE_LIBGTK2
> - depends on BR2_USE_WCHAR # glib2
> - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
> - depends on BR2_USE_MMU # glib2
> - depends on !BR2_STATIC_LIBS # at-spi2-core
> - select BR2_PACKAGE_LIBGLIB2
> - select BR2_PACKAGE_AT_SPI2_CORE
> - select BR2_PACKAGE_LIBXML2
> - help
> - Libglade allows you to load glade interface files in a program
> - at runtime. It doesn't require GLADE to be used, but GLADE is
> - by far the easiest way to create the interface files.
> -
> - https://download.gnome.org/sources/libglade/
> -
> -comment "libglade needs a toolchain w/ wchar, threads, dynamic library"
> - depends on BR2_USE_MMU
> - depends on BR2_PACKAGE_LIBGTK2
> - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
> diff --git a/package/libglade/libglade.hash b/package/libglade/libglade.hash
> deleted file mode 100644
> index b04087e286..0000000000
> --- a/package/libglade/libglade.hash
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# From https://download.gnome.org/sources/libglade/2.6/libglade-2.6.4.sha256sum
> -sha256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec libglade-2.6.4.tar.bz2
> -
> -# Hash for license file:
> -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING
> diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
> deleted file mode 100644
> index af73d8bd00..0000000000
> --- a/package/libglade/libglade.mk
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -################################################################################
> -#
> -# libglade
> -#
> -################################################################################
> -
> -LIBGLADE_VERSION_MAJOR = 2.6
> -LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4
> -LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
> -LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR)
> -LIBGLADE_INSTALL_STAGING = YES
> -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2
> -LIBGLADE_LICENSE = LGPL-2.0+
> -LIBGLADE_LICENSE_FILES = COPYING
> -
> -define LIBGLADE_INSTALL_FIX
> - rm -rf $(TARGET_DIR)/usr/share/xml/libglade \
> - $(TARGET_DIR)/usr/bin/libglade-convert
> -endef
> -
> -LIBGLADE_POST_INSTALL_TARGET_HOOKS += LIBGLADE_INSTALL_FIX
> -
> -$(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 11/23] package/libsexy: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (9 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 10/23] package/libglade: remove package Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:04 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 12/23] package/lv2: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
` (12 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
libsexy requires libgtk2, which we're about to remove, so let's drop
libsexy.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 7 +++++++
package/Config.in | 1 -
package/libsexy/Config.in | 11 -----------
package/libsexy/libsexy.hash | 3 ---
package/libsexy/libsexy.mk | 14 --------------
5 files changed, 7 insertions(+), 29 deletions(-)
delete mode 100644 package/libsexy/Config.in
delete mode 100644 package/libsexy/libsexy.hash
delete mode 100644 package/libsexy/libsexy.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index f1f9dd2cfa..548e517b42 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_LIBSEXY
+ bool "libsexy has been removed"
+ select BR2_LEGACY
+ help
+ The libsexy package has been removed, as libgtk2 has been
+ removed as well.
+
config BR2_PACKAGE_LIBGLADE
bool "libglade has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index d54c579b82..317030a44e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -419,7 +419,6 @@ comment "X applications"
comment "X libraries and helper libraries"
depends on BR2_PACKAGE_XORG7
- source "package/libsexy/Config.in"
source "package/x11r7/xkeyboard-config/Config.in"
comment "X window managers"
diff --git a/package/libsexy/Config.in b/package/libsexy/Config.in
deleted file mode 100644
index a2a2cc820c..0000000000
--- a/package/libsexy/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_LIBSEXY
- bool "libsexy"
- depends on BR2_PACKAGE_LIBGTK2
- select BR2_PACKAGE_LIBXML2
- help
- libsexy is a collection of GTK+ widgets that extend the
- functionality of such standard widgets as GtkEntry and
- GtkLabel by subclassing them and working around the
- limitations of the widgets.
-
- https://blog.chipx86.com/tag/libsexy/
diff --git a/package/libsexy/libsexy.hash b/package/libsexy/libsexy.hash
deleted file mode 100644
index 6f47e8ba7c..0000000000
--- a/package/libsexy/libsexy.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256 8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e libsexy-0.1.11.tar.gz
-sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING
diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
deleted file mode 100644
index b079264122..0000000000
--- a/package/libsexy/libsexy.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# libsexy
-#
-################################################################################
-
-LIBSEXY_VERSION = 0.1.11
-LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy
-LIBSEXY_DEPENDENCIES = libgtk2 libxml2
-LIBSEXY_INSTALL_STAGING = YES
-LIBSEXY_LICENSE = LGPL-2.1+
-LIBSEXY_LICENSE_FILES = COPYING
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 11/23] package/libsexy: remove package
2025-09-10 21:32 ` [Buildroot] [PATCH 11/23] package/libsexy: " Thomas Petazzoni via buildroot
@ 2025-09-11 20:04 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:04 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> libsexy requires libgtk2, which we're about to remove, so let's drop
> libsexy.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> Config.in.legacy | 7 +++++++
> package/Config.in | 1 -
> package/libsexy/Config.in | 11 -----------
> package/libsexy/libsexy.hash | 3 ---
> package/libsexy/libsexy.mk | 14 --------------
> 5 files changed, 7 insertions(+), 29 deletions(-)
> delete mode 100644 package/libsexy/Config.in
> delete mode 100644 package/libsexy/libsexy.hash
> delete mode 100644 package/libsexy/libsexy.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index f1f9dd2cfa..548e517b42 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_LIBSEXY
> + bool "libsexy has been removed"
> + select BR2_LEGACY
> + help
> + The libsexy package has been removed, as libgtk2 has been
> + removed as well.
> +
> config BR2_PACKAGE_LIBGLADE
> bool "libglade has been removed"
> select BR2_LEGACY
> diff --git a/package/Config.in b/package/Config.in
> index d54c579b82..317030a44e 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -419,7 +419,6 @@ comment "X applications"
> comment "X libraries and helper libraries"
> depends on BR2_PACKAGE_XORG7
>
> - source "package/libsexy/Config.in"
> source "package/x11r7/xkeyboard-config/Config.in"
>
> comment "X window managers"
> diff --git a/package/libsexy/Config.in b/package/libsexy/Config.in
> deleted file mode 100644
> index a2a2cc820c..0000000000
> --- a/package/libsexy/Config.in
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -config BR2_PACKAGE_LIBSEXY
> - bool "libsexy"
> - depends on BR2_PACKAGE_LIBGTK2
> - select BR2_PACKAGE_LIBXML2
> - help
> - libsexy is a collection of GTK+ widgets that extend the
> - functionality of such standard widgets as GtkEntry and
> - GtkLabel by subclassing them and working around the
> - limitations of the widgets.
> -
> - https://blog.chipx86.com/tag/libsexy/
> diff --git a/package/libsexy/libsexy.hash b/package/libsexy/libsexy.hash
> deleted file mode 100644
> index 6f47e8ba7c..0000000000
> --- a/package/libsexy/libsexy.hash
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# Locally calculated
> -sha256 8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e libsexy-0.1.11.tar.gz
> -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING
> diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
> deleted file mode 100644
> index b079264122..0000000000
> --- a/package/libsexy/libsexy.mk
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -################################################################################
> -#
> -# libsexy
> -#
> -################################################################################
> -
> -LIBSEXY_VERSION = 0.1.11
> -LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy
> -LIBSEXY_DEPENDENCIES = libgtk2 libxml2
> -LIBSEXY_INSTALL_STAGING = YES
> -LIBSEXY_LICENSE = LGPL-2.1+
> -LIBSEXY_LICENSE_FILES = COPYING
> -
> -$(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 12/23] package/lv2: drop optional dependency on libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (10 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 11/23] package/libsexy: " Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:08 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 13/23] package/metacity: remove package Thomas Petazzoni via buildroot
` (11 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, James Hilliard
As we're about to remove libgtk2, let's drop the optional dependency
of lv2 on libgtk2.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/lv2/lv2.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk
index 2dde9b907c..cef90d13f0 100644
--- a/package/lv2/lv2.mk
+++ b/package/lv2/lv2.mk
@@ -24,10 +24,6 @@ ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
LV2_DEPENDENCIES += libsndfile
endif
-ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-LV2_DEPENDENCIES += libgtk2
-endif
-
ifeq ($(BR2_STATIC_LIBS),y)
LV2_CONF_OPTS += -Dplugins=disabled
endif
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 12/23] package/lv2: drop optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 12/23] package/lv2: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 20:08 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:08 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: James Hilliard
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, let's drop the optional dependency
> of lv2 on libgtk2.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/lv2/lv2.mk | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk
> index 2dde9b907c..cef90d13f0 100644
> --- a/package/lv2/lv2.mk
> +++ b/package/lv2/lv2.mk
> @@ -24,10 +24,6 @@ ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
> LV2_DEPENDENCIES += libsndfile
> endif
>
> -ifeq ($(BR2_PACKAGE_LIBGTK2),y)
> -LV2_DEPENDENCIES += libgtk2
> -endif
> -
> ifeq ($(BR2_STATIC_LIBS),y)
> LV2_CONF_OPTS += -Dplugins=disabled
> endif
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 13/23] package/metacity: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (11 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 12/23] package/lv2: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:09 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 14/23] package/mjpegtools: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
` (10 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
This window manager requires libgtk2, which we are about to remove, so
let's drop metacity.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
.checkpackageignore | 3 --
Config.in.legacy | 7 +++
package/Config.in | 1 -
.../metacity/0001-add-libm-reference.patch | 51 -------------------
package/metacity/0002-gconf.patch | 30 -----------
.../0003-mag-add-libm-reference.patch | 45 ----------------
package/metacity/Config.in | 18 -------
package/metacity/Xsession | 6 ---
package/metacity/metacity.hash | 5 --
package/metacity/metacity.mk | 44 ----------------
10 files changed, 7 insertions(+), 203 deletions(-)
delete mode 100644 package/metacity/0001-add-libm-reference.patch
delete mode 100644 package/metacity/0002-gconf.patch
delete mode 100644 package/metacity/0003-mag-add-libm-reference.patch
delete mode 100644 package/metacity/Config.in
delete mode 100755 package/metacity/Xsession
delete mode 100644 package/metacity/metacity.hash
delete mode 100644 package/metacity/metacity.mk
diff --git a/.checkpackageignore b/.checkpackageignore
index 426d112c14..9b75d4da14 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -734,9 +734,6 @@ package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch lib_pat
package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch lib_patch.Upstream
package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch lib_patch.Upstream
package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch lib_patch.Upstream
-package/metacity/0001-add-libm-reference.patch lib_patch.Upstream
-package/metacity/0002-gconf.patch lib_patch.Upstream
-package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream
package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream
package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream
package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream
diff --git a/Config.in.legacy b/Config.in.legacy
index 548e517b42..5c3b289688 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_METACITY
+ bool "metacity has been removed"
+ select BR2_LEGACY
+ help
+ The metacity package has been removed, as libgtk2 has been
+ removed as well.
+
config BR2_PACKAGE_LIBSEXY
bool "libsexy has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 317030a44e..9746fd954b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -428,7 +428,6 @@ comment "X window managers"
source "package/evilwm/Config.in"
source "package/fluxbox/Config.in"
source "package/matchbox/Config.in"
- source "package/metacity/Config.in"
source "package/openbox/Config.in"
source "package/ratpoison/Config.in"
endmenu
diff --git a/package/metacity/0001-add-libm-reference.patch b/package/metacity/0001-add-libm-reference.patch
deleted file mode 100644
index 628501726a..0000000000
--- a/package/metacity/0001-add-libm-reference.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream fix to link metacity itself against libm
-
-The upstream fix is modified to also include the changes on the
-configure script directly, so that autoreconfiguring is not
-needed. Autoreconfiguring cannot be done easily on metacity, due to
-missing AM_GCONF_SOURCE_2 and AM_NLS macros.
-
-http://git.gnome.org/browse/metacity/commit/configure.in?id=9cb0b6ff520ea69bdff6c328a21787202aee1bcc
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-From 9cb0b6ff520ea69bdff6c328a21787202aee1bcc Mon Sep 17 00:00:00 2001
-From: Götz Waschk <waschk@mandriva.org>
-Date: Wed, 22 Oct 2008 12:08:48 +0000
-Subject: add libm reference. Closes #557357.
-
-2008-10-22 Götz Waschk <waschk@mandriva.org>
-
- * configure.in: add libm reference. Closes #557357.
-
-
-svn path=/trunk/; revision=3984
----
-(limited to 'configure.in')
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -413,7 +413,7 @@
- AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
- fi
-
--METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
- METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
- METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
- METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -29509,7 +29509,7 @@
-
- fi
-
--METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
- METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
- METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
- METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
diff --git a/package/metacity/0002-gconf.patch b/package/metacity/0002-gconf.patch
deleted file mode 100644
index 939ef7ef98..0000000000
--- a/package/metacity/0002-gconf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-[PATCH] fix build with --disable-gconf
-
-src/core/prefs.c still contain a call to gconf_client_set_bool() when
-built with --disable-gconf, breaking the build.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/core/prefs.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: metacity-2.25.1/src/core/prefs.c
-===================================================================
---- metacity-2.25.1.orig/src/core/prefs.c
-+++ metacity-2.25.1/src/core/prefs.c
-@@ -2949,6 +2949,7 @@
- void
- meta_prefs_set_compositing_manager (gboolean whether)
- {
-+#if HAVE_GCONF
- GError *err = NULL;
-
- gconf_client_set_bool (default_client,
-@@ -2962,6 +2963,7 @@
- err->message);
- g_error_free (err);
- }
-+#endif
- }
-
- #ifndef HAVE_GCONF
diff --git a/package/metacity/0003-mag-add-libm-reference.patch b/package/metacity/0003-mag-add-libm-reference.patch
deleted file mode 100644
index d47d807558..0000000000
--- a/package/metacity/0003-mag-add-libm-reference.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream patch to fix link against libm
-
-The upstream patch is modified to also include the necessary
-Makefile.in, which avoids the need for autoreconfiguring the
-package. Autoreconfiguring the package unfortunately doesn't work, due
-to AM_GCONF_SOURCE_2 and AM_NLS macros being missing.
-
-http://git.gnome.org/browse/metacity/commit/src/tools/Makefile.am?id=13d0d52eb885598885b6ff4b73c795c8f29c2a6b
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-From 13d0d52eb885598885b6ff4b73c795c8f29c2a6b Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sun, 02 May 2010 14:50:42 +0000
-Subject: fails to link with pedantic linkers
-
----
-(limited to 'src/tools/Makefile.am')
-
-Index: b/src/tools/Makefile.am
-===================================================================
---- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -26,7 +26,7 @@
-
- metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
- metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
--metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@
-+metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm
- metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
-
- EXTRA_DIST=$(icon_DATA)
-Index: b/src/tools/Makefile.in
-===================================================================
---- a/src/tools/Makefile.in
-+++ b/src/tools/Makefile.in
-@@ -281,7 +281,7 @@
-
- metacity_message_LDADD = @METACITY_MESSAGE_LIBS@
- metacity_window_demo_LDADD = @METACITY_WINDOW_DEMO_LIBS@
--metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@
-+metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -lm
- metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
- EXTRA_DIST = $(icon_DATA)
- all: all-am
diff --git a/package/metacity/Config.in b/package/metacity/Config.in
deleted file mode 100644
index fc106a26b9..0000000000
--- a/package/metacity/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config BR2_PACKAGE_METACITY
- bool "metacity"
- depends on BR2_PACKAGE_LIBGTK2
- depends on BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBX11
- # Metacity configure.ac pretends it can be built without
- # Composite, but in reality, it doesn't build.
- select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
- select BR2_PACKAGE_XLIB_LIBXFIXES
- select BR2_PACKAGE_XLIB_LIBXRENDER
- select BR2_PACKAGE_XLIB_LIBXDAMAGE
- # We do not directly depend on Xft, but they are needed to get
- # Xft support in Pango, which we require.
- select BR2_PACKAGE_XLIB_LIBXFT
- help
- Metacity is a window manager for the X Window System.
-
- https://wiki.gnome.org/Projects/Metacity
diff --git a/package/metacity/Xsession b/package/metacity/Xsession
deleted file mode 100755
index 7225921a07..0000000000
--- a/package/metacity/Xsession
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export GDK_USE_XFT=1
-export LANG="en_US.UTF-8"
-export LC_ALL="en_US.UTF-8"
-/usr/bin/X11/rxvt -bg black -fg gray90 &
-exec /bin/metacity
diff --git a/package/metacity/metacity.hash b/package/metacity/metacity.hash
deleted file mode 100644
index 2aca099038..0000000000
--- a/package/metacity/metacity.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From https://download.gnome.org/sources/metacity/2.25/metacity-2.25.1.sha256sum
-sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2
-
-# Locally computed
-sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
deleted file mode 100644
index 5756658300..0000000000
--- a/package/metacity/metacity.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-################################################################################
-#
-# metacity
-#
-################################################################################
-
-# newer versions need libcanberra-gtk and gnome-doc-utils
-METACITY_VERSION_MAJOR = 2.25
-METACITY_VERSION = $(METACITY_VERSION_MAJOR).1
-METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2
-METACITY_SITE = https://download.gnome.org/sources/metacity/$(METACITY_VERSION_MAJOR)
-METACITY_LICENSE = GPL-2.0+
-METACITY_LICENSE_FILES = COPYING
-
-METACITY_CONF_OPTS = \
- --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib \
- --disable-glibtest \
- --disable-gconf \
- --disable-sm \
- --disable-startup-notification
-
-METACITY_DEPENDENCIES = libgtk2 \
- xlib_libX11 \
- host-libxml-parser-perl \
- xlib_libXcomposite \
- xlib_libXfixes \
- xlib_libXrender \
- xlib_libXdamage \
- $(TARGET_NLS_DEPENDENCIES)
-
-METACITY_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
-METACITY_DEPENDENCIES += xlib_libXcursor
-endif
-
-define METACITY_INSTALL_XSESSION
- $(INSTALL) -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession
-endef
-
-METACITY_POST_INSTALL_TARGET_HOOKS += METACITY_INSTALL_XSESSION
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 13/23] package/metacity: remove package
2025-09-10 21:32 ` [Buildroot] [PATCH 13/23] package/metacity: remove package Thomas Petazzoni via buildroot
@ 2025-09-11 20:09 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:09 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> This window manager requires libgtk2, which we are about to remove, so
> let's drop metacity.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This one is actually still developed, but no update in Buildroot since 2011,
so for me it's fine to remove.
Applied to master, thanks.
Regards,
Arnout
> ---
> .checkpackageignore | 3 --
> Config.in.legacy | 7 +++
> package/Config.in | 1 -
> .../metacity/0001-add-libm-reference.patch | 51 -------------------
> package/metacity/0002-gconf.patch | 30 -----------
> .../0003-mag-add-libm-reference.patch | 45 ----------------
> package/metacity/Config.in | 18 -------
> package/metacity/Xsession | 6 ---
> package/metacity/metacity.hash | 5 --
> package/metacity/metacity.mk | 44 ----------------
> 10 files changed, 7 insertions(+), 203 deletions(-)
> delete mode 100644 package/metacity/0001-add-libm-reference.patch
> delete mode 100644 package/metacity/0002-gconf.patch
> delete mode 100644 package/metacity/0003-mag-add-libm-reference.patch
> delete mode 100644 package/metacity/Config.in
> delete mode 100755 package/metacity/Xsession
> delete mode 100644 package/metacity/metacity.hash
> delete mode 100644 package/metacity/metacity.mk
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 426d112c14..9b75d4da14 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -734,9 +734,6 @@ package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch lib_pat
> package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch lib_patch.Upstream
> package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch lib_patch.Upstream
> package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch lib_patch.Upstream
> -package/metacity/0001-add-libm-reference.patch lib_patch.Upstream
> -package/metacity/0002-gconf.patch lib_patch.Upstream
> -package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream
> package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream
> package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream
> package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 548e517b42..5c3b289688 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_METACITY
> + bool "metacity has been removed"
> + select BR2_LEGACY
> + help
> + The metacity package has been removed, as libgtk2 has been
> + removed as well.
> +
> config BR2_PACKAGE_LIBSEXY
> bool "libsexy has been removed"
> select BR2_LEGACY
> diff --git a/package/Config.in b/package/Config.in
> index 317030a44e..9746fd954b 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -428,7 +428,6 @@ comment "X window managers"
> source "package/evilwm/Config.in"
> source "package/fluxbox/Config.in"
> source "package/matchbox/Config.in"
> - source "package/metacity/Config.in"
> source "package/openbox/Config.in"
> source "package/ratpoison/Config.in"
> endmenu
> diff --git a/package/metacity/0001-add-libm-reference.patch b/package/metacity/0001-add-libm-reference.patch
> deleted file mode 100644
> index 628501726a..0000000000
> --- a/package/metacity/0001-add-libm-reference.patch
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -Upstream fix to link metacity itself against libm
> -
> -The upstream fix is modified to also include the changes on the
> -configure script directly, so that autoreconfiguring is not
> -needed. Autoreconfiguring cannot be done easily on metacity, due to
> -missing AM_GCONF_SOURCE_2 and AM_NLS macros.
> -
> -http://git.gnome.org/browse/metacity/commit/configure.in?id=9cb0b6ff520ea69bdff6c328a21787202aee1bcc
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> -
> -From 9cb0b6ff520ea69bdff6c328a21787202aee1bcc Mon Sep 17 00:00:00 2001
> -From: Götz Waschk <waschk@mandriva.org>
> -Date: Wed, 22 Oct 2008 12:08:48 +0000
> -Subject: add libm reference. Closes #557357.
> -
> -2008-10-22 Götz Waschk <waschk@mandriva.org>
> -
> - * configure.in: add libm reference. Closes #557357.
> -
> -
> -svn path=/trunk/; revision=3984
> ----
> -(limited to 'configure.in')
> -
> -Index: b/configure.in
> -===================================================================
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -413,7 +413,7 @@
> - AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
> - fi
> -
> --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
> - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> -Index: b/configure
> -===================================================================
> ---- a/configure
> -+++ b/configure
> -@@ -29509,7 +29509,7 @@
> -
> - fi
> -
> --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
> - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
> diff --git a/package/metacity/0002-gconf.patch b/package/metacity/0002-gconf.patch
> deleted file mode 100644
> index 939ef7ef98..0000000000
> --- a/package/metacity/0002-gconf.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -[PATCH] fix build with --disable-gconf
> -
> -src/core/prefs.c still contain a call to gconf_client_set_bool() when
> -built with --disable-gconf, breaking the build.
> -
> -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
> ----
> - src/core/prefs.c | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -Index: metacity-2.25.1/src/core/prefs.c
> -===================================================================
> ---- metacity-2.25.1.orig/src/core/prefs.c
> -+++ metacity-2.25.1/src/core/prefs.c
> -@@ -2949,6 +2949,7 @@
> - void
> - meta_prefs_set_compositing_manager (gboolean whether)
> - {
> -+#if HAVE_GCONF
> - GError *err = NULL;
> -
> - gconf_client_set_bool (default_client,
> -@@ -2962,6 +2963,7 @@
> - err->message);
> - g_error_free (err);
> - }
> -+#endif
> - }
> -
> - #ifndef HAVE_GCONF
> diff --git a/package/metacity/0003-mag-add-libm-reference.patch b/package/metacity/0003-mag-add-libm-reference.patch
> deleted file mode 100644
> index d47d807558..0000000000
> --- a/package/metacity/0003-mag-add-libm-reference.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -Upstream patch to fix link against libm
> -
> -The upstream patch is modified to also include the necessary
> -Makefile.in, which avoids the need for autoreconfiguring the
> -package. Autoreconfiguring the package unfortunately doesn't work, due
> -to AM_GCONF_SOURCE_2 and AM_NLS macros being missing.
> -
> -http://git.gnome.org/browse/metacity/commit/src/tools/Makefile.am?id=13d0d52eb885598885b6ff4b73c795c8f29c2a6b
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> -
> -From 13d0d52eb885598885b6ff4b73c795c8f29c2a6b Mon Sep 17 00:00:00 2001
> -From: Matthias Clasen <mclasen@redhat.com>
> -Date: Sun, 02 May 2010 14:50:42 +0000
> -Subject: fails to link with pedantic linkers
> -
> ----
> -(limited to 'src/tools/Makefile.am')
> -
> -Index: b/src/tools/Makefile.am
> -===================================================================
> ---- a/src/tools/Makefile.am
> -+++ b/src/tools/Makefile.am
> -@@ -26,7 +26,7 @@
> -
> - metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
> - metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
> --metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@
> -+metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm
> - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
> -
> - EXTRA_DIST=$(icon_DATA)
> -Index: b/src/tools/Makefile.in
> -===================================================================
> ---- a/src/tools/Makefile.in
> -+++ b/src/tools/Makefile.in
> -@@ -281,7 +281,7 @@
> -
> - metacity_message_LDADD = @METACITY_MESSAGE_LIBS@
> - metacity_window_demo_LDADD = @METACITY_WINDOW_DEMO_LIBS@
> --metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@
> -+metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -lm
> - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
> - EXTRA_DIST = $(icon_DATA)
> - all: all-am
> diff --git a/package/metacity/Config.in b/package/metacity/Config.in
> deleted file mode 100644
> index fc106a26b9..0000000000
> --- a/package/metacity/Config.in
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -config BR2_PACKAGE_METACITY
> - bool "metacity"
> - depends on BR2_PACKAGE_LIBGTK2
> - depends on BR2_PACKAGE_XORG7
> - select BR2_PACKAGE_XLIB_LIBX11
> - # Metacity configure.ac pretends it can be built without
> - # Composite, but in reality, it doesn't build.
> - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
> - select BR2_PACKAGE_XLIB_LIBXFIXES
> - select BR2_PACKAGE_XLIB_LIBXRENDER
> - select BR2_PACKAGE_XLIB_LIBXDAMAGE
> - # We do not directly depend on Xft, but they are needed to get
> - # Xft support in Pango, which we require.
> - select BR2_PACKAGE_XLIB_LIBXFT
> - help
> - Metacity is a window manager for the X Window System.
> -
> - https://wiki.gnome.org/Projects/Metacity
> diff --git a/package/metacity/Xsession b/package/metacity/Xsession
> deleted file mode 100755
> index 7225921a07..0000000000
> --- a/package/metacity/Xsession
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#!/bin/sh
> -export GDK_USE_XFT=1
> -export LANG="en_US.UTF-8"
> -export LC_ALL="en_US.UTF-8"
> -/usr/bin/X11/rxvt -bg black -fg gray90 &
> -exec /bin/metacity
> diff --git a/package/metacity/metacity.hash b/package/metacity/metacity.hash
> deleted file mode 100644
> index 2aca099038..0000000000
> --- a/package/metacity/metacity.hash
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# From https://download.gnome.org/sources/metacity/2.25/metacity-2.25.1.sha256sum
> -sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2
> -
> -# Locally computed
> -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
> diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
> deleted file mode 100644
> index 5756658300..0000000000
> --- a/package/metacity/metacity.mk
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -################################################################################
> -#
> -# metacity
> -#
> -################################################################################
> -
> -# newer versions need libcanberra-gtk and gnome-doc-utils
> -METACITY_VERSION_MAJOR = 2.25
> -METACITY_VERSION = $(METACITY_VERSION_MAJOR).1
> -METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2
> -METACITY_SITE = https://download.gnome.org/sources/metacity/$(METACITY_VERSION_MAJOR)
> -METACITY_LICENSE = GPL-2.0+
> -METACITY_LICENSE_FILES = COPYING
> -
> -METACITY_CONF_OPTS = \
> - --x-includes=$(STAGING_DIR)/usr/include/X11 \
> - --x-libraries=$(STAGING_DIR)/usr/lib \
> - --disable-glibtest \
> - --disable-gconf \
> - --disable-sm \
> - --disable-startup-notification
> -
> -METACITY_DEPENDENCIES = libgtk2 \
> - xlib_libX11 \
> - host-libxml-parser-perl \
> - xlib_libXcomposite \
> - xlib_libXfixes \
> - xlib_libXrender \
> - xlib_libXdamage \
> - $(TARGET_NLS_DEPENDENCIES)
> -
> -METACITY_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
> -
> -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
> -METACITY_DEPENDENCIES += xlib_libXcursor
> -endif
> -
> -define METACITY_INSTALL_XSESSION
> - $(INSTALL) -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession
> -endef
> -
> -METACITY_POST_INSTALL_TARGET_HOOKS += METACITY_INSTALL_XSESSION
> -
> -$(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 14/23] package/mjpegtools: drop optional dependency on libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (12 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 13/23] package/metacity: remove package Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:11 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 15/23] package/netsurf: drop support for gtk backend Thomas Petazzoni via buildroot
` (9 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Steve Kenton
As we're about to remove libgtk2, let's drop the optional dependency
of mjpegtools on libgtk2, and forcefully disable gtk support.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/mjpegtools/mjpegtools.mk | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/package/mjpegtools/mjpegtools.mk b/package/mjpegtools/mjpegtools.mk
index 8d6c475518..871d1b8f36 100644
--- a/package/mjpegtools/mjpegtools.mk
+++ b/package/mjpegtools/mjpegtools.mk
@@ -10,6 +10,7 @@ MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg
MJPEGTOOLS_INSTALL_STAGING = YES
MJPEGTOOLS_LICENSE = GPL-2.0+
MJPEGTOOLS_LICENSE_FILES = COPYING
+MJPEGTOOLS_CONF_OPTS = --without-gtk
ifeq ($(BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT),y)
MJPEGTOOLS_CONF_OPTS += --enable-simd-accel
@@ -53,11 +54,4 @@ else
MJPEGTOOLS_CONF_OPTS += --without-dga
endif
-ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-MJPEGTOOLS_CONF_OPTS += --with-gtk
-MJPEGTOOLS_DEPENDENCIES += libgtk2
-else
-MJPEGTOOLS_CONF_OPTS += --without-gtk
-endif
-
$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 14/23] package/mjpegtools: drop optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 14/23] package/mjpegtools: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 20:11 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:11 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Steve Kenton
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, let's drop the optional dependency
> of mjpegtools on libgtk2, and forcefully disable gtk support.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/mjpegtools/mjpegtools.mk | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/package/mjpegtools/mjpegtools.mk b/package/mjpegtools/mjpegtools.mk
> index 8d6c475518..871d1b8f36 100644
> --- a/package/mjpegtools/mjpegtools.mk
> +++ b/package/mjpegtools/mjpegtools.mk
> @@ -10,6 +10,7 @@ MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg
> MJPEGTOOLS_INSTALL_STAGING = YES
> MJPEGTOOLS_LICENSE = GPL-2.0+
> MJPEGTOOLS_LICENSE_FILES = COPYING
> +MJPEGTOOLS_CONF_OPTS = --without-gtk
>
> ifeq ($(BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT),y)
> MJPEGTOOLS_CONF_OPTS += --enable-simd-accel
> @@ -53,11 +54,4 @@ else
> MJPEGTOOLS_CONF_OPTS += --without-dga
> endif
>
> -ifeq ($(BR2_PACKAGE_LIBGTK2),y)
> -MJPEGTOOLS_CONF_OPTS += --with-gtk
> -MJPEGTOOLS_DEPENDENCIES += libgtk2
> -else
> -MJPEGTOOLS_CONF_OPTS += --without-gtk
> -endif
> -
> $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 15/23] package/netsurf: drop support for gtk backend
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (13 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 14/23] package/mjpegtools: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:12 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 16/23] package/opencv3: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
` (8 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
As we're about to remove the libgtk2 package, let's drop the gtk
backend from netsurf. It is worth mentioning that the gtk3 backend
remains in place as an alternative.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 8 ++++++++
package/netsurf/Config.in | 6 ------
package/netsurf/netsurf.mk | 7 -------
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 5c3b289688..e1fe008cf5 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_NETSURF_GTK
+ bool "gtk backend of netsurf has been removed"
+ select BR2_LEGACY
+ help
+ Due to the removal of libgtk2, the gtk backend of netsurf
+ has been removed. The gtk3 backend can be used instead for
+ example.
+
config BR2_PACKAGE_METACITY
bool "metacity has been removed"
select BR2_LEGACY
diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in
index 394befcf28..dd37d876f6 100644
--- a/package/netsurf/Config.in
+++ b/package/netsurf/Config.in
@@ -40,12 +40,6 @@ config BR2_PACKAGE_NETSURF_SDL
help
Select SDL 1.2 frontend.
-config BR2_PACKAGE_NETSURF_GTK
- bool "gtk2 frontend"
- depends on BR2_PACKAGE_LIBGTK2
- help
- Select GTK+ 2 frontend.
-
config BR2_PACKAGE_NETSURF_GTK3
bool "gtk3 frontend"
depends on BR2_PACKAGE_LIBGTK3
diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
index 574c1423df..383cd8ab9d 100644
--- a/package/netsurf/netsurf.mk
+++ b/package/netsurf/netsurf.mk
@@ -25,17 +25,10 @@ define NETSURF_DUKTAPE_CONFIGURE_CMDS
endef
endif
-ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
-NETSURF_DEPENDENCIES += libgtk2
-NETSURF_FRONTEND = gtk2
-endif
-
ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y)
NETSURF_DEPENDENCIES += libgtk3
NETSURF_FRONTEND = gtk3
-endif
-ifeq ($(BR2_PACKAGE_NETSURF_GTK)$(BR2_PACKAGE_NETSURF_GTK3),y)
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
NETSURF_DEPENDENCIES += librsvg
define NETSURF_SVG_CONFIGURE_CMDS
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 15/23] package/netsurf: drop support for gtk backend
2025-09-10 21:32 ` [Buildroot] [PATCH 15/23] package/netsurf: drop support for gtk backend Thomas Petazzoni via buildroot
@ 2025-09-11 20:12 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:12 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove the libgtk2 package, let's drop the gtk
> backend from netsurf. It is worth mentioning that the gtk3 backend
> remains in place as an alternative.
It's a frontend, not a backend :-)
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Config.in.legacy | 8 ++++++++
> package/netsurf/Config.in | 6 ------
> package/netsurf/netsurf.mk | 7 -------
> 3 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 5c3b289688..e1fe008cf5 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,14 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_NETSURF_GTK
> + bool "gtk backend of netsurf has been removed"
> + select BR2_LEGACY
> + help
> + Due to the removal of libgtk2, the gtk backend of netsurf
> + has been removed. The gtk3 backend can be used instead for
> + example.
Here as well.
Applied to master with that fixed, thanks.
Regards,
Arnout
> +
> config BR2_PACKAGE_METACITY
> bool "metacity has been removed"
> select BR2_LEGACY
> diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in
> index 394befcf28..dd37d876f6 100644
> --- a/package/netsurf/Config.in
> +++ b/package/netsurf/Config.in
> @@ -40,12 +40,6 @@ config BR2_PACKAGE_NETSURF_SDL
> help
> Select SDL 1.2 frontend.
>
> -config BR2_PACKAGE_NETSURF_GTK
> - bool "gtk2 frontend"
> - depends on BR2_PACKAGE_LIBGTK2
> - help
> - Select GTK+ 2 frontend.
> -
> config BR2_PACKAGE_NETSURF_GTK3
> bool "gtk3 frontend"
> depends on BR2_PACKAGE_LIBGTK3
> diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
> index 574c1423df..383cd8ab9d 100644
> --- a/package/netsurf/netsurf.mk
> +++ b/package/netsurf/netsurf.mk
> @@ -25,17 +25,10 @@ define NETSURF_DUKTAPE_CONFIGURE_CMDS
> endef
> endif
>
> -ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
> -NETSURF_DEPENDENCIES += libgtk2
> -NETSURF_FRONTEND = gtk2
> -endif
> -
> ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y)
> NETSURF_DEPENDENCIES += libgtk3
> NETSURF_FRONTEND = gtk3
> -endif
>
> -ifeq ($(BR2_PACKAGE_NETSURF_GTK)$(BR2_PACKAGE_NETSURF_GTK3),y)
> ifeq ($(BR2_PACKAGE_LIBRSVG),y)
> NETSURF_DEPENDENCIES += librsvg
> define NETSURF_SVG_CONFIGURE_CMDS
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 16/23] package/opencv3: drop optional dependency on libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (14 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 15/23] package/netsurf: drop support for gtk backend Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:21 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 17/23] package/opencv4: " Thomas Petazzoni via buildroot
` (7 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
As we're about to remove libgtk2, we need to drop libgtk2 support from
opencv3. gtk3 support remains in place.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/opencv3/Config.in | 9 ---------
package/opencv3/opencv3.mk | 14 ++++----------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index a672497108..c4c5d22a54 100644
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -63,15 +63,6 @@ choice
config BR2_PACKAGE_OPENCV3_GUI_NONE
bool "none"
-config BR2_PACKAGE_OPENCV3_WITH_GTK
- bool "gtk2"
- depends on BR2_PACKAGE_LIBGTK2
-
-comment "gtk2 support needs libgtk2"
- depends on BR2_USE_MMU # libgtk2 -> glib2
- depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_PACKAGE_LIBGTK2
-
config BR2_PACKAGE_OPENCV3_WITH_GTK3
bool "gtk3"
depends on BR2_PACKAGE_LIBGTK3
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 218174c17e..8a862a47b1 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -215,6 +215,7 @@ OPENCV3_CONF_OPTS += \
-DWITH_GDAL=OFF \
-DWITH_GPHOTO2=OFF \
-DWITH_GSTREAMER_0_10=OFF \
+ -DWITH_GTK_2_X=OFF \
-DWITH_LAPACK=OFF \
-DWITH_MATLAB=OFF \
-DWITH_OPENCL=OFF \
@@ -244,18 +245,11 @@ else
OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=OFF
endif
-ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK)$(BR2_PACKAGE_OPENCV3_WITH_GTK3),)
-OPENCV3_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF
-endif
-
-ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK),y)
-OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON
-OPENCV3_DEPENDENCIES += libgtk2
-endif
-
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK3),y)
-OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF
+OPENCV3_CONF_OPTS += -DWITH_GTK=ON
OPENCV3_DEPENDENCIES += libgtk3
+else
+OPENCV3_CONF_OPTS += -DWITH_GTK=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_JASPER),y)
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 16/23] package/opencv3: drop optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 16/23] package/opencv3: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 20:21 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:21 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, we need to drop libgtk2 support from
> opencv3. gtk3 support remains in place.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, after adding legacy handling, thanks.
Regards,
Arnout
> ---
> package/opencv3/Config.in | 9 ---------
> package/opencv3/opencv3.mk | 14 ++++----------
> 2 files changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
> index a672497108..c4c5d22a54 100644
> --- a/package/opencv3/Config.in
> +++ b/package/opencv3/Config.in
> @@ -63,15 +63,6 @@ choice
> config BR2_PACKAGE_OPENCV3_GUI_NONE
> bool "none"
>
> -config BR2_PACKAGE_OPENCV3_WITH_GTK
> - bool "gtk2"
> - depends on BR2_PACKAGE_LIBGTK2
> -
> -comment "gtk2 support needs libgtk2"
> - depends on BR2_USE_MMU # libgtk2 -> glib2
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4
> - depends on !BR2_PACKAGE_LIBGTK2
> -
> config BR2_PACKAGE_OPENCV3_WITH_GTK3
> bool "gtk3"
> depends on BR2_PACKAGE_LIBGTK3
> diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
> index 218174c17e..8a862a47b1 100644
> --- a/package/opencv3/opencv3.mk
> +++ b/package/opencv3/opencv3.mk
> @@ -215,6 +215,7 @@ OPENCV3_CONF_OPTS += \
> -DWITH_GDAL=OFF \
> -DWITH_GPHOTO2=OFF \
> -DWITH_GSTREAMER_0_10=OFF \
> + -DWITH_GTK_2_X=OFF \
> -DWITH_LAPACK=OFF \
> -DWITH_MATLAB=OFF \
> -DWITH_OPENCL=OFF \
> @@ -244,18 +245,11 @@ else
> OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=OFF
> endif
>
> -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK)$(BR2_PACKAGE_OPENCV3_WITH_GTK3),)
> -OPENCV3_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK),y)
> -OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON
> -OPENCV3_DEPENDENCIES += libgtk2
> -endif
> -
> ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK3),y)
> -OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF
> +OPENCV3_CONF_OPTS += -DWITH_GTK=ON
> OPENCV3_DEPENDENCIES += libgtk3
> +else
> +OPENCV3_CONF_OPTS += -DWITH_GTK=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_OPENCV3_WITH_JASPER),y)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 17/23] package/opencv4: drop optional dependency on libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (15 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 16/23] package/opencv3: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 12:36 ` Woody Douglass via buildroot
2025-09-11 20:21 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 18/23] package/pinentry: remove gtk2 backend support Thomas Petazzoni via buildroot
` (6 subsequent siblings)
23 siblings, 2 replies; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Fabrice Fontaine, Woodrow Douglass
As we're about to remove libgtk2, we need to drop libgtk2 support
from opencv4. gtk3 support remains in place.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/opencv4/Config.in | 9 ---------
package/opencv4/opencv4.mk | 14 ++++----------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in
index f71ceba2c5..a553411e1a 100644
--- a/package/opencv4/Config.in
+++ b/package/opencv4/Config.in
@@ -81,15 +81,6 @@ choice
config BR2_PACKAGE_OPENCV4_GUI_NONE
bool "none"
-config BR2_PACKAGE_OPENCV4_WITH_GTK
- bool "gtk2"
- depends on BR2_PACKAGE_LIBGTK2
-
-comment "gtk2 support needs libgtk2"
- depends on BR2_USE_MMU # libgtk2 -> glib2
- depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_PACKAGE_LIBGTK2
-
config BR2_PACKAGE_OPENCV4_WITH_GTK3
bool "gtk3"
depends on BR2_PACKAGE_LIBGTK3
diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk
index 01f70dfe49..d3df1a39f7 100644
--- a/package/opencv4/opencv4.mk
+++ b/package/opencv4/opencv4.mk
@@ -211,6 +211,7 @@ OPENCV4_CONF_OPTS += \
-DWITH_GDAL=OFF \
-DWITH_GPHOTO2=OFF \
-DWITH_GSTREAMER_0_10=OFF \
+ -DWITH_GTK_2_X=OFF \
-DWITH_LAPACK=OFF \
-DWITH_MATLAB=OFF \
-DWITH_OPENCL=OFF \
@@ -316,18 +317,11 @@ else
OPENCV4_CONF_OPTS += -DWITH_GSTREAMER=OFF
endif
-ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK)$(BR2_PACKAGE_OPENCV4_WITH_GTK3),)
-OPENCV4_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF
-endif
-
-ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK),y)
-OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON
-OPENCV4_DEPENDENCIES += libgtk2
-endif
-
ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK3),y)
-OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF
+OPENCV4_CONF_OPTS += -DWITH_GTK=ON
OPENCV4_DEPENDENCIES += libgtk3
+else
+OPENCV4_CONF_OPTS += -DWITH_GTK=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV4_WITH_JPEG),y)
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 17/23] package/opencv4: drop optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 17/23] package/opencv4: " Thomas Petazzoni via buildroot
@ 2025-09-11 12:36 ` Woody Douglass via buildroot
2025-09-11 20:21 ` Arnout Vandecappelle via buildroot
1 sibling, 0 replies; 52+ messages in thread
From: Woody Douglass via buildroot @ 2025-09-11 12:36 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot@buildroot.org; +Cc: Fabrice Fontaine
Thomas,
Sounds good to me!
Reviewed-by: Woodrow Douglass <wdouglass@carnegierobotics.com>
Thanks,
Woodrow Douglass
On 9/10/25 17:32, Thomas Petazzoni wrote:
> As we're about to remove libgtk2, we need to drop libgtk2 support
> from opencv4. gtk3 support remains in place.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> package/opencv4/Config.in | 9 ---------
> package/opencv4/opencv4.mk | 14 ++++----------
> 2 files changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in
> index f71ceba2c5..a553411e1a 100644
> --- a/package/opencv4/Config.in
> +++ b/package/opencv4/Config.in
> @@ -81,15 +81,6 @@ choice
> config BR2_PACKAGE_OPENCV4_GUI_NONE
> bool "none"
>
> -config BR2_PACKAGE_OPENCV4_WITH_GTK
> - bool "gtk2"
> - depends on BR2_PACKAGE_LIBGTK2
> -
> -comment "gtk2 support needs libgtk2"
> - depends on BR2_USE_MMU # libgtk2 -> glib2
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4
> - depends on !BR2_PACKAGE_LIBGTK2
> -
> config BR2_PACKAGE_OPENCV4_WITH_GTK3
> bool "gtk3"
> depends on BR2_PACKAGE_LIBGTK3
> diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk
> index 01f70dfe49..d3df1a39f7 100644
> --- a/package/opencv4/opencv4.mk
> +++ b/package/opencv4/opencv4.mk
> @@ -211,6 +211,7 @@ OPENCV4_CONF_OPTS += \
> -DWITH_GDAL=OFF \
> -DWITH_GPHOTO2=OFF \
> -DWITH_GSTREAMER_0_10=OFF \
> + -DWITH_GTK_2_X=OFF \
> -DWITH_LAPACK=OFF \
> -DWITH_MATLAB=OFF \
> -DWITH_OPENCL=OFF \
> @@ -316,18 +317,11 @@ else
> OPENCV4_CONF_OPTS += -DWITH_GSTREAMER=OFF
> endif
>
> -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK)$(BR2_PACKAGE_OPENCV4_WITH_GTK3),)
> -OPENCV4_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK),y)
> -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON
> -OPENCV4_DEPENDENCIES += libgtk2
> -endif
> -
> ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK3),y)
> -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF
> +OPENCV4_CONF_OPTS += -DWITH_GTK=ON
> OPENCV4_DEPENDENCIES += libgtk3
> +else
> +OPENCV4_CONF_OPTS += -DWITH_GTK=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_OPENCV4_WITH_JPEG),y)
> --
> 2.51.0
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [Buildroot] [PATCH 17/23] package/opencv4: drop optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 17/23] package/opencv4: " Thomas Petazzoni via buildroot
2025-09-11 12:36 ` Woody Douglass via buildroot
@ 2025-09-11 20:21 ` Arnout Vandecappelle via buildroot
1 sibling, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:21 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Fabrice Fontaine, Woodrow Douglass
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, we need to drop libgtk2 support
> from opencv4. gtk3 support remains in place.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, after adding legacy handling, thanks.
Regards,
Arnout
> ---
> package/opencv4/Config.in | 9 ---------
> package/opencv4/opencv4.mk | 14 ++++----------
> 2 files changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in
> index f71ceba2c5..a553411e1a 100644
> --- a/package/opencv4/Config.in
> +++ b/package/opencv4/Config.in
> @@ -81,15 +81,6 @@ choice
> config BR2_PACKAGE_OPENCV4_GUI_NONE
> bool "none"
>
> -config BR2_PACKAGE_OPENCV4_WITH_GTK
> - bool "gtk2"
> - depends on BR2_PACKAGE_LIBGTK2
> -
> -comment "gtk2 support needs libgtk2"
> - depends on BR2_USE_MMU # libgtk2 -> glib2
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4
> - depends on !BR2_PACKAGE_LIBGTK2
> -
> config BR2_PACKAGE_OPENCV4_WITH_GTK3
> bool "gtk3"
> depends on BR2_PACKAGE_LIBGTK3
> diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk
> index 01f70dfe49..d3df1a39f7 100644
> --- a/package/opencv4/opencv4.mk
> +++ b/package/opencv4/opencv4.mk
> @@ -211,6 +211,7 @@ OPENCV4_CONF_OPTS += \
> -DWITH_GDAL=OFF \
> -DWITH_GPHOTO2=OFF \
> -DWITH_GSTREAMER_0_10=OFF \
> + -DWITH_GTK_2_X=OFF \
> -DWITH_LAPACK=OFF \
> -DWITH_MATLAB=OFF \
> -DWITH_OPENCL=OFF \
> @@ -316,18 +317,11 @@ else
> OPENCV4_CONF_OPTS += -DWITH_GSTREAMER=OFF
> endif
>
> -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK)$(BR2_PACKAGE_OPENCV4_WITH_GTK3),)
> -OPENCV4_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK),y)
> -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON
> -OPENCV4_DEPENDENCIES += libgtk2
> -endif
> -
> ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK3),y)
> -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF
> +OPENCV4_CONF_OPTS += -DWITH_GTK=ON
> OPENCV4_DEPENDENCIES += libgtk3
> +else
> +OPENCV4_CONF_OPTS += -DWITH_GTK=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_OPENCV4_WITH_JPEG),y)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 18/23] package/pinentry: remove gtk2 backend support
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (16 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 17/23] package/opencv4: " Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:21 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 19/23] package/putty: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
` (5 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
As we're about to remove libgtk2, we need to first remove support for
the gtk2 backend of pinentry, which this patch does.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 7 +++++++
package/pinentry/Config.in | 22 ----------------------
package/pinentry/pinentry.mk | 12 +++---------
3 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index e1fe008cf5..a1b321578b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_PINENTRY_GTK2
+ bool "gtk2 backend of pinentry has been removed"
+ select BR2_LEGACY
+ help
+ Due to the removal of libgtk2, the gtk2 backend of pinentry
+ has been removed.
+
config BR2_PACKAGE_NETSURF_GTK
bool "gtk backend of netsurf has been removed"
select BR2_LEGACY
diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
index bd5e3af5a1..dc8c9724d7 100644
--- a/package/pinentry/Config.in
+++ b/package/pinentry/Config.in
@@ -6,7 +6,6 @@ menuconfig BR2_PACKAGE_PINENTRY
select BR2_PACKAGE_LIBGPG_ERROR
# At least one backend is needed to avoid build breakage
select BR2_PACKAGE_PINENTRY_NCURSES if \
- !BR2_PACKAGE_PINENTRY_GTK2 && \
!BR2_PACKAGE_PINENTRY_QT5
help
A collection of simple PIN or pass-phrase entry dialogs
@@ -46,27 +45,6 @@ config BR2_PACKAGE_PINENTRY_NCURSES
help
The pinentry-ncurses tool
-config BR2_PACKAGE_PINENTRY_GTK2
- bool "pinentry-gtk2"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_WCHAR
- depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on BR2_USE_MMU
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz
- select BR2_PACKAGE_LIBGTK2
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
- help
- The pinentry-gtk2 tool
-
-comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
- depends on BR2_USE_MMU
- depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
- !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-
config BR2_PACKAGE_PINENTRY_QT5
bool "pinentry-qt5"
depends on BR2_INSTALL_LIBSTDCPP
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
index 7482a93d02..ef17df7657 100644
--- a/package/pinentry/pinentry.mk
+++ b/package/pinentry/pinentry.mk
@@ -13,10 +13,12 @@ PINENTRY_DEPENDENCIES = \
libassuan libgpg-error \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
host-pkgconf
+# --disable-libcap to avoid PAM dependency
PINENTRY_CONF_OPTS += \
--with-libassuan-prefix=$(STAGING_DIR)/usr \
--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
- --without-libcap # requires PAM
+ --without-libcap \
+ --disable-pinentry-gtk2
# Force the path to "gpgrt-config" (from the libgpg-error package) to
# avoid using the one on host, if present.
@@ -58,14 +60,6 @@ else
PINENTRY_CONF_OPTS += --disable-ncurses
endif
-# pinentry-gtk2 backend
-ifeq ($(BR2_PACKAGE_PINENTRY_GTK2),y)
-PINENTRY_CONF_OPTS += --enable-pinentry-gtk2
-PINENTRY_DEPENDENCIES += libgtk2
-else
-PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
-endif
-
# pinentry-qt5 backend
ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y)
PINENTRY_CONF_OPTS += --enable-pinentry-qt
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 18/23] package/pinentry: remove gtk2 backend support
2025-09-10 21:32 ` [Buildroot] [PATCH 18/23] package/pinentry: remove gtk2 backend support Thomas Petazzoni via buildroot
@ 2025-09-11 20:21 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:21 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, we need to first remove support for
> the gtk2 backend of pinentry, which this patch does.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> Config.in.legacy | 7 +++++++
> package/pinentry/Config.in | 22 ----------------------
> package/pinentry/pinentry.mk | 12 +++---------
> 3 files changed, 10 insertions(+), 31 deletions(-)
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index e1fe008cf5..a1b321578b 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_PINENTRY_GTK2
> + bool "gtk2 backend of pinentry has been removed"
> + select BR2_LEGACY
> + help
> + Due to the removal of libgtk2, the gtk2 backend of pinentry
> + has been removed.
> +
> config BR2_PACKAGE_NETSURF_GTK
> bool "gtk backend of netsurf has been removed"
> select BR2_LEGACY
> diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
> index bd5e3af5a1..dc8c9724d7 100644
> --- a/package/pinentry/Config.in
> +++ b/package/pinentry/Config.in
> @@ -6,7 +6,6 @@ menuconfig BR2_PACKAGE_PINENTRY
> select BR2_PACKAGE_LIBGPG_ERROR
> # At least one backend is needed to avoid build breakage
> select BR2_PACKAGE_PINENTRY_NCURSES if \
> - !BR2_PACKAGE_PINENTRY_GTK2 && \
> !BR2_PACKAGE_PINENTRY_QT5
> help
> A collection of simple PIN or pass-phrase entry dialogs
> @@ -46,27 +45,6 @@ config BR2_PACKAGE_PINENTRY_NCURSES
> help
> The pinentry-ncurses tool
>
> -config BR2_PACKAGE_PINENTRY_GTK2
> - bool "pinentry-gtk2"
> - depends on BR2_PACKAGE_XORG7
> - depends on BR2_USE_WCHAR
> - depends on BR2_TOOLCHAIN_HAS_THREADS
> - depends on BR2_USE_MMU
> - depends on BR2_INSTALL_LIBSTDCPP
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
> - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz
> - select BR2_PACKAGE_LIBGTK2
> - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
> - help
> - The pinentry-gtk2 tool
> -
> -comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
> - depends on BR2_USE_MMU
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4
> - depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
> - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
> - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
> -
> config BR2_PACKAGE_PINENTRY_QT5
> bool "pinentry-qt5"
> depends on BR2_INSTALL_LIBSTDCPP
> diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
> index 7482a93d02..ef17df7657 100644
> --- a/package/pinentry/pinentry.mk
> +++ b/package/pinentry/pinentry.mk
> @@ -13,10 +13,12 @@ PINENTRY_DEPENDENCIES = \
> libassuan libgpg-error \
> $(if $(BR2_PACKAGE_LIBICONV),libiconv) \
> host-pkgconf
> +# --disable-libcap to avoid PAM dependency
> PINENTRY_CONF_OPTS += \
> --with-libassuan-prefix=$(STAGING_DIR)/usr \
> --with-libgpg-error-prefix=$(STAGING_DIR)/usr \
> - --without-libcap # requires PAM
> + --without-libcap \
> + --disable-pinentry-gtk2
>
> # Force the path to "gpgrt-config" (from the libgpg-error package) to
> # avoid using the one on host, if present.
> @@ -58,14 +60,6 @@ else
> PINENTRY_CONF_OPTS += --disable-ncurses
> endif
>
> -# pinentry-gtk2 backend
> -ifeq ($(BR2_PACKAGE_PINENTRY_GTK2),y)
> -PINENTRY_CONF_OPTS += --enable-pinentry-gtk2
> -PINENTRY_DEPENDENCIES += libgtk2
> -else
> -PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
> -endif
> -
> # pinentry-qt5 backend
> ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y)
> PINENTRY_CONF_OPTS += --enable-pinentry-qt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 19/23] package/putty: drop optional dependency on libgtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (17 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 18/23] package/pinentry: remove gtk2 backend support Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:27 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 20/23] package/sylpheed: remove package Thomas Petazzoni via buildroot
` (4 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Alexander Dahl
As we're about to remove libgtk2, we need to drop the optional
dependency of putty on libgtk2.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/putty/putty.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/package/putty/putty.mk b/package/putty/putty.mk
index 617518e647..ec65991f41 100644
--- a/package/putty/putty.mk
+++ b/package/putty/putty.mk
@@ -14,8 +14,6 @@ PUTTY_CONF_OPTS = -DPUTTY_GSSAPI=OFF
ifeq ($(BR2_PACKAGE_LIBGTK3),y)
PUTTY_DEPENDENCIES += libgtk3
-else ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-PUTTY_DEPENDENCIES += libgtk2
endif
ifeq ($(BR2_STATIC_LIBS),y)
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 19/23] package/putty: drop optional dependency on libgtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 19/23] package/putty: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 20:27 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:27 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Alexander Dahl
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, we need to drop the optional
> dependency of putty on libgtk2.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/putty/putty.mk | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/package/putty/putty.mk b/package/putty/putty.mk
> index 617518e647..ec65991f41 100644
> --- a/package/putty/putty.mk
> +++ b/package/putty/putty.mk
> @@ -14,8 +14,6 @@ PUTTY_CONF_OPTS = -DPUTTY_GSSAPI=OFF
>
> ifeq ($(BR2_PACKAGE_LIBGTK3),y)
> PUTTY_DEPENDENCIES += libgtk3
> -else ifeq ($(BR2_PACKAGE_LIBGTK2),y)
> -PUTTY_DEPENDENCIES += libgtk2
> endif
>
> ifeq ($(BR2_STATIC_LIBS),y)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 20/23] package/sylpheed: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (18 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 19/23] package/putty: drop optional dependency on libgtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 20:28 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 21/23] package/xscreensaver: " Thomas Petazzoni via buildroot
` (3 subsequent siblings)
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
As we're about to remove the libgtk2 package, we must first remove
sylpheed which requires libgtk2.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
.checkpackageignore | 1 -
Config.in.legacy | 7 ++++
package/Config.in | 1 -
...-link-checker-before-accepting-click.patch | 39 -------------------
package/sylpheed/Config.in | 7 ----
package/sylpheed/sylpheed.hash | 4 --
package/sylpheed/sylpheed.mk | 37 ------------------
7 files changed, 7 insertions(+), 89 deletions(-)
delete mode 100644 package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
delete mode 100644 package/sylpheed/Config.in
delete mode 100644 package/sylpheed/sylpheed.hash
delete mode 100644 package/sylpheed/sylpheed.mk
diff --git a/.checkpackageignore b/.checkpackageignore
index 9b75d4da14..10c3810c41 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1056,7 +1056,6 @@ package/supervisor/S99supervisord lib_sysv.Variables
package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch lib_patch.Upstream
package/suricata/S99suricata Shellcheck
package/swupdate/swupdate.sh Shellcheck
-package/sylpheed/0001-harden-link-checker-before-accepting-click.patch lib_patch.Upstream
package/sysvinit/0001-Makefile-disable-stack-protector-strong.patch lib_patch.Upstream
package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream
package/targetcli-fb/S50target Shellcheck lib_sysv.Variables
diff --git a/Config.in.legacy b/Config.in.legacy
index a1b321578b..35363b6782 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_SYLPHEED
+ bool "sylpheed has been removed"
+ select BR2_LEGACY
+ help
+ Due to the removal of libgtk2, the sylpheed package has been
+ removed.
+
config BR2_PACKAGE_PINENTRY_GTK2
bool "gtk2 backend of pinentry has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 9746fd954b..6f7c9b613e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2389,7 +2389,6 @@ menu "Mail"
source "package/libesmtp/Config.in"
source "package/msmtp/Config.in"
source "package/mutt/Config.in"
- source "package/sylpheed/Config.in"
endmenu
menu "Miscellaneous"
diff --git a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
deleted file mode 100644
index 46b4505837..0000000000
--- a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 876c54b2927e48ab6900e5e6b9395742f75e840e Mon Sep 17 00:00:00 2001
-From: Paul <paul@claws-mail.org>
-Date: Sun, 23 May 2021 12:16:40 +0100
-Subject: [PATCH] harden link checker before accepting click
-
-[Retrieved from:
-https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Julien: rebased patch on version 3.7.0]
-Signed-off-by: Julien Olivain <ju.o@free.fr>
----
- src/textview.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/textview.c b/src/textview.c
-index e55eea9..6fbb8a1 100644
---- a/src/textview.c
-+++ b/src/textview.c
-@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
- gboolean retval = TRUE;
-
- if (is_uri_string(uri->uri) == FALSE)
-- return TRUE;
-+ return FALSE;
-
- buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
- gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);
-@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
- if (aval == G_ALERTDEFAULT)
- retval = TRUE;
- }
-+ if (strlen(uri->uri) > get_uri_len(uri->uri))
-+ retval = FALSE;
-
- g_free(visible_str);
-
---
-2.45.2
-
diff --git a/package/sylpheed/Config.in b/package/sylpheed/Config.in
deleted file mode 100644
index f03ae87706..0000000000
--- a/package/sylpheed/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_SYLPHEED
- bool "sylpheed"
- depends on BR2_PACKAGE_LIBGTK2
- help
- lightweight and user-friendly e-mail client.
-
- http://sylpheed.sraoss.jp/en/
diff --git a/package/sylpheed/sylpheed.hash b/package/sylpheed/sylpheed.hash
deleted file mode 100644
index 39fa76612d..0000000000
--- a/package/sylpheed/sylpheed.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Locally calculated after checking pgp signature
-sha256 0d6bc5eb46f5d0a463757c62bc80b00d219b294b3c3662840e4540f6db2e3e49 sylpheed-3.7.0.tar.xz
-sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING
-sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
deleted file mode 100644
index fc419e2867..0000000000
--- a/package/sylpheed/sylpheed.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#
-# sylpheed
-#
-################################################################################
-
-SYLPHEED_VERSION_MAJOR = 3.7
-SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0
-SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz
-SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
-SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin)
-SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
-SYLPHEED_CPE_ID_VALID = YES
-SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme
-SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
-
-# 0001-harden-link-checker-before-accepting-click.patch
-SYLPHEED_IGNORE_CVES += CVE-2021-37746
-
-# Remove the -I$(includedir) from the Makefiles
-# because it refers to the host /usr/include.
-define SYLPHEED_PRECONFIGURE
- for i in $$(find $(@D) -name "Makefile*"); do \
- sed -i 's:-I$$(includedir)::g' $$i; \
- done
-endef
-
-SYLPHEED_PRE_CONFIGURE_HOOKS += SYLPHEED_PRECONFIGURE
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-SYLPHEED_DEPENDENCIES += openssl
-SYLPHEED_CONF_OPTS += --enable-ssl
-else
-SYLPHEED_CONF_OPTS += --disable-ssl
-endif
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 20/23] package/sylpheed: remove package
2025-09-10 21:32 ` [Buildroot] [PATCH 20/23] package/sylpheed: remove package Thomas Petazzoni via buildroot
@ 2025-09-11 20:28 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:28 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove the libgtk2 package, we must first remove
> sylpheed which requires libgtk2.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> .checkpackageignore | 1 -
> Config.in.legacy | 7 ++++
> package/Config.in | 1 -
> ...-link-checker-before-accepting-click.patch | 39 -------------------
> package/sylpheed/Config.in | 7 ----
> package/sylpheed/sylpheed.hash | 4 --
> package/sylpheed/sylpheed.mk | 37 ------------------
> 7 files changed, 7 insertions(+), 89 deletions(-)
> delete mode 100644 package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
> delete mode 100644 package/sylpheed/Config.in
> delete mode 100644 package/sylpheed/sylpheed.hash
> delete mode 100644 package/sylpheed/sylpheed.mk
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 9b75d4da14..10c3810c41 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1056,7 +1056,6 @@ package/supervisor/S99supervisord lib_sysv.Variables
> package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch lib_patch.Upstream
> package/suricata/S99suricata Shellcheck
> package/swupdate/swupdate.sh Shellcheck
> -package/sylpheed/0001-harden-link-checker-before-accepting-click.patch lib_patch.Upstream
> package/sysvinit/0001-Makefile-disable-stack-protector-strong.patch lib_patch.Upstream
> package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream
> package/targetcli-fb/S50target Shellcheck lib_sysv.Variables
> diff --git a/Config.in.legacy b/Config.in.legacy
> index a1b321578b..35363b6782 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_SYLPHEED
> + bool "sylpheed has been removed"
> + select BR2_LEGACY
> + help
> + Due to the removal of libgtk2, the sylpheed package has been
> + removed.
> +
> config BR2_PACKAGE_PINENTRY_GTK2
> bool "gtk2 backend of pinentry has been removed"
> select BR2_LEGACY
> diff --git a/package/Config.in b/package/Config.in
> index 9746fd954b..6f7c9b613e 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -2389,7 +2389,6 @@ menu "Mail"
> source "package/libesmtp/Config.in"
> source "package/msmtp/Config.in"
> source "package/mutt/Config.in"
> - source "package/sylpheed/Config.in"
> endmenu
>
> menu "Miscellaneous"
> diff --git a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
> deleted file mode 100644
> index 46b4505837..0000000000
> --- a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 876c54b2927e48ab6900e5e6b9395742f75e840e Mon Sep 17 00:00:00 2001
> -From: Paul <paul@claws-mail.org>
> -Date: Sun, 23 May 2021 12:16:40 +0100
> -Subject: [PATCH] harden link checker before accepting click
> -
> -[Retrieved from:
> -https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Julien: rebased patch on version 3.7.0]
> -Signed-off-by: Julien Olivain <ju.o@free.fr>
> ----
> - src/textview.c | 4 +++-
> - 1 file changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/src/textview.c b/src/textview.c
> -index e55eea9..6fbb8a1 100644
> ---- a/src/textview.c
> -+++ b/src/textview.c
> -@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
> - gboolean retval = TRUE;
> -
> - if (is_uri_string(uri->uri) == FALSE)
> -- return TRUE;
> -+ return FALSE;
> -
> - buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
> - gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);
> -@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
> - if (aval == G_ALERTDEFAULT)
> - retval = TRUE;
> - }
> -+ if (strlen(uri->uri) > get_uri_len(uri->uri))
> -+ retval = FALSE;
> -
> - g_free(visible_str);
> -
> ---
> -2.45.2
> -
> diff --git a/package/sylpheed/Config.in b/package/sylpheed/Config.in
> deleted file mode 100644
> index f03ae87706..0000000000
> --- a/package/sylpheed/Config.in
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -config BR2_PACKAGE_SYLPHEED
> - bool "sylpheed"
> - depends on BR2_PACKAGE_LIBGTK2
> - help
> - lightweight and user-friendly e-mail client.
> -
> - http://sylpheed.sraoss.jp/en/
> diff --git a/package/sylpheed/sylpheed.hash b/package/sylpheed/sylpheed.hash
> deleted file mode 100644
> index 39fa76612d..0000000000
> --- a/package/sylpheed/sylpheed.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# Locally calculated after checking pgp signature
> -sha256 0d6bc5eb46f5d0a463757c62bc80b00d219b294b3c3662840e4540f6db2e3e49 sylpheed-3.7.0.tar.xz
> -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING
> -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
> diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
> deleted file mode 100644
> index fc419e2867..0000000000
> --- a/package/sylpheed/sylpheed.mk
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -################################################################################
> -#
> -# sylpheed
> -#
> -################################################################################
> -
> -SYLPHEED_VERSION_MAJOR = 3.7
> -SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0
> -SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz
> -SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
> -SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin)
> -SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
> -SYLPHEED_CPE_ID_VALID = YES
> -SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme
> -SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
> -
> -# 0001-harden-link-checker-before-accepting-click.patch
> -SYLPHEED_IGNORE_CVES += CVE-2021-37746
> -
> -# Remove the -I$(includedir) from the Makefiles
> -# because it refers to the host /usr/include.
> -define SYLPHEED_PRECONFIGURE
> - for i in $$(find $(@D) -name "Makefile*"); do \
> - sed -i 's:-I$$(includedir)::g' $$i; \
> - done
> -endef
> -
> -SYLPHEED_PRE_CONFIGURE_HOOKS += SYLPHEED_PRECONFIGURE
> -
> -ifeq ($(BR2_PACKAGE_OPENSSL),y)
> -SYLPHEED_DEPENDENCIES += openssl
> -SYLPHEED_CONF_OPTS += --enable-ssl
> -else
> -SYLPHEED_CONF_OPTS += --disable-ssl
> -endif
> -
> -$(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 21/23] package/xscreensaver: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (19 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 20/23] package/sylpheed: remove package Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 7:27 ` Nicolas Cavallari
2025-09-11 20:30 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 22/23] package/yad: drop support for gtk2 Thomas Petazzoni via buildroot
` (2 subsequent siblings)
23 siblings, 2 replies; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Simon Dawson
As we're about to remove libgtk2, we must remove xscreensaver as it
depends on libgtk2.
Cc: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 7 +++
DEVELOPERS | 1 -
package/Config.in | 1 -
package/xscreensaver/Config.in | 38 -------------
package/xscreensaver/xscreensaver.hash | 4 --
package/xscreensaver/xscreensaver.mk | 75 --------------------------
6 files changed, 7 insertions(+), 119 deletions(-)
delete mode 100644 package/xscreensaver/Config.in
delete mode 100644 package/xscreensaver/xscreensaver.hash
delete mode 100644 package/xscreensaver/xscreensaver.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 35363b6782..2c065b363a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11"
+config BR2_PACKAGE_XSCREENSAVER
+ bool "xscreensaver has been removed"
+ select BR2_LEGACY
+ help
+ Due to the removal of libgtk2, the xscreensaver package has
+ been removed.
+
config BR2_PACKAGE_SYLPHEED
bool "sylpheed has been removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 7374e389fe..3c038f9ce9 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -3075,7 +3075,6 @@ F: package/sconeserver/
F: package/sound-theme-borealis/
F: package/sound-theme-freedesktop/
F: package/vlc/
-F: package/xscreensaver/
F: package/zmqpp/
F: package/zyre/
diff --git a/package/Config.in b/package/Config.in
index 6f7c9b613e..9fc4ac7f02 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -411,7 +411,6 @@ comment "X applications"
source "package/wmctrl/Config.in"
source "package/x11vnc/Config.in"
source "package/xdotool/Config.in"
- source "package/xscreensaver/Config.in"
source "package/xterm/Config.in"
source "package/xvkbd/Config.in"
source "package/yad/Config.in"
diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in
deleted file mode 100644
index ba259274d1..0000000000
--- a/package/xscreensaver/Config.in
+++ /dev/null
@@ -1,38 +0,0 @@
-config BR2_PACKAGE_XSCREENSAVER
- bool "xscreensaver"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_PACKAGE_HAS_LIBGL # libglu
- depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango
- depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2
- depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2
- depends on BR2_USE_MMU # gdk-pixbuf, libgtk2 -> glib2
- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz
- select BR2_PACKAGE_GDK_PIXBUF
- select BR2_PACKAGE_GDK_PIXBUF_XLIB
- select BR2_PACKAGE_LIBGLU
- select BR2_PACKAGE_LIBGTK2
- select BR2_PACKAGE_LIBXML2
- select BR2_PACKAGE_JPEG
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXFT
- select BR2_PACKAGE_XLIB_LIBXI
- select BR2_PACKAGE_XLIB_LIBXT
- help
- XScreenSaver is the standard screen saver collection shipped
- on most Linux and Unix systems running the X11 Window
- System.
-
- On X11 systems, XScreenSaver is two things: it is both a
- large collection of screen savers; and it is also the
- framework for blanking and locking the screen.
-
- http://www.jwz.org/xscreensaver/
-
-comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_MMU
- depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
- !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash
deleted file mode 100644
index 27ef7d8f00..0000000000
--- a/package/xscreensaver/xscreensaver.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Locally calculated
-sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz
-sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h
-sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
deleted file mode 100644
index 466d309940..0000000000
--- a/package/xscreensaver/xscreensaver.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-################################################################################
-#
-# xscreensaver
-#
-################################################################################
-
-XSCREENSAVER_VERSION = 6.03
-XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver
-
-# N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built.
-XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+
-XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
-XSCREENSAVER_CPE_ID_VALID = YES
-XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver
-
-XSCREENSAVER_DEPENDENCIES = \
- gdk-pixbuf \
- gdk-pixbuf-xlib \
- jpeg \
- libgl \
- libglu \
- libgtk2 \
- libxml2 \
- xlib_libX11 \
- xlib_libXft \
- xlib_libXi \
- xlib_libXt \
- $(TARGET_NLS_DEPENDENCIES) \
- host-intltool
-
-# otherwise we end up with host include/library dirs passed to the
-# compiler/linker
-XSCREENSAVER_CONF_OPTS = \
- --includedir=$(STAGING_DIR)/usr/include \
- --libdir=$(STAGING_DIR)/usr/lib \
- --with-gl=yes
-
-ifeq ($(BR2_PACKAGE_LIBPNG),y)
-XSCREENSAVER_CONF_OPTS += --with-png=yes
-XSCREENSAVER_DEPENDENCIES += libpng
-else
-XSCREENSAVER_CONF_OPTS += --with-png=no
-endif
-
-ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-XSCREENSAVER_CONF_OPTS += --with-systemd=yes
-XSCREENSAVER_DEPENDENCIES += systemd
-else
-XSCREENSAVER_CONF_OPTS += --with-systemd=no
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
-XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes
-XSCREENSAVER_DEPENDENCIES += xlib_libXinerama
-else
-XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=no
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
-XSCREENSAVER_CONF_OPTS += --with-randr-ext=yes
-XSCREENSAVER_DEPENDENCIES += xlib_libXrandr
-else
-XSCREENSAVER_CONF_OPTS += --with-randr-ext=no
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)
-XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=yes
-XSCREENSAVER_DEPENDENCIES += xlib_libXxf86vm
-else
-XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=no
-endif
-
-XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install
-
-$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 21/23] package/xscreensaver: remove package
2025-09-10 21:32 ` [Buildroot] [PATCH 21/23] package/xscreensaver: " Thomas Petazzoni via buildroot
@ 2025-09-11 7:27 ` Nicolas Cavallari
2025-09-11 7:29 ` Thomas Petazzoni via buildroot
2025-09-11 20:30 ` Arnout Vandecappelle via buildroot
1 sibling, 1 reply; 52+ messages in thread
From: Nicolas Cavallari @ 2025-09-11 7:27 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Simon Dawson
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, we must remove xscreensaver as it
> depends on libgtk2.
The latest version (6.12) on https://www.jwz.org/xscreensaver/ depends on gtk3.
I noticed it because the version I have on Debian (6.09) already depends on gtk3.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [Buildroot] [PATCH 21/23] package/xscreensaver: remove package
2025-09-11 7:27 ` Nicolas Cavallari
@ 2025-09-11 7:29 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-11 7:29 UTC (permalink / raw)
To: Nicolas Cavallari; +Cc: buildroot, Simon Dawson
Hello Nicolas,
On Thu, 11 Sep 2025 09:27:21 +0200
Nicolas Cavallari <Nicolas.Cavallari@green-communications.fr> wrote:
> On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> > As we're about to remove libgtk2, we must remove xscreensaver as it
> > depends on libgtk2.
>
> The latest version (6.12) on https://www.jwz.org/xscreensaver/ depends on gtk3.
> I noticed it because the version I have on Debian (6.09) already depends on gtk3.
Thanks for the notice! However, I'm personally not that interested in
xscreensaver, so unless someone steps up to send a patch that updates
xscreensaver so that it works with gtk3, removing it will be the only
option.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [Buildroot] [PATCH 21/23] package/xscreensaver: remove package
2025-09-10 21:32 ` [Buildroot] [PATCH 21/23] package/xscreensaver: " Thomas Petazzoni via buildroot
2025-09-11 7:27 ` Nicolas Cavallari
@ 2025-09-11 20:30 ` Arnout Vandecappelle via buildroot
2025-12-14 11:07 ` Julien Olivain via buildroot
1 sibling, 1 reply; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 20:30 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: Julien Olivain, Simon Dawson
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, we must remove xscreensaver as it
> depends on libgtk2.
>
> Cc: Simon Dawson <spdawson@gmail.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Since both Julien and Nicolas have declared an intention to update
xscreensaver, I have _not_ applied this patch. I left it as New in patchwork, so
we can still apply it a couple of days from now if no update is forthcoming.
Regards,
Arnout
> ---
> Config.in.legacy | 7 +++
> DEVELOPERS | 1 -
> package/Config.in | 1 -
> package/xscreensaver/Config.in | 38 -------------
> package/xscreensaver/xscreensaver.hash | 4 --
> package/xscreensaver/xscreensaver.mk | 75 --------------------------
> 6 files changed, 7 insertions(+), 119 deletions(-)
> delete mode 100644 package/xscreensaver/Config.in
> delete mode 100644 package/xscreensaver/xscreensaver.hash
> delete mode 100644 package/xscreensaver/xscreensaver.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 35363b6782..2c065b363a 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2025.11"
>
> +config BR2_PACKAGE_XSCREENSAVER
> + bool "xscreensaver has been removed"
> + select BR2_LEGACY
> + help
> + Due to the removal of libgtk2, the xscreensaver package has
> + been removed.
> +
> config BR2_PACKAGE_SYLPHEED
> bool "sylpheed has been removed"
> select BR2_LEGACY
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 7374e389fe..3c038f9ce9 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -3075,7 +3075,6 @@ F: package/sconeserver/
> F: package/sound-theme-borealis/
> F: package/sound-theme-freedesktop/
> F: package/vlc/
> -F: package/xscreensaver/
> F: package/zmqpp/
> F: package/zyre/
>
> diff --git a/package/Config.in b/package/Config.in
> index 6f7c9b613e..9fc4ac7f02 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -411,7 +411,6 @@ comment "X applications"
> source "package/wmctrl/Config.in"
> source "package/x11vnc/Config.in"
> source "package/xdotool/Config.in"
> - source "package/xscreensaver/Config.in"
> source "package/xterm/Config.in"
> source "package/xvkbd/Config.in"
> source "package/yad/Config.in"
> diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in
> deleted file mode 100644
> index ba259274d1..0000000000
> --- a/package/xscreensaver/Config.in
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -config BR2_PACKAGE_XSCREENSAVER
> - bool "xscreensaver"
> - depends on BR2_PACKAGE_XORG7
> - depends on BR2_PACKAGE_HAS_LIBGL # libglu
> - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango
> - depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2
> - depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2
> - depends on BR2_USE_MMU # gdk-pixbuf, libgtk2 -> glib2
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
> - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz
> - select BR2_PACKAGE_GDK_PIXBUF
> - select BR2_PACKAGE_GDK_PIXBUF_XLIB
> - select BR2_PACKAGE_LIBGLU
> - select BR2_PACKAGE_LIBGTK2
> - select BR2_PACKAGE_LIBXML2
> - select BR2_PACKAGE_JPEG
> - select BR2_PACKAGE_XLIB_LIBX11
> - select BR2_PACKAGE_XLIB_LIBXFT
> - select BR2_PACKAGE_XLIB_LIBXI
> - select BR2_PACKAGE_XLIB_LIBXT
> - help
> - XScreenSaver is the standard screen saver collection shipped
> - on most Linux and Unix systems running the X11 Window
> - System.
> -
> - On X11 systems, XScreenSaver is two things: it is both a
> - large collection of screen savers; and it is also the
> - framework for blanking and locking the screen.
> -
> - http://www.jwz.org/xscreensaver/
> -
> -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend"
> - depends on BR2_PACKAGE_XORG7
> - depends on BR2_USE_MMU
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4
> - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
> - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
> - !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL
> diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash
> deleted file mode 100644
> index 27ef7d8f00..0000000000
> --- a/package/xscreensaver/xscreensaver.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# Locally calculated
> -sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz
> -sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h
> -sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h
> diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
> deleted file mode 100644
> index 466d309940..0000000000
> --- a/package/xscreensaver/xscreensaver.mk
> +++ /dev/null
> @@ -1,75 +0,0 @@
> -################################################################################
> -#
> -# xscreensaver
> -#
> -################################################################################
> -
> -XSCREENSAVER_VERSION = 6.03
> -XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver
> -
> -# N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built.
> -XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+
> -XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
> -XSCREENSAVER_CPE_ID_VALID = YES
> -XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver
> -
> -XSCREENSAVER_DEPENDENCIES = \
> - gdk-pixbuf \
> - gdk-pixbuf-xlib \
> - jpeg \
> - libgl \
> - libglu \
> - libgtk2 \
> - libxml2 \
> - xlib_libX11 \
> - xlib_libXft \
> - xlib_libXi \
> - xlib_libXt \
> - $(TARGET_NLS_DEPENDENCIES) \
> - host-intltool
> -
> -# otherwise we end up with host include/library dirs passed to the
> -# compiler/linker
> -XSCREENSAVER_CONF_OPTS = \
> - --includedir=$(STAGING_DIR)/usr/include \
> - --libdir=$(STAGING_DIR)/usr/lib \
> - --with-gl=yes
> -
> -ifeq ($(BR2_PACKAGE_LIBPNG),y)
> -XSCREENSAVER_CONF_OPTS += --with-png=yes
> -XSCREENSAVER_DEPENDENCIES += libpng
> -else
> -XSCREENSAVER_CONF_OPTS += --with-png=no
> -endif
> -
> -ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> -XSCREENSAVER_CONF_OPTS += --with-systemd=yes
> -XSCREENSAVER_DEPENDENCIES += systemd
> -else
> -XSCREENSAVER_CONF_OPTS += --with-systemd=no
> -endif
> -
> -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
> -XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes
> -XSCREENSAVER_DEPENDENCIES += xlib_libXinerama
> -else
> -XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=no
> -endif
> -
> -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
> -XSCREENSAVER_CONF_OPTS += --with-randr-ext=yes
> -XSCREENSAVER_DEPENDENCIES += xlib_libXrandr
> -else
> -XSCREENSAVER_CONF_OPTS += --with-randr-ext=no
> -endif
> -
> -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)
> -XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=yes
> -XSCREENSAVER_DEPENDENCIES += xlib_libXxf86vm
> -else
> -XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=no
> -endif
> -
> -XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install
> -
> -$(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [Buildroot] [PATCH 21/23] package/xscreensaver: remove package
2025-09-11 20:30 ` Arnout Vandecappelle via buildroot
@ 2025-12-14 11:07 ` Julien Olivain via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Julien Olivain via buildroot @ 2025-12-14 11:07 UTC (permalink / raw)
To: Arnout Vandecappelle; +Cc: Thomas Petazzoni, buildroot, Simon Dawson
Hi Arnout, All,
On 11/09/2025 22:30, Arnout Vandecappelle via buildroot wrote:
> On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
>> As we're about to remove libgtk2, we must remove xscreensaver as it
>> depends on libgtk2.
>>
>> Cc: Simon Dawson <spdawson@gmail.com>
>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>
> Since both Julien and Nicolas have declared an intention to update
> xscreensaver, I have _not_ applied this patch. I left it as New in
> patchwork, so we can still apply it a couple of days from now if no
> update is forthcoming.
For info, I marked this patch as "Superseded", as xscreensaver was
updated in:
https://gitlab.com/buildroot.org/buildroot/-/commit/34a03bdba426a22c7efbbf33b68e836a88ab1740
> Regards,
> Arnout
Best regards,
Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 22/23] package/yad: drop support for gtk2
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (20 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 21/23] package/xscreensaver: " Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-09-11 21:14 ` Arnout Vandecappelle via buildroot
2025-09-10 21:32 ` [Buildroot] [PATCH 23/23] package/libgtk2: remove package Thomas Petazzoni via buildroot
[not found] ` <20250910213241.1529448-4-thomas.petazzoni__12012.9963777558$1757540015$gmane$org@bootlin.com>
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, James Knight
As we're about to remove libgtk2, we need to first drop support for
gtk2 in yad. It continues to support gtk3.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/yad/Config.in | 8 +++-----
package/yad/yad.mk | 3 ---
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/package/yad/Config.in b/package/yad/Config.in
index 300525ee3c..4a140f63d7 100644
--- a/package/yad/Config.in
+++ b/package/yad/Config.in
@@ -1,13 +1,11 @@
config BR2_PACKAGE_YAD
bool "yad"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11
+ depends on BR2_PACKAGE_LIBGTK3_X11
help
YAD (yet another dialog) is a tool for create graphical
dialogs from shell scripts.
http://sourceforge.net/projects/yad-dialog/
-comment "yad needs libgtk2 or libgtk3 w/ X11 backend"
- depends on BR2_PACKAGE_XORG7
- depends on !BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_LIBGTK3_X11
+comment "yad needs libgtk3 w/ X11 backend"
+ depends on !BR2_PACKAGE_LIBGTK3_X11
diff --git a/package/yad/yad.mk b/package/yad/yad.mk
index 15788efac0..fdddb6523d 100644
--- a/package/yad/yad.mk
+++ b/package/yad/yad.mk
@@ -16,9 +16,6 @@ YAD_CONF_OPTS = --enable-html=no
ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
YAD_DEPENDENCIES += libgtk3
YAD_CONF_OPTS += --with-gtk=gtk3
-else
-YAD_DEPENDENCIES += libgtk2
-YAD_CONF_OPTS += --with-gtk=gtk2
endif
$(eval $(autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [Buildroot] [PATCH 22/23] package/yad: drop support for gtk2
2025-09-10 21:32 ` [Buildroot] [PATCH 22/23] package/yad: drop support for gtk2 Thomas Petazzoni via buildroot
@ 2025-09-11 21:14 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 52+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2025-09-11 21:14 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot; +Cc: James Knight
On 10/09/2025 23:32, Thomas Petazzoni via buildroot wrote:
> As we're about to remove libgtk2, we need to first drop support for
> gtk2 in yad. It continues to support gtk3.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> package/yad/Config.in | 8 +++-----
> package/yad/yad.mk | 3 ---
> 2 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/package/yad/Config.in b/package/yad/Config.in
> index 300525ee3c..4a140f63d7 100644
> --- a/package/yad/Config.in
> +++ b/package/yad/Config.in
> @@ -1,13 +1,11 @@
> config BR2_PACKAGE_YAD
> bool "yad"
> - depends on BR2_PACKAGE_XORG7
> - depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11
> + depends on BR2_PACKAGE_LIBGTK3_X11
> help
> YAD (yet another dialog) is a tool for create graphical
> dialogs from shell scripts.
>
> http://sourceforge.net/projects/yad-dialog/
>
> -comment "yad needs libgtk2 or libgtk3 w/ X11 backend"
> - depends on BR2_PACKAGE_XORG7
> - depends on !BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_LIBGTK3_X11
> +comment "yad needs libgtk3 w/ X11 backend"
> + depends on !BR2_PACKAGE_LIBGTK3_X11
> diff --git a/package/yad/yad.mk b/package/yad/yad.mk
> index 15788efac0..fdddb6523d 100644
> --- a/package/yad/yad.mk
> +++ b/package/yad/yad.mk
> @@ -16,9 +16,6 @@ YAD_CONF_OPTS = --enable-html=no
> ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
Since this condition is always true, the code can be simplified to
unconditional dependencies and conf opts.
Applied to master with that changed, thanks.
Regards,
Arnout
> YAD_DEPENDENCIES += libgtk3
> YAD_CONF_OPTS += --with-gtk=gtk3
> -else
> -YAD_DEPENDENCIES += libgtk2
> -YAD_CONF_OPTS += --with-gtk=gtk2
> endif
>
> $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 52+ messages in thread
* [Buildroot] [PATCH 23/23] package/libgtk2: remove package
2025-09-10 21:32 [Buildroot] [PATCH 00/23] Remove libgtk2 Thomas Petazzoni via buildroot
` (21 preceding siblings ...)
2025-09-10 21:32 ` [Buildroot] [PATCH 22/23] package/yad: drop support for gtk2 Thomas Petazzoni via buildroot
@ 2025-09-10 21:32 ` Thomas Petazzoni via buildroot
2025-12-14 11:10 ` Julien Olivain via buildroot
[not found] ` <20250910213241.1529448-4-thomas.petazzoni__12012.9963777558$1757540015$gmane$org@bootlin.com>
23 siblings, 1 reply; 52+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-09-10 21:32 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
The final upstream release of libgtk2 was published in December
2020. libgtk2 no longer builds with GCC 14.x, even less so with GCC
15.x. While Debian has some fixes to make it build with GCC 14.x,
those are not sufficient to allow building libgtk2 with GCC 15.x.
libgtk2 is anyway very old, largely superseded by libgtk3 and then
libgtk4. It is therefore time to remove it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
.checkpackageignore | 1 -
DEVELOPERS | 1 -
package/Config.in | 1 -
.../libgtk2/0001-reduce-dependencies.patch | 117 ---------------
package/libgtk2/Config.in | 42 ------
package/libgtk2/libgtk2.hash | 5 -
package/libgtk2/libgtk2.mk | 139 ------------------
7 files changed, 306 deletions(-)
delete mode 100644 package/libgtk2/0001-reduce-dependencies.patch
delete mode 100644 package/libgtk2/Config.in
delete mode 100644 package/libgtk2/libgtk2.hash
delete mode 100644 package/libgtk2/libgtk2.mk
diff --git a/.checkpackageignore b/.checkpackageignore
index 10c3810c41..edab4aab9e 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -591,7 +591,6 @@ package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-g
package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_patch.Upstream
package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream
package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream
-package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream
package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch lib_patch.Upstream
package/libhdhomerun/0001-dont-strip.patch lib_patch.Upstream
package/libiio/S99iiod Shellcheck lib_sysv.Variables
diff --git a/DEVELOPERS b/DEVELOPERS
index 3c038f9ce9..7b50bb927e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1047,7 +1047,6 @@ F: package/libcue/
F: package/libebml/
F: package/libgee/
F: package/libglib2/
-F: package/libgtk2/
F: package/libgtk3/
F: package/libhtp/
F: package/libidn/
diff --git a/package/Config.in b/package/Config.in
index 9fc4ac7f02..0268acf230 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1761,7 +1761,6 @@ menu "Graphics"
source "package/libglfw/Config.in"
source "package/libglu/Config.in"
source "package/libgta/Config.in"
- source "package/libgtk2/Config.in"
source "package/libgtk3/Config.in"
source "package/libgtk4/Config.in"
source "package/libjxl/Config.in"
diff --git a/package/libgtk2/0001-reduce-dependencies.patch b/package/libgtk2/0001-reduce-dependencies.patch
deleted file mode 100644
index 3250cae4b0..0000000000
--- a/package/libgtk2/0001-reduce-dependencies.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Hack the configure.in file to add a "none" gdktarget which removes
-dependencies on graphic backends such as X.org or DirectFB. Gtk does
-not fully build in this mode, but it builds sufficiently to build the
-host tools that are needed to build the target Gtk.
-
-Changes:
- Ported to 2.24.18
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
----
-Index: libgtk2-2.24.18/configure.ac
-===================================================================
---- libgtk2-2.24.18.orig/configure.ac 2013-05-13 07:02:44.000000000 -0500
-+++ libgtk2-2.24.18/configure.ac 2013-05-27 02:12:09.947030335 -0500
-@@ -258,12 +258,12 @@
- gdktarget=x11
- fi
-
--AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
-+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
- gdktarget=$with_gdktarget)
-
- AC_SUBST(gdktarget)
- case $gdktarget in
-- x11|win32|quartz|directfb) ;;
-+ x11|win32|quartz|directfb|none) ;;
- *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
- esac
-
-@@ -372,11 +373,15 @@
- ## annoying to construct
- PKG_CHECK_MODULES(BASE_DEPENDENCIES,
- [glib-2.0 >= glib_required_version dnl
-- atk >= atk_required_version dnl
-- pango >= pango_required_version dnl
-- cairo >= cairo_required_version dnl
- gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
-
-+if test "x$gdktarget" != "xnone"; then
-+ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
-+ [atk >= atk_required_version dnl
-+ pango >= pango_required_version dnl
-+ cairo >= cairo_required_version])
-+fi
-+
- ## In addition to checking that cairo is present, we also need to
- ## check that the correct cairo backend is there. E.g. if the GDK
- ## target is win32 we need the cairo-win32 backend and so on.
-@@ -387,8 +392,11 @@
- if test "x$cairo_backend" = "xx11"; then
- cairo_backend=xlib
- fi
--PKG_CHECK_MODULES(CAIRO_BACKEND,
-- [cairo-$cairo_backend >= cairo_required_version])
-+
-+if test "x$gdktarget" != "xnone"; then
-+ PKG_CHECK_MODULES(CAIRO_BACKEND,
-+ [cairo-$cairo_backend >= cairo_required_version])
-+fi
-
- PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
-
-@@ -1279,6 +1287,7 @@
- AM_CONDITIONAL(USE_DIRECTFB, false)
- fi
-
-+if test "x$gdktarget" != "xnone"; then
-
- # Check for Pango flags
-
-@@ -1324,6 +1333,8 @@
- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
- fi
-
-+fi # gdktarget != none
-+
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
- GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
- #
-@@ -1341,6 +1352,7 @@
- AC_SUBST(GDK_DEP_LIBS)
- AC_SUBST(GDK_DEP_CFLAGS)
-
-+if test "x$gdktarget" != "xnone"; then
-
- ########################################
- # Check for Accessibility Toolkit flags
-@@ -1372,6 +1384,10 @@
- fi
-
- GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
-+else # gdktarget != none
-+GTK_PACKAGES="gdk-pixbuf-2.0"
-+fi # gdktarget != none
-+
- if test "x$gdktarget" = "xx11"; then
- GTK_PACKAGES="$GTK_PACKAGES pangoft2"
- fi
-@@ -1533,6 +1549,8 @@
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
-
-+if test "x$gdktarget" != "xnone"; then
-+
- AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
- *** Can't find cairo-pdf.h. You must build Cairo with the pdf
- *** backend enabled.]))
-@@ -1547,6 +1565,8 @@
- *** svg backend enabled.]))
- fi
-
-+fi # gdktarget != none
-+
- CPPFLAGS="$gtk_save_cppflags"
-
-
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
deleted file mode 100644
index f8821ba246..0000000000
--- a/package/libgtk2/Config.in
+++ /dev/null
@@ -1,42 +0,0 @@
-config BR2_PACKAGE_LIBGTK2
- bool "libgtk2"
- depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_WCHAR # glib2
- depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
- depends on BR2_USE_MMU # glib2
- depends on BR2_INSTALL_LIBSTDCPP # pango
- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
- select BR2_PACKAGE_AT_SPI2_CORE
- select BR2_PACKAGE_CAIRO
- select BR2_PACKAGE_CAIRO_PNG
- select BR2_PACKAGE_CAIRO_ZLIB
- select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_PANGO
- select BR2_PACKAGE_GDK_PIXBUF
- select BR2_PACKAGE_FONTCONFIG
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XLIB_LIBXRENDER
- help
- The GTK+ version 2 graphical user interface library
-
- http://www.gtk.org/
-
-if BR2_PACKAGE_LIBGTK2
-
-config BR2_PACKAGE_LIBGTK2_DEMO
- bool "Install libgtk2 demo program"
- help
- The GTK+ source base contains a gtk-demo program. This
- option allows to install this program to the target.
-
-endif
-
-comment "libgtk2 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
- depends on BR2_USE_MMU
- depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on BR2_PACKAGE_XORG7
- depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
- !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libgtk2/libgtk2.hash b/package/libgtk2/libgtk2.hash
deleted file mode 100644
index 7b9a46b697..0000000000
--- a/package/libgtk2/libgtk2.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.sha256sum
-sha256 ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da gtk+-2.24.33.tar.xz
-
-# Hash for license file:
-sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
deleted file mode 100644
index 608c263e4d..0000000000
--- a/package/libgtk2/libgtk2.mk
+++ /dev/null
@@ -1,139 +0,0 @@
-################################################################################
-#
-# libgtk2
-#
-################################################################################
-
-LIBGTK2_VERSION_MAJOR = 2.24
-LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).33
-LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
-LIBGTK2_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK2_VERSION_MAJOR)
-LIBGTK2_INSTALL_STAGING = YES
-LIBGTK2_LICENSE = LGPL-2.0+
-LIBGTK2_LICENSE_FILES = COPYING
-LIBGTK2_CPE_ID_VENDOR = gnome
-LIBGTK2_CPE_ID_PRODUCT = gtk
-# For 0001-reduce-dependencies.patch
-LIBGTK2_AUTORECONF = YES
-
-LIBGTK2_CONF_ENV = \
- ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \
- ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \
- DB2HTML=false
-
-LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
-
-LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \
- gdk-pixbuf $(TARGET_NLS_DEPENDENCIES)
-
-LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS)
-
-# Xorg dependencies
-LIBGTK2_CONF_OPTS += \
- --with-x \
- --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib \
- --with-gdktarget=x11
-LIBGTK2_DEPENDENCIES += \
- fontconfig xlib_libX11 xlib_libXext xlib_libXrender
-
-ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-LIBGTK2_CONF_OPTS += --enable-introspection
-LIBGTK2_DEPENDENCIES += gobject-introspection
-else
-LIBGTK2_CONF_OPTS += --disable-introspection
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
-LIBGTK2_CONF_OPTS += --enable-xinerama
-LIBGTK2_DEPENDENCIES += xlib_libXinerama
-else
-LIBGTK2_CONF_OPTS += --disable-xinerama
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y)
-LIBGTK2_CONF_OPTS += --with-xinput=yes
-LIBGTK2_DEPENDENCIES += xlib_libXi
-else
-LIBGTK2_CONF_OPTS += --with-xinput=no
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
-LIBGTK2_DEPENDENCIES += xlib_libXrandr
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
-LIBGTK2_DEPENDENCIES += xlib_libXcursor
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
-LIBGTK2_DEPENDENCIES += xlib_libXfixes
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
-LIBGTK2_DEPENDENCIES += xlib_libXcomposite
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y)
-LIBGTK2_DEPENDENCIES += xlib_libXdamage
-endif
-
-ifeq ($(BR2_PACKAGE_LIBPNG),y)
-LIBGTK2_DEPENDENCIES += libpng
-else
-LIBGTK2_CONF_OPTS += --without-libpng
-endif
-
-ifeq ($(BR2_PACKAGE_JPEG),y)
-LIBGTK2_DEPENDENCIES += jpeg
-else
-LIBGTK2_CONF_OPTS += --without-libjpeg
-endif
-
-ifeq ($(BR2_PACKAGE_TIFF),y)
-LIBGTK2_DEPENDENCIES += tiff
-else
-LIBGTK2_CONF_OPTS += --without-libtiff
-endif
-
-ifeq ($(BR2_PACKAGE_CUPS),y)
-LIBGTK2_CONF_OPTS += CUPS_CONFIG="$(STAGING_DIR)/usr/bin/cups-config"
-LIBGTK2_DEPENDENCIES += cups
-else
-LIBGTK2_CONF_OPTS += --disable-cups
-endif
-
-ifeq ($(BR2_PACKAGE_LIBGTK2_DEMO),)
-define LIBGTK2_POST_INSTALL_TWEAKS
- rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo
-endef
-
-LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK2_POST_INSTALL_TWEAKS
-endif
-
-# We do not build a full version of libgtk2 for the host, because that
-# requires compiling Cairo, Pango, ATK and X.org for the
-# host. Therefore, we patch it to remove dependencies, and we hack the
-# build to only build gdk-pixbuf-from-source and
-# gtk-update-icon-cache, which are the host tools needed to build Gtk
-# for the target.
-
-HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf
-HOST_LIBGTK2_CONF_OPTS = \
- --disable-static \
- --disable-glibtest \
- --without-libtiff \
- --without-libjpeg \
- --with-gdktarget=none \
- --disable-cups
-
-define HOST_LIBGTK2_BUILD_CMDS
- $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
-endef
-
-define HOST_LIBGTK2_INSTALL_CMDS
- cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/bin
-endef
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
--
2.51.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 52+ messages in thread[parent not found: <20250910213241.1529448-4-thomas.petazzoni__12012.9963777558$1757540015$gmane$org@bootlin.com>]