Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2014-08-29 17:42:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncurses" Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2014-08-20 10:50:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2014-08-29 17:42:15.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Aug 25 13:48:27 UTC 2014 - werner@suse.de + +- Make pkgconfig files work for all current versions that is + abi 5, abi wide 5, abi 6, and abi wide 6 +- Change patch ncurses-5.9.dif to enable gen-pkgconfig to do this + +------------------------------------------------------------------- +Mon Aug 25 09:50:03 UTC 2014 - werner@suse.de + +- Add ncurses patch 20140823 + + fix special case where double-width character overwrites a single- + width character in the first column (report by Egmont Koblinger, + cf: 20050813). + +------------------------------------------------------------------- +Fri Aug 22 13:34:00 UTC 2014 - mmarek@suse.cz + +- Install pkg-config files into %_libdir + +------------------------------------------------------------------- +Fri Aug 22 10:59:18 UTC 2014 - mmarek@suse.cz + +- Install pkg-config files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.wRu0zD/_old 2014-08-29 17:42:17.000000000 +0200 +++ /var/tmp/diff_new_pack.wRu0zD/_new 2014-08-29 17:42:17.000000000 +0200 @@ -19,6 +19,7 @@ Name: ncurses #!BuildIgnore: terminfo BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRequires: screen %if 0%{?suse_version} > 1130 BuildRequires: gpm-devel @@ -452,7 +453,9 @@ --disable-widec \ --disable-tic-depends \ --with-cxx-shared \ - --with-ticlib=tic + --with-ticlib=tic \ + --enable-pc-files \ + --with-pkg-config-libdir=%{_libdir}/pkgconfig kill $pid # # The configure line @@ -509,7 +512,13 @@ # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} +%if %abi >= 6 + sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config +%else sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config +%endif + mkdir pc + mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ # # Check for tack program on base of above ncurses # @@ -537,6 +546,7 @@ cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} + sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncurses@" misc/gen-pkgconfig # must not use %jobs here (would lead to: ln: ncurses.h already exists) 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/ @@ -544,6 +554,13 @@ pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd + for pc in %{root}%{_libdir}/pkgconfig/*.pc + do + test -e "$pc" || break + base=${pc%%.pc} + base=${base##*/} + mv -f $pc pc/${base}6.pc + done %endif make clean # @@ -565,10 +582,19 @@ make %{?_smp_mflags} # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir} +%if %abi >= 6 + sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config + pushd man + sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 + popd +%else 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 +%endif + rm -f %{root}%{_libdir}/pkgconfig/ti*.pc + mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ %if %abi < 6 make clean # @@ -582,12 +608,21 @@ cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} + sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncursesw@" misc/gen-pkgconfig # must not use %jobs here (would lead to: ln: ncurses.h already exists) 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 + rm -f %{root}%{_libdir}/pkgconfig/ti*.pc + for pc in %{root}%{_libdir}/pkgconfig/*.pc + do + test -e "$pc" || break + base=${pc%%.pc} + base=${base##*/} + mv -f $pc pc/${base}6.pc + done %endif %install @@ -767,6 +802,7 @@ grep -v -F -x -f default.list \ > extension.list rm -f %{buildroot}%{_prefix}/lib/terminfo + mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ %if %abi < 6 %post -n libncurses5 -p /sbin/ldconfig @@ -836,6 +872,7 @@ %{_libdir}/lib*.so %{_libdir}/ncurses6/lib*.a %{_libdir}/ncurses6/lib*.so +%{_libdir}/pkgconfig/*.pc %doc %{_mandir}/man1/*-config.1.gz %doc %{_mandir}/man1/captoinfo.1.gz %doc %{_mandir}/man1/infocmp.1.gz ++++++ ncurses-5.9-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-5.9-20140823.patch new/patches/ncurses-5.9-20140823.patch --- old/patches/ncurses-5.9-20140823.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-5.9-20140823.patch 2014-08-25 11:48:39.000000000 +0200 @@ -0,0 +1,226 @@ +# ncurses 5.9 - patch - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 5.9 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 5.9 are in the subdirectory +# ftp://invisible-island.net/ncurses/5.9 +# +# ------------------------------------------------------------------------------ +# ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20140823.patch.gz +# patch by Thomas E. Dickey <dickey@invisible-island.net> +# created Sun Aug 24 00:42:29 UTC 2014 +# ------------------------------------------------------------------------------ +# NEWS | 7 ++++++- +# dist.mk | 4 ++-- +# ncurses/tty/tty_update.c | 28 ++++++++++++++++++++-------- +# 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 | 2 +- +# 9 files changed, 38 insertions(+), 21 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.2260 +--- ncurses-5.9-20140816+/NEWS 2014-08-16 23:28:26.000000000 +0000 ++++ ncurses-5.9-20140823/NEWS 2014-08-23 19:28:39.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.2260 2014/08/16 23:28:26 tom Exp $ ++-- $Id: NEWS,v 1.2262 2014/08/23 19:28:39 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20140823 ++ + fix special case where double-width character overwrites a single- ++ width character in the first column (report by Egmont Koblinger, ++ cf: 20050813). ++ + 20140816 + + fix colors in ncurses 'b' test which did not work after changing + it to put the test-strings in subwindows (cf: 20140705). +Index: dist.mk +Prereq: 1.1001 +--- ncurses-5.9-20140816+/dist.mk 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/dist.mk 2014-08-23 16:35:54.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1001 2014/08/14 07:59:48 tom Exp $ ++# $Id: dist.mk,v 1.1002 2014/08/23 16:35:54 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 = 5 + NCURSES_MINOR = 9 +-NCURSES_PATCH = 20140816 ++NCURSES_PATCH = 20140823 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/tty/tty_update.c +Prereq: 1.279 +--- ncurses-5.9-20140816+/ncurses/tty/tty_update.c 2014-07-12 23:16:30.000000000 +0000 ++++ ncurses-5.9-20140823/ncurses/tty/tty_update.c 2014-08-23 19:25:18.000000000 +0000 +@@ -82,7 +82,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: tty_update.c,v 1.279 2014/07/12 23:16:30 tom Exp $") ++MODULE_ID("$Id: tty_update.c,v 1.280 2014/08/23 19:25:18 tom Exp $") + + /* + * This define controls the line-breakout optimization. Every once in a +@@ -628,6 +628,7 @@ + int first, int last) + { + int i, j, same; ++ int rc; + + TR(TRACE_CHARPUT, ("PutRange(%p, %p, %p, %d, %d, %d)", + (void *) SP_PARM, +@@ -655,9 +656,11 @@ + * Always return 1 for the next GoTo() after a PutRange() if we found + * identical characters at end of interval + */ +- return (same == 0 ? i : 1); ++ rc = (same == 0 ? i : 1); ++ } else { ++ rc = EmitRange(NCURSES_SP_ARGx ntext + first, last - first + 1); + } +- return EmitRange(NCURSES_SP_ARGx ntext + first, last - first + 1); ++ return rc; + } + + /* leave unbracketed here so 'indent' works */ +@@ -1492,9 +1495,17 @@ + if (oLastChar < nLastChar) { + int m = max(nLastNonblank, oLastNonblank); + #if USE_WIDEC_SUPPORT +- while (isWidecExt(newLine[n + 1]) && n) { +- --n; +- --oLastChar; ++ if (n) { ++ while (isWidecExt(newLine[n + 1]) && n) { ++ --n; ++ --oLastChar; /* increase cost */ ++ } ++ } else if (n >= firstChar && ++ isWidecBase(newLine[n])) { ++ while (isWidecExt(newLine[n + 1])) { ++ ++n; ++ ++oLastChar; /* decrease cost */ ++ } + } + #endif + GoTo(NCURSES_SP_ARGx lineno, n + 1); +@@ -1514,8 +1525,9 @@ + if (DelCharCost(SP_PARM, oLastChar - nLastChar) + > SP_PARM->_el_cost + nLastNonblank - (n + 1)) { + if (PutRange(NCURSES_SP_ARGx oldLine, newLine, lineno, +- n + 1, nLastNonblank)) +- GoTo(NCURSES_SP_ARGx lineno, nLastNonblank + 1); ++ n + 1, nLastNonblank)) { ++ GoTo(NCURSES_SP_ARGx lineno, nLastNonblank + 1); ++ } + ClrToEOL(NCURSES_SP_ARGx blank, FALSE); + } else { + /* +Index: package/debian-mingw/changelog +--- ncurses-5.9-20140816+/package/debian-mingw/changelog 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/debian-mingw/changelog 2014-08-23 16:35:54.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140816) unstable; urgency=low ++ncurses6 (5.9-20140823) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 14 Aug 2014 03:59:48 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Aug 2014 12:35:54 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-5.9-20140816+/package/debian-mingw64/changelog 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/debian-mingw64/changelog 2014-08-23 16:35:54.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140816) unstable; urgency=low ++ncurses6 (5.9-20140823) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 14 Aug 2014 03:59:48 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Aug 2014 12:35:54 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-5.9-20140816+/package/debian/changelog 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/debian/changelog 2014-08-23 16:35:54.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140816) unstable; urgency=low ++ncurses6 (5.9-20140823) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 14 Aug 2014 03:59:48 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Aug 2014 12:35:54 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.56 +--- ncurses-5.9-20140816+/package/mingw-ncurses.nsi 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/mingw-ncurses.nsi 2014-08-23 16:35:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.56 2014/08/14 07:59:48 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.57 2014/08/23 16:35:54 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "5" + !define VERSION_MINOR "9" + !define VERSION_YYYY "2014" +-!define VERSION_MMDD "0816" ++!define VERSION_MMDD "0823" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-5.9-20140816+/package/mingw-ncurses.spec 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/mingw-ncurses.spec 2014-08-23 16:35:54.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 5.9 +-Release: 20140816 ++Release: 20140823 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-5.9-20140816+/package/ncurses.spec 2014-08-14 07:59:48.000000000 +0000 ++++ ncurses-5.9-20140823/package/ncurses.spec 2014-08-23 16:35:54.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 5.9 +-Release: 20140816 ++Release: 20140823 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz ++++++ ncurses-5.9.dif ++++++ --- /var/tmp/diff_new_pack.wRu0zD/_old 2014-08-29 17:42:21.000000000 +0200 +++ /var/tmp/diff_new_pack.wRu0zD/_new 2014-08-29 17:42:21.000000000 +0200 @@ -338,6 +338,55 @@ The \fBncurses\fR library permits manipulation of data structures, 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 2014-08-25 11:52:06.262235364 +0000 +@@ -69,7 +69,7 @@ else + CFLAGS="-I\${includedir}" + fi + +-if test "$libdir" = "/usr/lib" ; then ++if test "$libdir" = "/usr/lib" -o "$libdir" = "/usr/lib64" ; then + LDFLAGS= + else + LDFLAGS="-L\${libdir}" +@@ -80,6 +80,7 @@ do + name="${name}" + + desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" ++ deps= + reqs= + + if test $name = $MAIN_LIBRARY ; then +@@ -88,9 +89,11 @@ do + desc="$desc terminal interface library" + elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then + reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY" ++ deps="-l$PANEL_LIBRARY -l$MENU_LIBRARY -l$FORM_LIBRARY -l$MAIN_LIBRARY" + desc="$desc add-on library" + else + reqs="$MAIN_LIBRARY" ++ deps="-l$MAIN_LIBRARY" + desc="$desc add-on library" + fi + +@@ -98,6 +101,8 @@ do + if test $name != $TINFO_NAME ; then + test -n "$reqs" && reqs="$reqs, " + reqs="${reqs}${SUB_LIBRARY}" ++ test -n "$deps" && deps="$deps " ++ deps="${deps}-l${SUB_LIBRARY}" + fi + fi + +@@ -115,7 +120,7 @@ Description: $desc + Version: \${version} + URL: http://invisible-island.net/ncurses + Requires.private: $reqs +-Libs: $LDFLAGS -l$name ++Libs: $LDFLAGS -l$name $deps + Libs.private: @LIBS@ + Cflags: $CFLAGS + EOF --- misc/ncurses-config.in +++ misc/ncurses-config.in 2011-11-17 12:46:49.000000000 +0000 @@ -98,7 +98,7 @@ while test $# -gt 0; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org