diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 91a25f5..fff0af1 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -6,7 +6,7 @@ include/tic.h | 4 - man/man_db.renames | 2 man/ncurses.3x | 4 + - misc/gen-pkgconfig.in | 5 + + misc/gen-pkgconfig.in | 8 ++ misc/terminfo.src | 138 ++++++++++++++++++++++++++++++++++--------- ncurses/Makefile.in | 2 ncurses/curses.priv.h | 2 @@ -18,10 +18,10 @@ ncurses/tinfo/read_termcap.c | 21 ++++-- progs/Makefile.in | 4 - test/test.priv.h | 4 - - 19 files changed, 245 insertions(+), 77 deletions(-) + 19 files changed, 248 insertions(+), 77 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2019-08-12 08:07:59.755015362 +0000 ++++ aclocal.m4 2019-11-11 09:30:23.206670737 +0000 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -150,7 +150,7 @@ esac done --- configure -+++ configure 2019-08-12 08:07:59.759015287 +0000 ++++ configure 2019-11-11 09:30:23.210670661 +0000 @@ -5590,7 +5590,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; @@ -287,7 +287,7 @@ # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} --- include/curses.h.in -+++ include/curses.h.in 2019-08-12 08:07:59.759015287 +0000 ++++ include/curses.h.in 2019-11-11 09:30:23.210670661 +0000 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -299,7 +299,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2019-08-12 08:07:59.759015287 +0000 ++++ include/termcap.h.in 2019-11-11 09:30:23.210670661 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,7 +310,7 @@ #undef NCURSES_OSPEED --- include/tic.h -+++ include/tic.h 2019-08-12 08:07:59.759015287 +0000 ++++ include/tic.h 2019-11-11 09:30:23.210670661 +0000 @@ -236,12 +236,12 @@ struct user_table_entry */ @@ -327,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2019-08-12 08:16:08.454002432 +0000 ++++ man/man_db.renames 2019-11-11 09:30:23.210670661 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -345,7 +345,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2019-08-12 08:07:59.759015287 +0000 ++++ man/ncurses.3x 2019-11-11 09:30:23.210670661 +0000 @@ -139,6 +139,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -358,8 +358,18 @@ called \fIwindows\fR, which can be thought of as two-dimensional arrays of characters representing all or part of a CRT screen. --- misc/gen-pkgconfig.in -+++ misc/gen-pkgconfig.in 2019-08-12 08:07:59.759015287 +0000 -@@ -127,6 +127,7 @@ do ++++ misc/gen-pkgconfig.in 2019-11-15 13:14:38.635601252 +0000 +@@ -84,6 +84,9 @@ do + -l*) # LIBS is handled specially below + continue + ;; ++ -Wl,--hash-size=*) # ignore hash as gold linker can not do ++ continue ++ ;; + -Wl,-z,*) # ignore flags used to manipulate shared image + continue + ;; +@@ -127,6 +130,7 @@ do LIBS="-l$name" desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" @@ -367,7 +377,7 @@ reqs= if [ $name = $MAIN_LIBRARY ]; then -@@ -137,9 +138,11 @@ do +@@ -137,9 +141,11 @@ do desc="$desc terminal interface library" elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" @@ -379,7 +389,7 @@ desc="$desc add-on library" fi -@@ -149,6 +152,8 @@ do +@@ -149,6 +155,8 @@ do [ $NEED_TINFO != yes ] ; then [ -n "$reqs" ] && reqs="$reqs, " reqs="${reqs}${SUB_LIBRARY}${suffix}" @@ -389,7 +399,7 @@ if [ $name = $MAIN_LIBRARY ] --- misc/terminfo.src -+++ misc/terminfo.src 2019-08-12 08:17:44.604230936 +0000 ++++ misc/terminfo.src 2019-11-11 09:30:23.214670585 +0000 @@ -305,7 +305,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -773,7 +783,7 @@ s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in -+++ ncurses/Makefile.in 2019-08-12 08:07:59.763015214 +0000 ++++ ncurses/Makefile.in 2019-11-11 09:30:23.214670585 +0000 @@ -222,7 +222,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -784,7 +794,7 @@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2019-08-12 08:07:59.763015214 +0000 ++++ ncurses/curses.priv.h 2019-11-11 09:30:23.214670585 +0000 @@ -2248,6 +2248,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); @@ -795,7 +805,7 @@ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); --- ncurses/run_cmd.sh -+++ ncurses/run_cmd.sh 2019-08-12 08:07:59.763015214 +0000 ++++ ncurses/run_cmd.sh 2019-11-11 09:30:23.214670585 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -809,7 +819,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2019-08-12 08:07:59.763015214 +0000 ++++ ncurses/tinfo/MKfallback.sh 2019-11-11 09:30:23.214670585 +0000 @@ -71,6 +71,12 @@ else tmp_info= fi @@ -824,7 +834,7 @@ /* This file was generated by $0 */ --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2019-08-12 08:07:59.767015140 +0000 ++++ ncurses/tinfo/access.c 2019-11-11 09:30:23.214670585 +0000 @@ -30,6 +30,10 @@ * Author: Thomas E. Dickey * ****************************************************************************/ @@ -868,7 +878,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2019-08-12 08:07:59.767015140 +0000 ++++ ncurses/tinfo/lib_setup.c 2019-11-11 09:30:23.214670585 +0000 @@ -604,6 +604,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -880,7 +890,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2019-08-12 08:07:59.767015140 +0000 ++++ ncurses/tinfo/read_entry.c 2019-11-11 09:30:23.214670585 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -898,7 +908,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2019-08-12 08:07:59.767015140 +0000 ++++ ncurses/tinfo/read_termcap.c 2019-11-11 09:30:23.214670585 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -945,7 +955,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2019-08-12 08:07:59.767015140 +0000 ++++ progs/Makefile.in 2019-11-11 09:30:23.214670585 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -965,7 +975,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2019-08-12 08:07:59.767015140 +0000 ++++ test/test.priv.h 2019-11-11 09:30:23.214670585 +0000 @@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *, #endif diff --git a/ncurses.changes b/ncurses.changes index 1b00ebc..f718de1 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 15 13:15:43 UTC 2019 - Dr. Werner Fink + +- Do not add has size to linker flags of any pkg-config + ------------------------------------------------------------------- Mon Nov 11 09:19:43 UTC 2019 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 51e3999..97d84ad 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -62,7 +62,7 @@ Summary: Terminal control library #Git: http://ncurses.scripts.mit.edu License: MIT Group: System/Base -Url: http://www.invisible-island.net/ncurses/ncurses.html +URL: http://www.invisible-island.net/ncurses/ncurses.html Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.1.tar.gz Source1: ncurses-6.1-patches.tar.bz2 Source2: handle.linux