[Buildroot] [PATCH 21/23] package/xscreensaver: remove package
Arnout Vandecappelle
arnout at rnout.be
Thu Sep 11 20:30:15 UTC 2025
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 at gmail.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at 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))
More information about the buildroot
mailing list