From d7e564522107d120f566f85f0a9efbac058b4f50 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 13 Nov 2022 01:28:14 +0000 Subject: [PATCH] ncurses 6.3 - patch 20221112 + build-fixes for AdaCurses RPM test-package. --- Ada95/package/AdaCurses.spec | 27 ++++++++++++++++++++++++++- Ada95/src/c_threaded_variables.c | 4 ++-- NEWS | 5 ++++- VERSION | 2 +- dist.mk | 4 ++-- package/debian-mingw/changelog | 4 ++-- package/debian-mingw64/changelog | 4 ++-- package/debian/changelog | 4 ++-- package/mingw-ncurses.nsi | 4 ++-- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- 12 files changed, 46 insertions(+), 18 deletions(-) diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec index 9b39110e..9c34cad4 100644 --- a/Ada95/package/AdaCurses.spec +++ b/Ada95/package/AdaCurses.spec @@ -2,7 +2,7 @@ Summary: Ada95 binding for ncurses %define AppProgram AdaCurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: AdaCurses.spec,v 1.25 2019/11/23 21:15:31 tom Exp $ +# $Id: AdaCurses.spec,v 1.29 2022/11/13 00:35:00 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} @@ -20,6 +20,10 @@ In addition to a library, this package installs sample programs in "bin/%{AppProgram}" to avoid conflict with other packages. %prep +%global is_mandriva %(test -f /etc/mandriva-release && echo 1 || echo 0) +%global is_redhat %(test -f /etc/redhat-release && echo 1 || echo 0) +%global is_suse %(if grep -E -i '(opensuse)' /etc/issue >/dev/null; then echo 1; else echo 0; fi) + %define debug_package %{nil} %define need_filter %(if grep -E -i '(mageia|red hat|fedora)' /etc/issue >/dev/null; then echo 1; elif test -f /etc/fedora-release; then echo 1; else echo 0; fi) @@ -37,6 +41,17 @@ In addition to a library, this package installs sample programs in %define ada_libdir %{_prefix}/lib/ada/adalib %define ada_include %{_prefix}/share/ada/adainclude +%if %{is_mandriva} +# Mageia 8 lacks gprbuild, needed for building shared libraries. +%else +%if %{is_redhat} +# Fedora 36 LTO does not work with gprbuild system configuration. +unset CFLAGS +unset LDFLAGS +unset LT_SYS_LIBRARY_PATH +%endif +%endif + INSTALL_PROGRAM='${INSTALL}' \ ./configure \ --target %{_target_platform} \ @@ -48,6 +63,9 @@ INSTALL_PROGRAM='${INSTALL}' \ --mandir=%{_mandir} \ --datadir=%{_datadir} \ --disable-rpath-link \ + --disable-echo \ + --verbose \ + --enable-warnings \ --with-shared \ --with-ada-sharedlib @@ -80,6 +98,9 @@ exit 0 %if %{need_filter} == 1 %{_libdir}/lib%{AppProgram}.* %endif +%if %{is_suse} +%{_libdir}/lib%{AppProgram}.* +%endif %{_mandir}/man1/adacurses*-config.1* %{_datadir}/%{AppProgram}/* %{ada_include}/ @@ -87,6 +108,10 @@ exit 0 %changelog # each patch should add its ChangeLog entries here +* Sat Nov 12 2022 Thomas Dickey +- unset environment variables to work around Fedora LTO bugs. +- build-fix for OpenSUSE with gprbuild. + * Sat Nov 16 2019 Thomas Dickey - modify clean-rule to work around Fedora NFS bugs. diff --git a/Ada95/src/c_threaded_variables.c b/Ada95/src/c_threaded_variables.c index 4c13153e..44b4bcbc 100644 --- a/Ada95/src/c_threaded_variables.c +++ b/Ada95/src/c_threaded_variables.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ #define WRAP(type, name) \ type \ - name ## _as_function () \ + name ## _as_function (void) \ { \ return name; \ } diff --git a/NEWS b/NEWS index 3818c210..df476389 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3875 2022/11/05 22:24:03 tom Exp $ +-- $Id: NEWS,v 1.3877 2022/11/13 00:20:41 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20221112 + + build-fixes for AdaCurses RPM test-package. + 20221105 + regenerate configure scripts with autoconf 2.52.20221009 + modify "--with-manpage-format" to support bzip2 and xz compression diff --git a/VERSION b/VERSION index 459ae7cb..e5315330 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20221105 +5:0:10 6.3 20221112 diff --git a/dist.mk b/dist.mk index c4b46a38..15cd1ee1 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1511 2022/11/05 12:24:12 tom Exp $ +# $Id: dist.mk,v 1.1512 2022/11/12 10:24:16 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 3 -NCURSES_PATCH = 20221105 +NCURSES_PATCH = 20221112 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index bc6c9d31..dcef95ea 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20221105) unstable; urgency=low +ncurses6 (6.3+20221112) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 05 Nov 2022 08:24:12 -0400 + -- Thomas E. Dickey Sat, 12 Nov 2022 05:24:16 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index bc6c9d31..dcef95ea 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20221105) unstable; urgency=low +ncurses6 (6.3+20221112) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 05 Nov 2022 08:24:12 -0400 + -- Thomas E. Dickey Sat, 12 Nov 2022 05:24:16 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 81391ccd..03b761ee 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20221105) unstable; urgency=low +ncurses6 (6.3+20221112) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 05 Nov 2022 08:24:12 -0400 + -- Thomas E. Dickey Sat, 12 Nov 2022 05:24:16 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 588c1d6b..93312c16 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.550 2022/11/05 12:24:12 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.551 2022/11/12 10:24:16 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "3" !define VERSION_YYYY "2022" -!define VERSION_MMDD "1105" +!define VERSION_MMDD "1112" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 8acce52e..29276cd4 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.3 -Release: 20221105 +Release: 20221112 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 160dcc9e..334922ff 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.3 -Release: 20221105 +Release: 20221112 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 0ce25250..663fb0e0 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.3 -Release: 20221105 +Release: 20221112 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.45.0