Accepting request 1271856 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/1271856
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libedit?expand=0&rev=34

libedit-20180525-manpage-conflicts.patch

@@ -1,60 +0,0 @@
-From: 1Antoine1 <antoine.belvire@opensuse.org>
-Date: 2018-08-06 11:47:22 +0200
-Subject: doc: File conlicts with readline-doc
-References: (none)
-Upstream: not submitted yet
-
-Make sure all manpages are prefixed with "el_" in order to avoid
-file conflicts with readline-doc.
-
----
-Index: libedit-20210910-3.1/doc/Makefile.am
-===================================================================
---- libedit-20210910-3.1.orig/doc/Makefile.am
-+++ libedit-20210910-3.1/doc/Makefile.am
-@@ -20,14 +20,14 @@ EL_MAN_LINKS = \
- 		el_resize.3 \
- 		el_set.3 \
- 		el_source.3 \
--		history.3 \
--		history_end.3 \
--		history_init.3 \
--		tok_end.3 \
--		tok_init.3 \
--		tok_line.3 \
--		tok_reset.3 \
--		tok_str.3
-+		el_history.3 \
-+		el_history_end.3 \
-+		el_history_init.3 \
-+		el_tok_end.3 \
-+		el_tok_init.3 \
-+		el_tok_line.3 \
-+		el_tok_reset.3 \
-+		el_tok_str.3
- 
- EL_MAN_LINKS += \
- 		el_wdeletestr.3 \
-@@ -39,14 +39,14 @@ EL_MAN_LINKS += \
- 		el_wparse.3 \
- 		el_wpush.3 \
- 		el_wset.3 \
--		history_w.3 \
--		history_wend.3 \
--		history_winit.3 \
--		tok_wend.3 \
--		tok_winit.3 \
--		tok_wline.3 \
--		tok_wreset.3 \
--		tok_wstr.3
-+		el_history_w.3 \
-+		el_history_wend.3 \
-+		el_history_winit.3 \
-+		el_tok_wend.3 \
-+		el_tok_winit.3 \
-+		el_tok_wline.3 \
-+		el_tok_wreset.3 \
-+		el_tok_wstr.3
- 
- 
- install-data-hook: $(EL_MAN_LINKS)

libedit-20250104-3.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23792701694550a53720630cd1cd6167101b5773adddcb4104f7345b73a568ac
+size 546745

libedit-hidden-symbols.patch

@@ -1,30 +0,0 @@
-Index: libedit-20210910-3.1/src/sys.h
-===================================================================
---- libedit-20210910-3.1.orig/src/sys.h
-+++ libedit-20210910-3.1/src/sys.h
-@@ -40,6 +40,10 @@
- #ifndef _h_sys
- #define	_h_sys
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #ifdef HAVE_SYS_CDEFS_H
- #include <sys/cdefs.h>
- #endif
-@@ -84,12 +88,12 @@ typedef void	*ioctl_t;
- 
- #ifndef HAVE_STRLCAT
- //#define	strlcat libedit_strlcat
--size_t	strlcat(char *dst, const char *src, size_t size);
-+size_t	strlcat(char *dst, const char *src, size_t size) libedit_private;
- #endif
- 
- #ifndef HAVE_STRLCPY
- //#define	strlcpy libedit_strlcpy
--size_t	strlcpy(char *dst, const char *src, size_t size);
-+size_t	strlcpy(char *dst, const char *src, size_t size) libedit_private;
- #endif
- 
- #ifndef HAVE_GETLINE

libedit.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Apr 13 13:26:37 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- update to 20250104:
+  * all: sync with upstream source
+  * doc/Makefile.am: fix regression.  Name all manpage links as
+    el_* (e.g. el_history.3) to avoid conflicts.
+  * src/chartype.c: Add missing stdint.h
+  * src/sys.h, src/reallocarr.c: Remove unused sys/cdefs.h
+    include, to compile against musl libc
+  * src/sys.h: Add __sun guard around sys/types.h in sys.h
+- drop libedit-20180525-manpage-conflicts.patch and
+  libedit-hidden-symbols.patch: upstreamed
+- no need for autoreconf and it's BuildRequires:
+
 -------------------------------------------------------------------
 Wed Apr  5 15:01:43 UTC 2023 - Cristian Rodríguez <crrodriguez@opensuse.org>
 

libedit.spec

@@ -16,10 +16,10 @@
 #
 
 
-%define pkg_version 20210910-3.1
+%define pkg_version 20250104-3.1
 %define sover 0
 Name:           libedit
-Version:        20210910.3.1
+Version:        20250104.3.1
 Release:        0
 Summary:        Command Line Editing and History Library
 License:        BSD-3-Clause
@@ -28,11 +28,6 @@ URL:            https://www.thrysoee.dk/editline/
 Source0:        https://www.thrysoee.dk/editline/libedit-%{pkg_version}.tar.gz
 Source1:        README.SUSE
 Source2:        baselibs.conf
-Patch0:         libedit-20180525-manpage-conflicts.patch
-Patch1:         libedit-hidden-symbols.patch
-# For patch0
-BuildRequires:  automake
-BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(ncurses)
 
@@ -71,7 +66,6 @@ This package holds the development files for libedit.
 cp %{SOURCE1} .
 
 %build
-autoreconf -fiv
 %configure \
   --disable-static \
   --disable-silent-rules