From f7ab24f5f297de45feae4c48b474a74d45339f5bd3a757afaca7b672590b805c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 5 Aug 2013 14:22:20 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=121 --- ncurses-5.9-overwrite.dif | 8 ++-- ncurses-5.9-patches.tar.bz2 | 4 +- ncurses.changes | 92 +++++++++++++++++++++++++++++++++++++ ncurses.spec | 28 ++++------- 4 files changed, 108 insertions(+), 24 deletions(-) diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index e84cabd..8179b37 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -1,6 +1,6 @@ --- configure.in +++ configure.in 2012-01-30 17:31:47.000000000 +0100 -@@ -426,6 +426,7 @@ AC_ARG_ENABLE(overwrite, +@@ -436,6 +436,7 @@ AC_ARG_ENABLE(overwrite, [with_overwrite=$enableval], [if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi]) AC_MSG_RESULT($with_overwrite) @@ -10,11 +10,11 @@ AC_ARG_ENABLE(database, --- configure +++ configure 2012-01-30 17:42:40.000000000 +0100 -@@ -6242,6 +6242,7 @@ else +@@ -6345,6 +6345,7 @@ else fi; - echo "$as_me:6243: result: $with_overwrite" >&5 + echo "$as_me:6346: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6246: checking if external terminfo-database is used" >&5 + echo "$as_me:6349: 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 664d439..3d465cd 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:8b2a57b4ed13371b6e6cc9c8def9b3070ae594a266d8d8461751ac6aba765921 -size 2415360 +oid sha256:66f98a69fecacf6244e5d60a2d0f2cc6c8743e1ca6beb3c923d9a66742d82d7a +size 2792065 diff --git a/ncurses.changes b/ncurses.changes index ceae04c..ecd7156 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,95 @@ +------------------------------------------------------------------- +Mon Aug 5 14:07:53 UTC 2013 - werner@suse.de + +- Add ncurses patch 20130805 + + minor fixes to the --disable-overwrite logic, to ensure that the + configured $(includedir) is not cancelled by the mingwxx-filesystem + rpm macros. + + add --disable-db-install configure option, to simplify building + cross-compile support packages. +- Add ncurses patch 20130727 + + improve configure macros from ongoing work on cdk, dialog, xterm: + + CF_ADD_LIB_AFTER - fix a problem with -Wl options + + CF_RPATH_HACK - add missing result-message + + CF_SHARED_OPTS - modify to use $rel_builddir in cygwin and mingw + dll symbols (which can be overridden) rather than explicit "../". + + CF_SHARED_OPTS - modify NetBSD and DragonFly symbols to use ${CC} + rather than ${LD} to improve rpath support. + + CF_SHARED_OPTS - add a symbol to denote the temporary files that + are created by the macro, to simplify clean-rules. + + CF_X_ATHENA - trim extra libraries to work with -Wl,--as-needed + + fix a regression in hashed-database support for NetBSD, which uses + the key-size differently from other implementations (cf: 20121229). +- Add ncurses patch 20130720 + + further improvements for setupterm manpage, clarifying the + initialization of cur_term. +- Add ncurses patch 20130713 + + improve manpages for initscr and setupterm. + + minor compiler-warning fixes +- Add ncurses patch 20130706 + + add fallback defs for and (cf: 20120225). + + add check for size of wchar_t, use that to suppress a chunk of + wcwidth.h in MinGW port. + + quiet linker warnings for MinGW cross-compile with dll's using the + --enable-auto-import flag. + + add ncurses.map rule to ncurses/Makefile to help diagnose symbol + table issues. +- Add ncurses patch 20130622 + + modify the clear program to take into account the E3 extended + capability to clear the terminal's scrollback buffer (patch by + Miroslav Lichvar, Redhat #815790). + + clarify in resizeterm manpage that LINES and COLS are updated. + + updated ansi example in terminfo.tail, correct misordered example + of sgr. + + fix other doclifter warnings for manpages + + remove unnecessary ".ta" in terminfo.tail, add missing ".fi" + (patch by Eric Raymond). +- Add ncurses patch 20130615 + + minor changes to some configure macros to make them more reusable. + + fixes for tabs program (prompted by report by Nick Andrik): + + corrected logic in command-line parsing of -a and -c predefined + tab-lists options. + + allow "-0" and "-8" options to be combined with others, e.g.,"-0d". + + make warning messages more consistent with the other utilities by + not printing the full pathname of the program. + + add -V option for consistency with other utilities. + + fix off-by-one in columns for tabs program when processing an option + such as "-5" (patch by Nick Andrik). +- Add ncurses patch 20130608 + + add to test/demo_forms.c examples of using the menu-hooks as well + as showing how the menu item user-data can be used to pass a callback + function pointer. + + add test/dots_termcap.c + + remove setupterm call from test/demo_termcap.c + + build-fix if --disable-ext-funcs configure option is used. + + modified test/edit_field.c and test/demo_forms.c to move the lengths + into a user-data structure, keeping the original string for later + expansion to free-format input/out demo. + + modified test/demo_forms.c to load data from file. + + added note to clarify Terminal.app's non-emulation of the various + terminal types listed in the preferences dialog -TD + + fix regression in error-reporting in lib_setup.c (Debian #711134, + cf: 20121117). + + build-fix for a case where --enable-broken_linker and + --enable-reentrant options are combined (report by George R Goffe). +- Add ncurses patch 20130525 + + modify mvcur() to distinguish between internal use by the ncurses + library, and external callers, preventing it from reading the content + of the screen which is only nonblank when curses calls have updated + it. This makes test/dots_mvcur.c avoid painting colored cells in + the left margin of the display. + + minor fix to test/dots_mvcur.c + + move configured symbols USE_DATABASE and USE_TERMCAP to term.h as + NCURSES_USE_DATABASE and NCURSES_USE_TERMCAP to allow consistent + use of these symbols in term_entry.h +- Add ncurses patch 20130518 + + corrected ifdefs in test/testcurs.c to allow comparison of mouse + interface versus pdcurses (cf: 20130316). + + add pow() to configure-check for math library, needed since + 20121208 for test/hanoi (Debian #708056). + + regenerated html manpages. + + update doctype used for html documentation. + ------------------------------------------------------------------- Fri Jun 21 13:53:22 UTC 2013 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 9c7e371..a9558b1 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -489,12 +489,10 @@ rm -vf mk-dlls.sh cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} - lib=%{_libdir} - inc=%{_incdir}/ncurses # must not use %jobs here (would lead to: ln: ncurses.h already exists) - make install DESTDIR=%{root} includedir=${inc} libdir=${lib} - ln -sf ${inc##*/}/{curses,ncurses,term,termcap}.h %{root}${inc%%/*}/ - sh %{S:6} --cflags "-I${inc}" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config + make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} + ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} + sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config # # Check for tack program on base of above ncurses # @@ -522,12 +520,10 @@ rm -vf mk-dlls.sh cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} - lib=%{_libdir}/ncurses6 - inc=%{_incdir}/ncurses6/ncurses # must not use %jobs here (would lead to: ln: ncurses.h already exists) - make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} - ln -sf ${inc##*/}/{curses,ncurses,term}.h %{root}${inc%%/*}/ - sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config + make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncurses libdir=%{_libdir}/ncurses6 + ln -sf %{_incdir}/ncurses6/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses6/ + sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncurses -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd @@ -550,11 +546,9 @@ rm -vf mk-dlls.sh cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} - lib=%{_libdir} - inc=%{_incdir}/ncursesw # must not use %jobs here (would lead to: ln: ncurses.h already exists) - make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} - sh %{S:6} --cflags "-I${inc}" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config + make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir} + sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 popd @@ -571,11 +565,9 @@ rm -vf mk-dlls.sh cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} - lib=%{_libdir}/ncurses6 - inc=%{_incdir}/ncurses6/ncursesw # must not use %jobs here (would lead to: ln: ncurses.h already exists) - make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} - sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config + make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncursesw libdir=%{_libdir}/ncurses6 + sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncursesw -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 popd