From 8c9f03b653c36292a544a4ccf224f2af0ce1a9b0 Mon Sep 17 00:00:00 2001 From: gryf Date: Tue, 10 Nov 2026 10:41:33 +0100 Subject: [PATCH] Removed patches for id3lib and galculator Added patch for fs-uae for "numbers" name clash. --- .../fs-uae/fs-uae-3.2.35-name-clash-fix.patch | 21 ++++ .../id3lib-3.8.3-r10-fix-bool-typedef.patch | 17 --- .../galculator/galculator-2.1.4-c23.patch | 106 ------------------ 3 files changed, 21 insertions(+), 123 deletions(-) create mode 100644 app-emulation/fs-uae/fs-uae-3.2.35-name-clash-fix.patch delete mode 100644 media-libs/id3lib/id3lib-3.8.3-r10-fix-bool-typedef.patch delete mode 100644 sci-calculators/galculator/galculator-2.1.4-c23.patch diff --git a/app-emulation/fs-uae/fs-uae-3.2.35-name-clash-fix.patch b/app-emulation/fs-uae/fs-uae-3.2.35-name-clash-fix.patch new file mode 100644 index 0000000..d760849 --- /dev/null +++ b/app-emulation/fs-uae/fs-uae-3.2.35-name-clash-fix.patch @@ -0,0 +1,21 @@ +diff '--color=auto' -ur fs-uae-3.2.35-orig/src/statusline.cpp fs-uae-3.2.35/src/statusline.cpp +--- fs-uae-3.2.35-orig/src/statusline.cpp 2025-09-07 13:20:23.000000000 +0200 ++++ fs-uae-3.2.35/src/statusline.cpp 2026-11-10 10:35:59.612110822 +0100 +@@ -44,7 +44,7 @@ + } + } + +-static const char *numbers = { /* ugly 0123456789CHD%+-P */ ++static const char *numbers_bmp = { /* ugly 0123456789CHD%+-P */ + "+++++++--++++-+++++++++++++++++-++++++++++++++++++++++++++++++++++++++++++++-++++++-++++----++---+--------------+++++++" + "+xxxxx+--+xx+-+xxxxx++xxxxx++x+-+x++xxxxx++xxxxx++xxxxx++xxxxx++xxxxx++xxxx+-+x++x+-+xxx++-+xx+-+x---+----------+xxxxx+" + "+x+++x+--++x+-+++++x++++++x++x+++x++x++++++x++++++++++x++x+++x++x+++x++x++++-+x++x+-+x++x+--+x++x+--+x+----+++--+x---x+" +@@ -67,7 +67,7 @@ + int j; + const char *numptr; + +- numptr = numbers + num * TD_NUM_WIDTH + NUMBERS_NUM * TD_NUM_WIDTH * y; ++ numptr = numbers_bmp + num * TD_NUM_WIDTH + NUMBERS_NUM * TD_NUM_WIDTH * y; + for (j = 0; j < TD_NUM_WIDTH; j++) { + if (*numptr == 'x') + putpixel (buf, bpp, x + j, c1, 1); diff --git a/media-libs/id3lib/id3lib-3.8.3-r10-fix-bool-typedef.patch b/media-libs/id3lib/id3lib-3.8.3-r10-fix-bool-typedef.patch deleted file mode 100644 index 9fdd8b4..0000000 --- a/media-libs/id3lib/id3lib-3.8.3-r10-fix-bool-typedef.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- id3lib-3.8.3_orig/include/id3/globals.h 2026-04-01 11:04:30.002608338 +0200 -+++ id3lib-3.8.3/include/id3/globals.h 2026-04-01 11:06:12.388848196 +0200 -@@ -82,14 +82,6 @@ - - #define ID3_C_VAR extern - --#ifndef __cplusplus -- --typedef int bool; --# define false (0) --# define true (!false) -- --#endif /* __cplusplus */ -- - ID3_C_VAR const char * const ID3LIB_NAME; - ID3_C_VAR const char * const ID3LIB_RELEASE; - ID3_C_VAR const char * const ID3LIB_FULL_NAME; diff --git a/sci-calculators/galculator/galculator-2.1.4-c23.patch b/sci-calculators/galculator/galculator-2.1.4-c23.patch deleted file mode 100644 index d773cf9..0000000 --- a/sci-calculators/galculator/galculator-2.1.4-c23.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: "Henrique F. Simoes" -Date: Wed, 15 Oct 2025 21:17:51 -0300 -Subject: Declare function parameters as required by C23 - -In C23, having no parameter in a function declaration no longer means an -"unspecified" number of arguments [1]. Therefore, this code fails to -build with this standard. Declare the missing function arguments, so -that it compiles once again with the default standard from modern -compilers, such as GCC 15. - -The exception here is the set_{basic,scientific}_object_data functions, -which actually don't use their argument at all. Thus, their unique calls -are changed instead. - -Because functions registered by set_disp_ctrl_object_data don't receive -a button pointer as argument as the others, declare a new struct for -holding the entries for that. It is named after "display" as it is only -used for display control buttons. - -[1] https://gcc.gnu.org/gcc-15/porting_to.html - -Bug-Debian: https://bugs.debian.org/1096669 ---- - src/callbacks.c | 2 +- - src/galculator.h | 8 +++++++- - src/ui.c | 6 +++--- - src/ui.h | 2 +- - 4 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/callbacks.c b/src/callbacks.c -index 503fb13..7259afe 100644 ---- a/src/callbacks.c -+++ b/src/callbacks.c -@@ -262,7 +262,7 @@ void - on_gfunc_button_clicked (GtkToggleButton *button, - gpointer user_data) - { -- void (*func)(); -+ void (*func)(GtkToggleButton *); - char *display_string; - - if (gtk_toggle_button_get_active(button) == FALSE) return; -diff --git a/src/galculator.h b/src/galculator.h -index 22a4060..bb2ff9f 100644 ---- a/src/galculator.h -+++ b/src/galculator.h -@@ -180,9 +180,15 @@ typedef struct { - typedef struct { - char *button_name; - char *display_string; -- void (*func)(); -+ void (*func)(GtkToggleButton *button); - } s_gfunc_map; - -+typedef struct { -+ char *button_name; -+ char *display_string; -+ void (*func)(); -+} s_disp_func_map; -+ - typedef struct { - char *button_name; - /* display_string: what to display in history or formula entry. hasn't -diff --git a/src/ui.c b/src/ui.c -index 6eaac7d..3ed50a5 100644 ---- a/src/ui.c -+++ b/src/ui.c -@@ -244,7 +244,7 @@ static void set_disp_ctrl_object_data () - { - int counter=0; - -- s_gfunc_map map[] = {\ -+ s_disp_func_map map[] = {\ - {"button_clr", NULL, clear},\ - {"button_backspace", NULL, backspace},\ - {"button_allclr", NULL, all_clear},\ -@@ -433,14 +433,14 @@ void ui_main_window_buttons_create (int mode) - button_box_xml = gtk_builder_file_open (BASIC_GLADE_FILE, TRUE); - box = GTK_WIDGET(gtk_builder_get_object (view_xml, "classic_view_vbox")); - ui_pack_from_xml (box, 2, button_box_xml, "button_box", TRUE, TRUE); -- set_basic_object_data (button_box_xml); -+ set_basic_object_data (); - break; - case SCIENTIFIC_MODE: - if (button_box_xml) g_object_unref (G_OBJECT(button_box_xml)); - button_box_xml = gtk_builder_file_open (SCIENTIFIC_GLADE_FILE, TRUE); - box = GTK_WIDGET(gtk_builder_get_object (view_xml, "classic_view_vbox")); - ui_pack_from_xml (box, 2, button_box_xml, "button_box", TRUE, TRUE); -- set_scientific_object_data (button_box_xml); -+ set_scientific_object_data (); - break; - case PAPER_MODE: - return; -diff --git a/src/ui.h b/src/ui.h -index 90992a2..a20ac3c 100644 ---- a/src/ui.h -+++ b/src/ui.h -@@ -74,7 +74,7 @@ void ui_formula_entry_activate (); - void ui_formula_entry_set (G_CONST_RETURN gchar *text); - void ui_formula_entry_insert (G_CONST_RETURN gchar *text); - void ui_formula_entry_backspace (); --void ui_formula_entry_state (); -+void ui_formula_entry_state (gboolean error); - void ui_button_set_pan (); - void ui_button_set_rpn (); - void ui_relax_fmod_buttons ();