rpms/ncurses
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
733eaccac0
ncurses/ncurses-6.1-20191228.patch

361 lines
13 KiB
Diff
Raw Blame History

# ncurses 6.1 - patch 20191228 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191228.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Dec 29 02:31:23 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 10 +++++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# misc/gen-pkgconfig.in | 10 +++++++---
# misc/ncurses-config.in | 5 ++++-
# 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 | 22 +++++++++++++++-------
# package/ncursest.spec | 23 +++++++++++++++--------
# 12 files changed, 62 insertions(+), 32 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3420
--- ncurses-6.1-20191221+/NEWS 2019-12-21 22:43:54.000000000 +0000
+++ ncurses-6.1-20191228/NEWS 2019-12-25 23:16:49.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3420 2019/12/21 22:43:54 tom Exp $
+-- $Id: NEWS,v 1.3422 2019/12/25 23:16:49 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,14 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20191228
+ + in gen-pkgconfig.in, move the RPATH_LIST and PRIVATE_LIBS assignments
+ past the various prefix/libdir assignments, to allow for using those
+ symbols, e.g., as done via CF_SHARED_OPTS.
+ + improve ncurses*-config and pc-files by filtering out linker-specs.
+ + modify test-package to more closely match Fedora's configuration
+ for PIE/PIC feature and debug-packages.
+
20191221
+ correct pathname used in Ada95 sample programs for explain.txt, to
work with test-packages.
Index: VERSION
--- ncurses-6.1-20191221+/VERSION 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/VERSION 2019-12-28 15:45:41.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191221
+5:0:10 6.1 20191228
Index: dist.mk
Prereq: 1.1320
--- ncurses-6.1-20191221+/dist.mk 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/dist.mk 2019-12-28 15:45:41.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1320 2019/12/21 11:16:12 tom Exp $
+# $Id: dist.mk,v 1.1321 2019/12/28 15:45:41 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 1
-NCURSES_PATCH = 20191221
+NCURSES_PATCH = 20191228
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/gen-pkgconfig.in
Prereq: 1.40
--- ncurses-6.1-20191221+/misc/gen-pkgconfig.in 2019-10-12 22:27:10.000000000 +0000
+++ ncurses-6.1-20191228/misc/gen-pkgconfig.in 2019-12-25 23:09:13.000000000 +0000
@@ -1,5 +1,5 @@
#!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.40 2019/10/12 22:27:10 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.42 2019/12/25 23:09:13 tom Exp $
##############################################################################
# Copyright (c) 2009-2018,2019 Free Software Foundation, Inc. #
# #
@@ -46,8 +46,6 @@
DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
-RPATH_LIST=@RPATH_LIST@
-PRIVATE_LIBS="@PRIVATE_LIBS@"
suffix=@PC_MODULE_SUFFIX@
prefix="@prefix@"
@@ -55,6 +53,9 @@
includedir="@includedir@@includesubdir@"
libdir="@libdir@"
+RPATH_LIST=@RPATH_LIST@
+PRIVATE_LIBS="@PRIVATE_LIBS@"
+
show_prefix='@prefix@'
show_exec_prefix='@exec_prefix@'
show_includedir='@includedir@@includesubdir@'
@@ -84,6 +85,9 @@
-l*) # LIBS is handled specially below
continue
;;
+ -specs*) # ignore linker specs-files which were used to build library
+ continue
+ ;;
-Wl,-z,*) # ignore flags used to manipulate shared image
continue
;;
Index: misc/ncurses-config.in
Prereq: 1.41
--- ncurses-6.1-20191221+/misc/ncurses-config.in 2019-10-12 21:25:17.000000000 +0000
+++ ncurses-6.1-20191228/misc/ncurses-config.in 2019-12-25 00:54:55.000000000 +0000
@@ -1,5 +1,5 @@
#!@SHELL@
-# $Id: ncurses-config.in,v 1.41 2019/10/12 21:25:17 tom Exp $
+# $Id: ncurses-config.in,v 1.42 2019/12/25 00:54:55 tom Exp $
##############################################################################
# Copyright (c) 2006-2018,2019 Free Software Foundation, Inc. #
# #
@@ -103,6 +103,9 @@
for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
do
case $opt in
+ -specs*) # ignore linker specs-files which were used to build library
+ continue
+ ;;
-Wl,-z,*) # ignore flags used to manipulate shared image
continue
;;
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191221+/package/debian-mingw/changelog 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/debian-mingw/changelog 2019-12-28 15:45:41.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 24 Dec 2019 06:02:28 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191221+/package/debian-mingw64/changelog 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/debian-mingw64/changelog 2019-12-28 15:45:41.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 24 Dec 2019 06:02:28 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191221+/package/debian/changelog 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/debian/changelog 2019-12-28 15:45:41.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 24 Dec 2019 06:02:28 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.366
--- ncurses-6.1-20191221+/package/mingw-ncurses.nsi 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/mingw-ncurses.nsi 2019-12-24 11:02:28.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.366 2019/12/21 11:16:12 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.367 2019/12/24 11:02:28 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1221"
+!define VERSION_MMDD "1228"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191221+/package/mingw-ncurses.spec 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/mingw-ncurses.spec 2019-12-24 11:02:28.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191221
+Release: 20191228
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191221+/package/ncurses.spec 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/ncurses.spec 2019-12-24 14:48:17.000000000 +0000
@@ -1,15 +1,12 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191221
+Release: 20191228
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
# URL: https://invisible-island.net/ncurses/
-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
-
%global MY_ABI 6
# save value before redefining
@@ -33,8 +30,11 @@
%global is_redhat %(test -f /etc/redhat-release && echo 1 || echo 0)
%global is_suse %(test -f /etc/SuSE-release && echo 1 || echo 0)
-# nor are debug-symbols
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
%define debug_package %{nil}
+%endif
%if %{is_mandriva}
%define _disable_ld_as_needed 1
@@ -100,8 +100,6 @@
--without-debug \\\
--without-normal
-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_libdir} \
%configure %{CFG_OPTS}
make
@@ -113,6 +111,11 @@
rm -f test/ncurses
( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
+%if %{is_redhat}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+
%clean
if rm -rf $RPM_BUILD_ROOT; then
echo OK
@@ -129,6 +132,11 @@
%changelog
+* Tue Dec 24 2019 Thomas Dickey
+- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+ matching Fedora's PIE/PIC configuration. Also, generate debug/debug-source
+ packages.
+
* Sat Nov 16 2019 Thomas Dickey
- modify clean-rule to work around Fedora NFS bugs.
Index: package/ncursest.spec
--- ncurses-6.1-20191221+/package/ncursest.spec 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/ncursest.spec 2019-12-24 14:59:53.000000000 +0000
@@ -1,15 +1,12 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191221
+Release: 20191228
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
# URL: https://invisible-island.net/ncurses/
-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
-
%global MY_ABI 6
# save value before redefining
@@ -33,8 +30,11 @@
%global is_redhat %(test -f /etc/redhat-release && echo 1 || echo 0)
%global is_suse %(test -f /etc/SuSE-release && echo 1 || echo 0)
-# nor are debug-symbols
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
%define debug_package %{nil}
+%endif
%if %{is_mandriva}
%define _disable_ld_as_needed 1
@@ -54,7 +54,6 @@
%setup -q -n ncurses-%{version}-%{release}
%build
-%define my_srcdir ..
%define CFG_OPTS \\\
--target %{_target_platform} \\\
--prefix=%{_prefix} \\\
@@ -101,8 +100,6 @@
--without-debug \\\
--without-normal
-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_libdir} \
%configure %{CFG_OPTS} \
--enable-interop \
--enable-sp-funcs \
@@ -117,6 +114,11 @@
rm -f test/ncurses
( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} )
+%if %{is_redhat}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+
%clean
if rm -rf $RPM_BUILD_ROOT; then
echo OK
@@ -133,6 +135,11 @@
%changelog
+* Tue Dec 24 2019 Thomas Dickey
+- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+ matching Fedora's PIE/PIC configuration. Also, generate debug/debug-source
+ packages.
+
* Sat Nov 16 2019 Thomas Dickey
- modify clean-rule to work around Fedora NFS bugs.
Reference in New Issue View Git Blame Copy Permalink