From 659461eeffc5a61c5935247976862cdf986e29fb Mon Sep 17 00:00:00 2001 From: pgen <> Date: May 27 2025 16:56:56 +0000 Subject: Update smenu to version 1.5.0 / rev 14 via SR 1280419 https://build.opensuse.org/request/show/1280419 by user pgen + anag_factory - Typo: "sles_version" -> "sle_version" in smenu.spec - Removal of the patch added in revision 34 (smenu-gcc15.patch, issue #46). This patch is no longer required as the code has been reworked. - Version 1.5.0 * Fixes * Various modifications and corrections have been made to make the substitution code more robust. * Added several variable initializations that were missing. * ^H and BS now work correctly in all cases. * A stdin flush has been added before requesting the cursor's initial position. * Memory leaks have been fixed. * Highlighting in search mode works correctly in all cases. * Compilations problems with gcc-15 have been corrected. * Compiler warnings have been fixed. * The description of S-HOME/S-END in the manual has been corrected. * Improvements: --- diff --git a/.files b/.files index 513ce22..73508cb 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 058c78d..979b223 100644 --- a/.rev +++ b/.rev @@ -300,4 +300,40 @@ 1273743 + + 8ad8d09ec69b7a5d6a1f1acdd6c26c47 + 1.5.0 + + anag_factory + - Typo: "sles_version" -> "sle_version" in smenu.spec +- Removal of the patch added in revision 34 (smenu-gcc15.patch, issue #46). + This patch is no longer required as the code has been reworked. +- Version 1.5.0 +* Fixes + * Various modifications and corrections have been made to make the + substitution code more robust. + * Added several variable initializations that were missing. + * ^H and BS now work correctly in all cases. + * A stdin flush has been added before requesting the cursor's initial + position. + * Memory leaks have been fixed. + * Highlighting in search mode works correctly in all cases. + * Compilations problems with gcc-15 have been corrected. + * Compiler warnings have been fixed. + * The description of S-HOME/S-END in the manual has been corrected. +* Improvements: + * The TAB key can now be used to automatically complete search patterns + until an ambiguity arises. + * A -hbar|-hor_scroll_bar option has been added to force the display of + the horizontal scroll bar. + * The quick help system has been rewritten. + * ZWSP, ZWNJ, ZWJ, LRM and RLM glyphs are now ignored. +* Miscellaneous: + * The README and documentation have been improved and clarified. + * Some parts of the code have been removed or reorganized. + * New tests have been added. + * Improve smenu.spec. + + 1280419 + diff --git a/smenu-1.4.0.tar.bz2 b/smenu-1.4.0.tar.bz2 deleted file mode 120000 index 5f47e1f..0000000 --- a/smenu-1.4.0.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeide6qe4fa5poua4covhdlallhf3eqfxfqqmlplhracxmdftlnlthm \ No newline at end of file diff --git a/smenu-1.5.0.tar.bz2 b/smenu-1.5.0.tar.bz2 new file mode 120000 index 0000000..025146f --- /dev/null +++ b/smenu-1.5.0.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeigzjjnqeqivfkglfqaeu6xfrdjzkscinrmnnpqu32uap6fnsczrwm \ No newline at end of file diff --git a/smenu-gcc15.patch b/smenu-gcc15.patch deleted file mode 100644 index 125db56..0000000 --- a/smenu-gcc15.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -upr smenu-1.4.0.orig/ctxopt.c smenu-1.4.0/ctxopt.c ---- smenu-1.4.0.orig/ctxopt.c 2025-04-30 14:28:19.963796848 +0000 -+++ smenu-1.4.0/ctxopt.c 2025-04-30 14:46:30.672418979 +0000 -@@ -4654,7 +4654,7 @@ ctxopt_add_opt_settings(settings s, ...) - case actions: - { - void *data; -- void (*function)(); -+ void (*function)(char *, char *, char *, int, char **, int, void **, int, void **); - int nb_data = 0; - - /* The second argument must be the name of an existing option. */ -@@ -4664,7 +4664,7 @@ ctxopt_add_opt_settings(settings s, ...) - if ((opt = locate_opt(ptr)) != NULL) - { - typedef void -- fn(char *, char *, char *, int, char **, int, void *, int, void **); -+ fn(char *, char *, char *, int, char **, int, void **, int, void **); - - /* The third argument must be the callback function. */ - /* """"""""""""""""""""""""""""""""""""""""""""""""" */ -@@ -4696,7 +4696,7 @@ ctxopt_add_opt_settings(settings s, ...) - { - char *value; - constraint_t *cstr; -- int (*function)(); -+ int (*function)(int, char **, char *, char *); - - /* The second argument must be a string. */ - /* """"""""""""""""""""""""""""""""""""" */ -@@ -4704,7 +4704,7 @@ ctxopt_add_opt_settings(settings s, ...) - - if ((opt = locate_opt(ptr)) != NULL) - { -- typedef int fn(int, char **, char *); -+ typedef int fn(int, char **, char *, char *); - - /* The third argument must be a function. */ - /* """""""""""""""""""""""""""""""""""""" */ -@@ -4964,13 +4964,13 @@ ctxopt_add_ctx_settings(settings s, ...) - { - void *ptr; - void *data; -- int (*function)(); -+ int (*function)(char *, int, char *, int, void **); - int nb_data = 0; - - ptr = va_arg(args, char *); - if ((ctx = locate_ctx(ptr)) != NULL) - { -- typedef int fn(char *, direction, char *, int, void **); -+ typedef int fn(char *, int, char *, int, void **); - - function = va_arg(args, fn *); - ctx->action = function; -Only in smenu-1.4.0: ctxopt.o -Only in smenu-1.4.0: smenu diff --git a/smenu.changes b/smenu.changes index 072233c..490b0e2 100644 --- a/smenu.changes +++ b/smenu.changes @@ -1,4 +1,46 @@ ------------------------------------------------------------------- +Mon May 26 22:39:19 UTC 2025 - Pierre Gentile + +- Typo: "sles_version" -> "sle_version" in smenu.spec + +------------------------------------------------------------------- +Mon May 26 17:51:00 UTC 2025 - Pierre Gentile + +- Removal of the patch added in revision 34 (smenu-gcc15.patch, issue #46). + This patch is no longer required as the code has been reworked. + +------------------------------------------------------------------- +Sun May 25 23:19:48 UTC 2025 - Pierre Gentile + +- Version 1.5.0 +* Fixes + * Various modifications and corrections have been made to make the + substitution code more robust. + * Added several variable initializations that were missing. + * ^H and BS now work correctly in all cases. + * A stdin flush has been added before requesting the cursor's initial + position. + * Memory leaks have been fixed. + * Highlighting in search mode works correctly in all cases. + * Compilations problems with gcc-15 have been corrected. + * Compiler warnings have been fixed. + * The description of S-HOME/S-END in the manual has been corrected. + +* Improvements: + * The TAB key can now be used to automatically complete search patterns + until an ambiguity arises. + * A -hbar|-hor_scroll_bar option has been added to force the display of + the horizontal scroll bar. + * The quick help system has been rewritten. + * ZWSP, ZWNJ, ZWJ, LRM and RLM glyphs are now ignored. + +* Miscellaneous: + * The README and documentation have been improved and clarified. + * Some parts of the code have been removed or reorganized. + * New tests have been added. + * Improve smenu.spec. + +------------------------------------------------------------------- Wed Apr 30 15:00:02 UTC 2025 - pgajdos@suse.com - added patches diff --git a/smenu.spec b/smenu.spec index 693b999..0497efc 100644 --- a/smenu.spec +++ b/smenu.spec @@ -17,7 +17,7 @@ Name: smenu -Version: 1.4.0 +Version: 1.5.0 Release: 0 Summary: A standard input word picker License: GPL-2.0-only @@ -25,7 +25,6 @@ Group: Productivity/Text/Utilities URL: https://github.com/p-gen/%{name} Source: https://github.com/p-gen/smenu/releases/download/v%{version}/smenu-%{version}.tar.bz2 # https://github.com/p-gen/smenu/issues/46 -Patch0: smenu-gcc15.patch BuildRequires: ncurses-devel %description @@ -38,12 +37,19 @@ selected words, if any, to standard output. %build %configure +%if (0%{?sle_version} >= 150000 && !0%{?is_opensuse}) + || (0%{?suse_version} >= 150000 && 0%{?is_opensuse}) + || (0%{?rhel_version} > 600) %make_build +%else +make %{?_smp_mflags} +%endif %package tests Summary: Testing system for %{name} Group: Productivity/Text/Utilities Requires: smenu +BuildArch: noarch %description tests This packages contains some scripts and a number of tests to check the