From 696113c2b7cd0eb46e705b7c37956303e359ebeb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 14 May 2025 15:43:10 +0200 Subject: [PATCH] package/dmenu-wayland: remove package The package has been abandoned for several years. The only package that previously relied on dmenu-wayland was the swaybar option for the sway package, and that option now relies on wmenu. Signed-off-by: Adam Duskett [Julien: - add select BR2_LEGACY in legacy option to fix check-package error ] Signed-off-by: Julien Olivain --- Config.in.legacy | 9 ++++++ package/Config.in | 1 - .../0001-support-cross-compilation.patch | 32 ------------------- package/dmenu-wayland/Config.in | 27 ---------------- package/dmenu-wayland/dmenu-wayland.hash | 3 -- package/dmenu-wayland/dmenu-wayland.mk | 29 ----------------- 6 files changed, 9 insertions(+), 92 deletions(-) delete mode 100644 package/dmenu-wayland/0001-support-cross-compilation.patch delete mode 100644 package/dmenu-wayland/Config.in delete mode 100644 package/dmenu-wayland/dmenu-wayland.hash delete mode 100644 package/dmenu-wayland/dmenu-wayland.mk diff --git a/Config.in.legacy b/Config.in.legacy index b60b1a8845..2035b34a2f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2025.11" +config BR2_PACKAGE_DMENU_WAYLAND + bool "dmenu-wayland has been removed" + select BR2_LEGACY + help + The package has been abandoned for several years. + The only package that previously relied on dmenu-wayland + was sway, and that now relies on wmenu. Please select + wmenu instead. + config BR2_PACKAGE_SYLPHEED bool "sylpheed has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 1e0d921913..48ed7cc101 100644 --- a/package/Config.in +++ b/package/Config.in @@ -308,7 +308,6 @@ menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" - source "package/dmenu-wayland/Config.in" source "package/flutter-packages/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" diff --git a/package/dmenu-wayland/0001-support-cross-compilation.patch b/package/dmenu-wayland/0001-support-cross-compilation.patch deleted file mode 100644 index 3d99330cba..0000000000 --- a/package/dmenu-wayland/0001-support-cross-compilation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cd72cade6250a3ec46dd402b25a0bd55bbb97a88 Mon Sep 17 00:00:00 2001 -From: Rick van Schijndel -Date: Wed, 20 Dec 2023 16:44:12 -0700 -Subject: [PATCH] support cross-compilation - -Marking wayland-scanner as native dependency fixes the path check for -wayland-scanner. - -Upstream: https://github.com/nyyManni/dmenu-wayland/pull/23 - -Signed-off-by: Rick van Schijndel -Signed-off-by: Adam Duskett ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3ae6f69..8d401ff 100644 ---- a/meson.build -+++ b/meson.build -@@ -26,7 +26,7 @@ pangocairo = dependency('pangocairo') - rt = cc.find_library('rt') - wayland_client = dependency('wayland-client') - wayland_protos = dependency('wayland-protocols') --wayland_scanner_dep = dependency('wayland-scanner') -+wayland_scanner_dep = dependency('wayland-scanner', native: true) - wayland_scanner = find_program( - wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner') - ) --- -2.43.0 - diff --git a/package/dmenu-wayland/Config.in b/package/dmenu-wayland/Config.in deleted file mode 100644 index 8a4d0918dc..0000000000 --- a/package/dmenu-wayland/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_DMENU_WAYLAND - bool "dmenu-wayland" - depends on BR2_USE_MMU # pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, pango, wayland - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango - depends on !BR2_STATIC_LIBS # wayland - depends on BR2_INSTALL_LIBSTDCPP # pango - depends on BR2_USE_WCHAR # libglib2, pango - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_PANGO - select BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_WAYLAND_PROTOCOLS - help - dmenu-wl is an efficient dynamic menu for wayland (wlroots). - - https://github.com/nyyManni/dmenu-wayland - -comment "dmenu-wayland needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package/dmenu-wayland/dmenu-wayland.hash b/package/dmenu-wayland/dmenu-wayland.hash deleted file mode 100644 index 1248c4ad66..0000000000 --- a/package/dmenu-wayland/dmenu-wayland.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 56340e198a2c58468c6109f3bb07ab8a074487e67b0758b29c9d4fdce7c4d594 dmenu-wayland-a380201dff5bfac2dace553d7eaedb6cea6855f9.tar.gz -sha256 8d26bccf8a21c5e29dc756beef534403c935766c815bbb6e7eab0598632b9827 LICENSE diff --git a/package/dmenu-wayland/dmenu-wayland.mk b/package/dmenu-wayland/dmenu-wayland.mk deleted file mode 100644 index fec984194c..0000000000 --- a/package/dmenu-wayland/dmenu-wayland.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# dmenu-wayland -# -################################################################################ - -DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9 -DMENU_WAYLAND_SITE = $(call github,nyyManni,dmenu-wayland,$(DMENU_WAYLAND_VERSION)) -DMENU_WAYLAND_LICENSE = MIT -DMENU_WAYLAND_LICENSE_FILES = LICENSE -DMENU_WAYLAND_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 - -# host-wayland is for wayland-scanner -DMENU_WAYLAND_DEPENDENCIES = \ - host-wayland \ - cairo \ - libglib2 \ - libxkbcommon \ - pango \ - wayland \ - wayland-protocols - -# By default, sway calls dmenu not dmenu-wl -define DMENU_WAYLAND_SYMLINK_DMENU_WL - ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu -endef -DMENU_WAYLAND_POST_INSTALL_TARGET_HOOKS += DMENU_WAYLAND_SYMLINK_DMENU_WL - -$(eval $(meson-package))