From f4ae3ed1c7c07d01a254f24e9ded779365e4038f543cff1e80efce5df62e97f5 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 21 Jan 2022 02:05:35 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/ncurses revision 204.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=ad19aa9580c9eec9ad0bbe87686ee379 --- ncurses-6.3-patches.tar.bz2 | 4 +- ncurses-6.3.dif | 74 ++++++++++++++++++++++++++----------- ncurses.changes | 15 ++++++++ ncurses.spec | 10 +++++ 4 files changed, 79 insertions(+), 24 deletions(-) diff --git a/ncurses-6.3-patches.tar.bz2 b/ncurses-6.3-patches.tar.bz2 index 97157fd..1e26c8f 100644 --- a/ncurses-6.3-patches.tar.bz2 +++ b/ncurses-6.3-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35b3834decf8729922ab068e11a192f83e800282afbb14926135237aeed340f7 -size 481847 +oid sha256:1a7217a096e449b2cbefaf21abc3a9930bb888b9f45253fc63817e49f7e928b3 +size 653065 diff --git a/ncurses-6.3.dif b/ncurses-6.3.dif index dfca321..3aad293 100644 --- a/ncurses-6.3.dif +++ b/ncurses-6.3.dif @@ -6,7 +6,7 @@ include/tic.h | 4 - man/man_db.renames | 2 man/ncurses.3x | 4 + - misc/gen-pkgconfig.in | 8 +++ + misc/gen-pkgconfig.in | 23 +++++++++ misc/terminfo.src | 107 +++++++++++++++++++++++++++++++++++++------- ncurses/Makefile.in | 2 ncurses/run_cmd.sh | 11 ++++ @@ -15,10 +15,10 @@ progs/Makefile.in | 4 - test/test.priv.h | 4 - test/tracemunch | 2 - 16 files changed, 190 insertions(+), 64 deletions(-) + 16 files changed, 204 insertions(+), 65 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2021-11-22 07:20:23.621974109 +0000 ++++ aclocal.m4 2022-01-17 08:50:14.497845591 +0000 @@ -658,7 +658,7 @@ AC_CHECK_SIZEOF(bool,,[ AC_CACHE_CHECK(for type of bool, cf_cv_type_of_bool,[ rm -f cf_test.out @@ -147,7 +147,7 @@ esac done --- configure -+++ configure 2021-11-22 07:20:23.625974038 +0000 ++++ configure 2022-01-17 08:50:14.501845513 +0000 @@ -5958,7 +5958,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; @@ -285,7 +285,7 @@ esac done --- include/curses.h.in -+++ include/curses.h.in 2021-11-22 07:20:23.625974038 +0000 ++++ include/curses.h.in 2022-01-17 08:50:14.501845513 +0000 @@ -97,7 +97,7 @@ #ifdef __cplusplus @@ -306,7 +306,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2021-11-22 07:20:23.625974038 +0000 ++++ include/termcap.h.in 2022-01-17 08:50:14.501845513 +0000 @@ -47,6 +47,8 @@ extern "C" { #endif /* __cplusplus */ @@ -317,7 +317,7 @@ #undef NCURSES_OSPEED --- include/tic.h -+++ include/tic.h 2021-11-22 07:20:23.625974038 +0000 ++++ include/tic.h 2022-01-17 08:50:14.501845513 +0000 @@ -237,12 +237,12 @@ struct user_table_entry */ @@ -334,7 +334,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2021-11-22 07:20:23.625974038 +0000 ++++ man/man_db.renames 2022-01-17 08:50:14.501845513 +0000 @@ -164,6 +164,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -352,7 +352,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2021-11-22 07:20:23.625974038 +0000 ++++ man/ncurses.3x 2022-01-17 08:50:14.501845513 +0000 @@ -139,6 +139,10 @@ after the shell environment variable \fB [See \fBterminfo\fP(\*n) for further details.] .SS Datatypes @@ -365,8 +365,17 @@ called \fIwindows\fP, 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 2021-11-22 07:20:23.625974038 +0000 -@@ -92,6 +92,9 @@ do ++++ misc/gen-pkgconfig.in 2022-01-18 08:31:02.490777476 +0000 +@@ -83,6 +83,8 @@ if [ "$includedir" != "/usr/include" ]; + fi + + lib_flags= ++push= ++pop= + for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ + do + case $opt in +@@ -92,12 +94,26 @@ do -specs*) # ignore linker specs-files which were used to build library continue ;; @@ -376,7 +385,24 @@ -Wl,-z,*) # ignore flags used to manipulate shared image continue ;; -@@ -186,6 +189,7 @@ do + -Wl,--dynamic-linker*) # ignore ELF interpreter + continue + ;; ++ -Wl,-Bsymbolic-functions*) # affect symbol resolution ++ continue ++ ;; ++ -Wl,-O*) # ignore linker how optimizes ++ continue ++ ;; ++ -Wl,--as-needed) ++ push="-Wl,--push-state,--as-needed " ++ pop=" -Wl,--pop-state" ++ continue ++ ;; + -L*) + lib_check=`echo "x$opt" | sed -e 's/^.-L//'` + [ -d "$lib_check" ] || continue +@@ -186,19 +202,22 @@ do LIBS="-l$name" desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" @@ -384,7 +410,11 @@ reqs= if [ $name = $MAIN_LIBRARY ]; then -@@ -196,9 +200,11 @@ do + desc="$desc library" +- [ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX" ++ [ $NEED_TINFO = yes ] && LIBS="$LIBS ${push}-l$TINFO_ARG_SUFFIX${pop}" + [ -n "@LIBS@" ] && LIBS="$LIBS @LIBS@" + elif [ $name = $SUB_LIBRARY ]; then 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}" @@ -396,7 +426,7 @@ desc="$desc add-on library" fi -@@ -208,6 +214,8 @@ do +@@ -208,6 +227,8 @@ do [ $NEED_TINFO != yes ] ; then [ -n "$reqs" ] && reqs="$reqs, " reqs="${reqs}${SUB_LIBRARY}${suffix}" @@ -406,7 +436,7 @@ if [ $name = $MAIN_LIBRARY ] --- misc/terminfo.src -+++ misc/terminfo.src 2021-11-22 07:20:23.629973966 +0000 ++++ misc/terminfo.src 2022-01-17 08:50:14.505845437 +0000 @@ -305,7 +305,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -655,7 +685,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 2021-11-22 07:20:23.629973966 +0000 ++++ ncurses/Makefile.in 2022-01-17 08:50:14.505845437 +0000 @@ -242,7 +242,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -666,7 +696,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/run_cmd.sh -+++ ncurses/run_cmd.sh 2021-11-22 07:20:23.629973966 +0000 ++++ ncurses/run_cmd.sh 2022-01-17 08:50:14.505845437 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -680,7 +710,7 @@ + +exec /bin/sh -e ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2021-11-22 07:20:23.629973966 +0000 ++++ ncurses/tinfo/MKfallback.sh 2022-01-17 08:50:14.505845437 +0000 @@ -66,14 +66,22 @@ if test $# != 0 ; then TERMINFO=`pwd`/$tmp_info export TERMINFO @@ -724,7 +754,7 @@ done --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2021-11-22 07:20:23.629973966 +0000 ++++ ncurses/tinfo/lib_setup.c 2022-01-17 08:50:14.505845437 +0000 @@ -613,6 +613,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -736,7 +766,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- progs/Makefile.in -+++ progs/Makefile.in 2021-11-22 07:20:23.629973966 +0000 ++++ progs/Makefile.in 2022-01-17 08:50:14.505845437 +0000 @@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE @@ -756,7 +786,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2021-11-22 07:20:23.629973966 +0000 ++++ test/test.priv.h 2022-01-17 08:50:14.505845437 +0000 @@ -1037,12 +1037,12 @@ extern char *_nc_strstr(const char *, co #endif @@ -773,7 +803,7 @@ #define CANCELLED_STRING (char *)(-1) --- test/tracemunch -+++ test/tracemunch 2021-11-22 07:20:23.629973966 +0000 ++++ test/tracemunch 2022-01-17 08:50:14.505845437 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl diff --git a/ncurses.changes b/ncurses.changes index fdc967c..f91ba6f 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jan 18 08:59:41 UTC 2022 - Dr. Werner Fink + +- Fix boo#1194805 by skipping linker optimizations from final + pkgconfig files as well as ncurses-config + +------------------------------------------------------------------- +Mon Jan 17 08:49:49 UTC 2022 - Dr. Werner Fink + +- Add ncurses patch 20220115 + + improve checks for valid mouse events when an intermediate mouse + state is not part of the mousemask specified by the caller (report by + Anton Vidovic, cf: 20111022). + + use newer version 1.36 of gnathtml for generating Ada html files. + ------------------------------------------------------------------- Mon Jan 10 09:08:02 UTC 2022 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 0d065d0..344a53e 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -24,6 +24,7 @@ %endif %bcond_with memleakck %bcond_without onlytinfo +%bcond_with ada %bcond_with libbsd %bcond_with usepcre2 @@ -42,6 +43,11 @@ Name: ncurses BuildRequires: db-devel %endif BuildRequires: expect +%if %{with ada} +# Currently we're missing gprbuild and gprconfig +BuildRequires: gcc-ada +BuildRequires: m4 +%endif BuildRequires: gcc-c++ BuildRequires: pkg-config %if %{with libbsd} @@ -499,7 +505,11 @@ mv tack-* tack > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! %configure \ +%if %{with ada} + --with-ada \ +%else --without-ada \ +%endif --without-debug \ --without-profile \ --without-manpage-tbl \