diff --git a/ncurses-5.9-avoid-line-markers.dif b/ncurses-5.9-avoid-line-markers.dif new file mode 100644 index 0000000..8cea752 --- /dev/null +++ b/ncurses-5.9-avoid-line-markers.dif @@ -0,0 +1,11 @@ +--- ncurses/Makefile.in.orig 2015-01-21 13:27:02.427199242 +0100 ++++ ncurses/Makefile.in 2015-01-21 13:27:11.946311063 +0100 +@@ -219,7 +219,7 @@ + sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ + + ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h +- sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ ++ sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@ + + init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list + ./make_keys$(BUILD_EXEEXT) keys.list > $@ diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index 74465b4..1dcc52c 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -15,11 +15,11 @@ AC_ARG_ENABLE(database, --- configure +++ configure 2013-09-30 09:17:52.000000000 +0000 -@@ -6526,6 +6526,7 @@ else +@@ -6799,6 +6799,7 @@ else fi; - echo "$as_me:6797: result: $with_overwrite" >&5 + echo "$as_me:6892: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6800: checking if external terminfo-database is used" >&5 + echo "$as_me:6895: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index 1b87813..96a4230 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ab879122039f7b1528ddf86d38f435134146022e85633c99c2e8ab39cf9c83a -size 4152720 +oid sha256:6567b617700c9c45af605504142b45f6988e89f4621fae055021c53de32cc7a5 +size 4297826 diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index a21093f..1c3f9ba 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -990,3 +990,23 @@ #define CANCELLED_NUMERIC (-2) #define CANCELLED_STRING (char *)(-1) +--- package/ncursest.map ++++ package/ncursest.map 2015-01-21 14:41:45.809518532 +0000 +@@ -345,6 +345,7 @@ NCURSES_TINFO_5.7.20081102 { + _nc_screen_of; + _nc_set_no_padding; + _nc_set_tputs_trace; ++ _nc_sigprocmask; + _nc_stdscr; + _nc_strcodes; + _nc_strfnames; +--- package/ncursestw.map ++++ package/ncursestw.map 2015-01-21 14:42:04.281518331 +0000 +@@ -346,6 +346,7 @@ NCURSES_TINFO_5.7.20081102 { + _nc_screen_of; + _nc_set_no_padding; + _nc_set_tputs_trace; ++ _nc_sigprocmask; + _nc_stdscr; + _nc_strcodes; + _nc_strfnames; diff --git a/ncurses.changes b/ncurses.changes index 6886b49..91d547b 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,77 @@ +------------------------------------------------------------------- +Mon Jan 26 09:44:16 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150124 + + add configure check to determine if "local: _*;" can be used in the + ".map" files to selectively omit symbols beginning with "_". On at + least recent FreeBSD, the wildcard applies to all "_" symbols. + + remove obsolete/conflicting rule for ncurses.map from + ncurses/Makefile.in (cf: 20130706). +- Apply symbol versioning only for SUSE version greater that 1320 + +------------------------------------------------------------------- +Wed Jan 21 15:58:08 UTC 2015 - werner@suse.de + +- Now with symbol version control + +------------------------------------------------------------------- +Wed Jan 21 13:24:17 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150117 + + improve description in INSTALL of the --with-versioned-syms option. + + add combination of --with-hashed-db and --with-ticlib to + configurations for ".map" files (report by Werner Fink). + +------------------------------------------------------------------- +Wed Jan 21 12:22:05 UTC 2015 - rguenther@suse.com + +- Add ncurses-5.9-avoid-line-markers.dif to pass -P to the preprocessor + when generating lib_gen.c to avoid breaking the parsing with AWK + of the preprocessor output of GCC 4.9 and up. + +------------------------------------------------------------------- +Mon Jan 12 08:49:11 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150110 + + add a step to generating ".map" files, to declare any remaining + symbols beginning with "_" as local, at the last version node. + + improve configure checks for pkg-config, addressing a variant found + with FreeBSD ports. + + modify win_driver.c to provide characters for special keys, like + ansi.sys, when keypad mode is off, rather than returning nothing at + all (discussion with Eli Zaretskii). + + add "broken_linker" and "hashed-db" configure options to combinations + use for generating the ".map" and ".sym" files. + + avoid using "ld" directly when creating shared library, to simplify + cross-compiles. Also drop "-Bsharable" option from shared-library + rules for FreeBSD and DragonFly (FreeBSD #196592). + + fix a memory leak in form library Free_RegularExpression_Type() + (report by Pavel Balaev). + +------------------------------------------------------------------- +Wed Jan 7 14:39:03 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150103 + + modify_nc_flush() to retry if interrupted (patch by Stian Skjelstad). + + change map files to make _nc_freeall a global, since it may be used + via the Ada95 binding when checking for memory leaks. + + improve sed script used in 20141220 to account for wide-, threaded- + variations in ABI 6. +- Add ncurses patch 20141227 + + regenerate ".map" files, using step overlooked in 20141213 to use + the same patch-dates across each file to match ncurses.map (report by + Sven Joachim). +- Add ncurses patch 20141221 + + fix an incorrect variable assignment in 20141220 changes (report by + Sven Joachim). +- Add ncurses patch 20141220 + + updated Ada95/configure with macro changes from 20141213 + + tie configure options --with-abi-version and --with-versioned-syms + together, so that ABI 6 libraries have distinct symbol versions from + the ABI 5 libraries. + + replace obsolete/nonworking link to man2html with current one, + regenerate html-manpages. + ------------------------------------------------------------------- Tue Dec 16 11:14:35 UTC 2014 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index a53dfb8..ba45a4a 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,18 @@ # +%bcond_with hasheddb +%if 0%{?suse_version} > 1320 +%bcond_without symversion +%else +%bcond_with symversion +%endif + Name: ncurses #!BuildIgnore: terminfo +%if %{with hasheddb} +BuildRequires: db-devel +%endif BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: screen @@ -53,6 +63,7 @@ Patch1: ncurses-5.9-ibm327x.dif Patch3: ncurses-5.9-overwrite.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif +Patch6: ncurses-5.9-avoid-line-markers.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -273,6 +284,7 @@ mv tack-* tack %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .lc %patch -P 0 -p0 -b .p0 +%patch -P 6 -p0 -b .p6 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh rm -vf tar-copy.sh @@ -379,10 +391,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # No --enable-xmc-glitch because this seems to break yast2 # on console/konsole (no magic cookie support on those?) # - # No --with-termlib=tinfo because libncurses depend on - # libtinfo (is linked with) and therefore there is no - # advantage about splitting of a libtinfo (IMHO). - # %if 0%{?suse_version} > 1310 SO=$(rpm -ql gpm-devel|grep %{_libdir}) SO=%{_libdir}/$(readlink $SO) @@ -450,13 +458,23 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --mandir=%{_mandir} \ --includedir=%{_incdir} \ "${WITHCHTYPE}" \ - --disable-widec \ --disable-tic-depends \ --with-cxx-shared \ --with-ticlib=tic \ --with-pc-suffix \ --enable-pc-files \ +%if %{with symversion} +%if %abi >= 6 + --with-versioned-syms=${PWD}/package/ncursest.map \ +%else + --with-versioned-syms=${PWD}/package/ncurses.map \ +%endif +%endif +%if %{with hasheddb} + --with-hashed-db \ +%endif --with-pkg-config-libdir=%{_libdir}/pkgconfig + sleep 1 kill $pid # # The configure line @@ -541,7 +559,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --disable-widec \ + --disable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursest.map \ +%endif + --without-progs + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c @@ -572,10 +599,25 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! %if %abi >= 6 - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs -%else - eval screen -L -D -m ./${c#*./} --disable-ext-mouse --enable-widec --disable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --enable-widec \ + --enable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursestw.map \ %endif + --without-progs +%else + eval screen -L -D -m ./${c#*./} --disable-ext-mouse \ + --enable-widec \ + --disable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursesw.map \ +%endif + --without-progs +%endif + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c @@ -603,7 +645,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --enable-widec \ + --enable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursestw.map \ +%endif + --without-progs + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c