From f43a91afeadbd32ec50c85fd18923abec7efac2d Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sat, 18 Apr 2026 12:47:30 -0700 Subject: [PATCH] xbindkeys-config: drop --- .../by-name/xb/xbindkeys-config/.editorconfig | 2 - pkgs/by-name/xb/xbindkeys-config/package.nix | 54 --------- .../xbindkeys-config-patch1.patch | 108 ------------------ .../xb/xbindkeys-config/xbindkeys-config.1 | 21 ---- pkgs/top-level/aliases.nix | 1 + 5 files changed, 1 insertion(+), 185 deletions(-) delete mode 100644 pkgs/by-name/xb/xbindkeys-config/.editorconfig delete mode 100644 pkgs/by-name/xb/xbindkeys-config/package.nix delete mode 100644 pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch delete mode 100644 pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 diff --git a/pkgs/by-name/xb/xbindkeys-config/.editorconfig b/pkgs/by-name/xb/xbindkeys-config/.editorconfig deleted file mode 100644 index 40706d3ac28e..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/.editorconfig +++ /dev/null @@ -1,2 +0,0 @@ -[xbindkeys-config.1] -trim_trailing_whitespace = unset diff --git a/pkgs/by-name/xb/xbindkeys-config/package.nix b/pkgs/by-name/xb/xbindkeys-config/package.nix deleted file mode 100644 index 41df8a5d8561..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gtk2, - pkg-config, - procps, - makeWrapper, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xbindkeys-config"; - version = "0.1.3"; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - buildInputs = [ gtk2 ]; - - src = fetchurl { - url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${finalAttrs.version}.orig.tar.gz"; - sha256 = "1rs3li2hyig6cdzvgqlbz0vw6x7rmgr59qd6m0cvrai8xhqqykda"; - }; - - hardeningDisable = [ "format" ]; - - meta = { - homepage = "https://packages.debian.org/source/xbindkeys-config"; - description = "Graphical interface for configuring xbindkeys"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ benley ]; - platforms = with lib.platforms; linux; - mainProgram = "xbindkeys-config"; - }; - - patches = [ ./xbindkeys-config-patch1.patch ]; - - # killall is dangerous on non-gnu platforms. Use pkill instead. - postPatch = '' - substituteInPlace middle.c --replace "killall" "pkill -x" - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - gzip -c ${./xbindkeys-config.1} > $out/share/man/man1/xbindkeys-config.1.gz - cp xbindkeys_config $out/bin/xbindkeys-config - wrapProgram $out/bin/xbindkeys-config --prefix PATH ":" "${procps}/bin" - ''; -}) diff --git a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch b/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch deleted file mode 100644 index d4620b5d9071..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- - Makefile | 6 +++--- - menu.c | 11 ++++++++--- - middle.c | 9 +++++++-- - xbindkeys_config.c | 3 ++- - 4 files changed, 20 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index 602875c..28e46cd 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,9 @@ - # makefile crée par Laurent VUIBERT - --CC= gcc -O3 -Wall -+CC= gcc $(CFLAGS) - STD= _GNU_SOURCE --GTK= `gtk-config --cflags --libs` --GTK2= `gtk-config --cflags` -+GTK= `pkg-config --cflags --libs gtk+-2.0` -+GTK2= `pkg-config --cflags gtk+-2.0` - OBJS= xbindkeys_config.o menu.o middle.o speedc.o - NOM= xbindkeys_config - -diff --git a/menu.c b/menu.c -index ed3e7ec..f11526d 100644 ---- a/menu.c -+++ b/menu.c -@@ -283,6 +283,8 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data) - GtkWidget *window; - GtkWidget *text; - GtkWidget *vbox; -+ GtkTextBuffer *textbuffer; -+ GtkTextIter iter; - - window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_window_set_title(GTK_WINDOW(window), -@@ -293,10 +295,13 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data) - text = gtk_label_new("\nManual\n"); - gtk_box_pack_start(GTK_BOX(vbox), text, FALSE, FALSE, 0); - -- text = gtk_text_new(NULL,NULL); -+/* BDD - FIXME */ -+/* text = gtk_text_new(NULL,NULL); */ -+ text = gtk_text_view_new(); -+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); -+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0); - -- -- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, -+ gtk_text_buffer_insert (textbuffer, &iter, - MANUAL_TEXT, sizeof(MANUAL_TEXT)-1); - gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0); - gtk_widget_set_usize(text,300,250); -diff --git a/middle.c b/middle.c -index daa61aa..605ab10 100644 ---- a/middle.c -+++ b/middle.c -@@ -551,6 +551,8 @@ void view_generated_file() - GtkWidget *window; - GtkWidget *text; - GtkWidget *src; -+ GtkTextBuffer *textbuffer; -+ GtkTextIter iter; - char line [1024]; - - unlink(TEMP_FILE); -@@ -561,11 +563,13 @@ void view_generated_file() - gtk_window_set_title(GTK_WINDOW(window), "Generated File"); - src = gtk_scrolled_window_new ( NULL, NULL ); - gtk_widget_set_usize(src,500,400); -- text = gtk_text_new (NULL, NULL); -+ text = gtk_text_view_new (); -+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); -+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0); - gtk_container_add (GTK_CONTAINER(src), text); - - while (fgets (line, sizeof(line), f)) -- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, -+ gtk_text_buffer_insert (textbuffer, &iter, - line, strlen(line)); - - gtk_container_add(GTK_CONTAINER(window),src); -@@ -610,6 +614,7 @@ void save_file(char file_out[]) - fprintf(f, "# m:xxx + c:xxx \n"); - fprintf(f, "# Shift+... \n\n\n\n\n"); - -+ - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Flag_NumLock))) - fprintf(f,"keystate_numlock = enable\n"); - else -diff --git a/xbindkeys_config.c b/xbindkeys_config.c -index 75bad30..3c02a2b 100644 ---- a/xbindkeys_config.c -+++ b/xbindkeys_config.c -@@ -95,7 +95,8 @@ int main (int argc, char *argv[]) - accel_group = gtk_accel_group_new(); - menu=xbindkeys_config_menu(accel_group); - gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0); -- gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); -+/* BDD - FIXME - Don't need this? */ -+/* gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); */ - - middle= xbindkeys_config_middle(); - gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0); --- -2.1.3 - diff --git a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 b/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 deleted file mode 100644 index e3f8de1a8046..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 +++ /dev/null @@ -1,21 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27. -.TH XBINDKEYS_CONFIG "1" "April 2002" "xbindkeys-config" "User Commands" -.SH NAME -xbindkeys-config \- GTK+ configuration tool for xbindkeys -.SH "SYNOPSIS" -xbindkeys-config -[\-\-file|\-f file] -[\-\-help|\-h] -[\-\-show|\-s] -.TP -\fB\-h\fR, \fB\-\-help\fR -This Help -.TP -\fB\-f\fR, \fB\-\-file\fR -Use an alternative rc file -.TP -\fB\-s\fR, \fB\-\-show\fR -show only the rc file -.SH AUTHOR -This manual page was written by Joerg Jaspert , -for the Debian GNU/Linux system (but may be used by others). diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 76007cb15d3c..66deca90d9ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2117,6 +2117,7 @@ mapAliases { wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 wxSVG = warnAlias "'wxSVG' has been renamed to 'wxsvg'" wxsvg; Xaw3d = warnAlias "'Xaw3d' has been renamed to 'libxaw3d'" libxaw3d; # Added 2026-02-12 + xbindkeys-config = throw "'xbindkeys-config' has been removed as it is broken and unmaintained upstream"; # Added 2026-04-18 xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xcb-util-cursor = libxcb-cursor; # Added 2026-02-04