rpms/ncurses/devel ncurses-5.5-20061209-config.patch, NONE, 1.1 ncurses-5.5-20061209-largetables.patch, NONE, 1.1 ncurses-5.5-20061209-tgetent.patch, NONE, 1.1 ncurses-5.5-20061209-xterm.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 ncurses.spec, 1.66, 1.67 sources, 1.18, 1.19 ncurses-5.4-xterm-kbs.patch, 1.2, NONE ncurses-5.5-20060715-cflags.patch, 1.1, NONE ncurses-5.5-20060715-tgetent.patch, 1.1, NONE ncurses-5.5-20060715-tgetstr.patch, 1.1, NONE ncurses-linux, 1.1, NONE ncurses-linux-m, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 11 15:12:11 UTC 2006
Author: mlichvar
Update of /cvs/dist/rpms/ncurses/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12167
Modified Files:
.cvsignore ncurses.spec sources
Added Files:
ncurses-5.5-20061209-config.patch
ncurses-5.5-20061209-largetables.patch
ncurses-5.5-20061209-tgetent.patch
ncurses-5.5-20061209-xterm.patch
Removed Files:
ncurses-5.4-xterm-kbs.patch ncurses-5.5-20060715-cflags.patch
ncurses-5.5-20060715-tgetent.patch
ncurses-5.5-20060715-tgetstr.patch ncurses-linux
ncurses-linux-m
Log Message:
- update to patch 20061209
- strip large tables from shared libraries, reduce number of relocations
- package utils linked with libncurses instead of libncursesw
- package only wide-character headers
ncurses-5.5-20061209-config.patch:
ncurses-config.in | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE ncurses-5.5-20061209-config.patch ---
--- ncurses-5.5/misc/ncurses-config.in.config 2006-12-11 13:35:54.000000000 +0100
+++ ncurses-5.5/misc/ncurses-config.in 2006-12-11 13:40:02.000000000 +0100
@@ -34,7 +34,6 @@
exec_prefix="@exec_prefix@"
bindir="@bindir@"
-libdir="@libdir@"
datadir="@datadir@"
mandir="@mandir@"
@@ -82,7 +81,7 @@
;;
--libs)
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- -L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+ @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
ENDECHO
;;
# identification
@@ -103,7 +102,6 @@
echo "${datadir}"
;;
--libdir)
- echo "${libdir}"
;;
--mandir)
echo "${mandir}"
ncurses-5.5-20061209-largetables.patch:
include/tic.h | 2 +-
ncurses/Makefile.in | 2 +-
ncurses/base/MKkeyname.awk | 12 ++++++++----
ncurses/tinfo/MKcaptab.awk | 2 ++
ncurses/tinfo/comp_parse.c | 4 ++++
ncurses/tinfo/parse_entry.c | 4 ++++
progs/Makefile.in | 2 +-
tack/Makefile.in | 2 +-
8 files changed, 22 insertions(+), 8 deletions(-)
--- NEW FILE ncurses-5.5-20061209-largetables.patch ---
--- ncurses-5.5/include/tic.h.largetables 2006-12-11 10:45:29.000000000 +0100
+++ ncurses-5.5/include/tic.h 2006-12-11 12:57:15.000000000 +0100
@@ -167,7 +167,7 @@
* List of keynames with their corresponding code.
*/
struct kn {
- const char *name;
+ int offset;
int code;
};
--- ncurses-5.5/ncurses/base/MKkeyname.awk.largetables 2006-12-11 10:45:29.000000000 +0100
+++ ncurses-5.5/ncurses/base/MKkeyname.awk 2006-12-11 13:04:16.000000000 +0100
@@ -37,11 +37,15 @@
}
/^[^#]/ {
- printf "\t{ \"%s\", %s },\n", $1, $1;
+ printf "\t{ %d, %s },\n", offset, $1
+ offset += length($1) + 1
+ names = names"\n\t\""$1"\\0\""
}
END {
- printf "\t{ 0, 0 }};\n"
+ printf "\t{ -1, 0 }};\n"
+ print ""
+ print "static const char key_names[] = "names";"
print ""
print "#define SIZEOF_TABLE 256"
print "static char **keyname_table;"
@@ -56,9 +60,9 @@
print " if (c == -1) {"
print " result = \"-1\";"
print " } else {"
- print " for (i = 0; _nc_key_names[i].name != 0; i++) {"
+ print " for (i = 0; _nc_key_names[i].offset != -1; i++) {"
print " if (_nc_key_names[i].code == c) {"
- print " result = (NCURSES_CONST char *)_nc_key_names[i].name;"
+ print " result = (NCURSES_CONST char *)key_names + _nc_key_names[i].offset;"
print " break;"
print " }"
print " }"
--- ncurses-5.5/progs/Makefile.in.largetables 2006-12-11 13:06:33.000000000 +0100
+++ ncurses-5.5/progs/Makefile.in 2006-12-11 13:06:33.000000000 +0100
@@ -96,7 +96,7 @@
LD = @LD@
LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
LDFLAGS = @EXTRA_LDFLAGS@ \
- @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
+ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ ../lib/libncurses*.a
LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
--- ncurses-5.5/ncurses/Makefile.in.largetables 2006-12-11 13:06:33.000000000 +0100
+++ ncurses-5.5/ncurses/Makefile.in 2006-12-11 13:06:33.000000000 +0100
@@ -108,7 +108,7 @@
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
-CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@
+CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@ -DOMIT_LARGETABLES
CFLAGS_DEFAULT = $(CFLAGS_ at DFT_UPR_MODEL@)
--- ncurses-5.5/ncurses/tinfo/comp_parse.c.largetables 2006-12-11 13:06:32.000000000 +0100
+++ ncurses-5.5/ncurses/tinfo/comp_parse.c 2006-12-11 13:06:33.000000000 +0100
@@ -86,6 +86,7 @@
NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
+#ifndef OMIT_LARGETABLES
static void
enqueue(ENTRY * ep)
/* add an entry to the in-core list */
@@ -102,6 +103,7 @@
if (newp->last)
newp->last->next = newp;
}
+#endif
NCURSES_EXPORT(void)
_nc_free_entries(ENTRY * headp)
@@ -187,6 +189,7 @@
*
****************************************************************************/
+#ifndef OMIT_LARGETABLES
NCURSES_EXPORT(void)
_nc_read_entry_source(FILE *fp, char *buf,
int literal, bool silent,
@@ -245,6 +248,7 @@
_nc_suppress_warnings = oldsuppress;
}
+#endif
NCURSES_EXPORT(int)
_nc_resolve_uses2(bool fullresolve, bool literal)
--- ncurses-5.5/ncurses/tinfo/parse_entry.c.largetables 2006-12-11 13:06:32.000000000 +0100
+++ ncurses-5.5/ncurses/tinfo/parse_entry.c 2006-12-11 13:06:33.000000000 +0100
@@ -57,6 +57,7 @@
#include <parametrized.h>
#endif
+#ifndef OMIT_LARGETABLES
static void postprocess_termcap(TERMTYPE *, bool);
static void postprocess_terminfo(TERMTYPE *);
static struct name_table_entry const *lookup_fullname(const char *name);
@@ -499,6 +500,7 @@
return (OK);
}
+#endif
NCURSES_EXPORT(int)
_nc_capcmp(const char *s, const char *t)
/* compare two string capabilities, stripping out padding */
@@ -542,6 +544,7 @@
}
}
+#ifndef OMIT_LARGETABLES
static void
append_acs0(string_desc * dst, int code, int src)
{
@@ -986,4 +989,5 @@
}
}
+#endif
/* parse_entry.c ends here */
--- ncurses-5.5/ncurses/tinfo/MKcaptab.awk.largetables 2006-12-11 13:06:32.000000000 +0100
+++ ncurses-5.5/ncurses/tinfo/MKcaptab.awk 2006-12-11 13:06:33.000000000 +0100
@@ -42,6 +42,7 @@
#include <tic.h>
#include <term.h>
+#ifndef OMIT_LARGETABLES
EOF
./make_hash 1 info <$DATA
@@ -95,4 +96,5 @@
{
return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
}
+#endif
EOF
--- ncurses-5.5/tack/Makefile.in.largetables 2006-12-11 13:06:33.000000000 +0100
+++ ncurses-5.5/tack/Makefile.in 2006-12-11 13:06:33.000000000 +0100
@@ -91,7 +91,7 @@
LD = @LD@
LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
LDFLAGS = @EXTRA_LDFLAGS@ \
- @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
+ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ ../lib/libncurses*.a
LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
ncurses-5.5-20061209-tgetent.patch:
lib_termcap.c | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE ncurses-5.5-20061209-tgetent.patch ---
--- ncurses-5.5/ncurses/tinfo/lib_termcap.c.tgetent 2006-12-07 13:07:03.000000000 +0100
+++ ncurses-5.5/ncurses/tinfo/lib_termcap.c 2006-12-07 13:07:04.000000000 +0100
@@ -135,6 +135,7 @@
}
LAST_TRM = cur_term;
LAST_SEQ = ++sequence;
+ LAST_BUF = 0;
PC = 0;
UP = 0;
ncurses-5.5-20061209-xterm.patch:
terminfo.src | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ncurses-5.5-20061209-xterm.patch ---
--- ncurses-5.5/misc/terminfo.src.xterm 2006-12-11 15:13:42.000000000 +0100
+++ ncurses-5.5/misc/terminfo.src 2006-12-11 15:19:53.000000000 +0100
@@ -3018,7 +3018,7 @@
kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~,
kRIT=\E[1;2C, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, kent=\EOM, khome=\EOH,
- kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
+ kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~, kbs=\177,
kpp=\E[5~, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
use=xterm-basic,
#
@@ -3038,7 +3038,7 @@
# The meta key may also be used as a modifier in this scheme, adding another
# bit to the parameter.
xterm+pcfkeys|fragment for PC-style fkeys,
- use=xterm+pcf2, use=xterm+pcc2,
+ use=xterm+pcf0, use=xterm+pcc2,
#
# The "PC-style" modifier scheme was introduced in xterm patch #94 (1999/3/27)
# and revised in patch #167 (2002/8/24). Some other terminal emulators copied
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 17 Jul 2006 08:49:22 -0000 1.18
+++ .cvsignore 11 Dec 2006 15:12:09 -0000 1.19
@@ -1,5 +1,3 @@
ncurses-5.5.tar.gz
-ncurses-5.5-20060701.patch.gz
-patch-5.5-20060625.sh.gz
-ncurses-5.5-20060708.patch.gz
-ncurses-5.5-20060715.patch.gz
+ncurses-5.5-20060909-patch.sh.bz2
+ncurses-5.5-20060909-20061209.patch.bz2
Index: ncurses.spec
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ncurses.spec 30 Nov 2006 11:54:43 -0000 1.66
+++ ncurses.spec 11 Dec 2006 15:12:09 -0000 1.67
@@ -1,24 +1,22 @@
Summary: A terminal handling library
Name: ncurses
Version: 5.5
-Release: 26.20060715%{?dist}
+Release: 27.20061209%{?dist}
License: distributable
Group: System Environment/Libraries
URL: http://invisible-island.net/ncurses/ncurses.html
Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
-Source1: ncurses-linux
-Source2: ncurses-linux-m
Source3: ncurses-resetall.sh
-Source4: ftp://invisible-island.net/ncurses/5.5/patch-5.5-20060625.sh.gz
-Patch1: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060701.patch.gz
-Patch2: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060708.patch.gz
-Patch3: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060715.patch.gz
-Patch5: ncurses-5.4-xterm-kbs.patch
-Patch6: ncurses-5.5-20060715-tgetent.patch
-Patch7: ncurses-5.5-20060715-tgetstr.patch
-Patch8: ncurses-5.5-20060715-cflags.patch
+
+Patch1: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060909-patch.sh.bz2
+Patch2: ncurses-5.5-20060909-20061209.patch.bz2
+
+Patch6: ncurses-5.5-20061209-tgetent.patch
+Patch7: ncurses-5.5-20061209-largetables.patch
+Patch8: ncurses-5.5-20061209-config.patch
Patch9: ncurses-5.5-liblinks.patch
-BuildRequires: sharutils gpm-devel
+Patch10: ncurses-5.5-20061209-xterm.patch
+BuildRequires: gpm-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -50,16 +48,15 @@
%prep
%setup -q
-zcat %{SOURCE4} | sh > /dev/null
+
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch5 -p1 -b .xterm-kbs
%patch6 -p1 -b .tgetent
-%patch7 -p1 -b .tgetstr
-%patch8 -p1 -b .cflags
+%patch7 -p1 -b .largetables
+%patch8 -p1 -b .config
%patch9 -p1 -b .liblinks
+%patch10 -p1 -b .xterm
%build
%define rootdatadir /lib
@@ -68,21 +65,19 @@
--enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
--with-install-prefix=$RPM_BUILD_ROOT \\\
--with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
+ --includedir=%{_includedir}/ncursesw \\\
--enable-overwrite \\\
--with-chtype=long
mkdir narrowc widec
cd narrowc
ln -s ../configure .
-%configure %{ncurses_options} \
- --includedir=%{_includedir}/ncurses
+%configure %{ncurses_options}
make %{?_smp_mflags}
cd ../widec
ln -s ../configure .
-%configure %{ncurses_options} \
- --enable-widec \
- --includedir=%{_includedir}/ncursesw
+%configure %{ncurses_options} --enable-widec
make %{?_smp_mflags}
cd ..
@@ -91,6 +86,7 @@
make -C narrowc install
make -C widec install
+make -C narrowc install.progs
chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
@@ -119,7 +115,7 @@
for termname in $baseterms; do
termpath=terminfo/${termname::1}/$termname
mkdir $RPM_BUILD_ROOT%{rootdatadir}/terminfo/${termname::1} || : &> /dev/null
- mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT/%{rootdatadir}/$termpath
+ mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT%{rootdatadir}/$termpath
ln -s $(dirname %{_datadir}/$termpath | \
sed 's,\(^/\|\)[^/][^/]*,..,g')%{rootdatadir}/$termpath \
$RPM_BUILD_ROOT%{_datadir}/$termpath
@@ -128,6 +124,12 @@
ln -sf ncurses/{curses,unctrl,eti,form,menu,ncurses,panel,term}.h \
${RPM_BUILD_ROOT}%{_includedir}
+# can't replace directory with symlink (rpm bug), symlink all headers
+mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses
+for l in $RPM_BUILD_ROOT%{_includedir}/ncursesw/*.h; do
+ ln -s ../ncursesw/$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses
+done
+
install -c -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/resetall
rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
@@ -145,7 +147,7 @@
%{rootdatadir}/terminfo
%{_datadir}/terminfo
%{_datadir}/tabset
-%{_bindir}/*
+%{_bindir}/[cirt]*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man7/*
@@ -156,6 +158,7 @@
%doc doc/html/hackguide.html
%doc doc/html/ncurses-intro.html
%doc c++/README*
+%{_bindir}/ncurses*-config
%{_libdir}/lib*.a
%{_libdir}/lib*.so
%dir %{_includedir}/ncurses
@@ -177,6 +180,12 @@
rm -rf ${RPM_BUILD_ROOT}
%changelog
+* Mon Dec 11 2006 Miroslav Lichvar <mlichvar at redhat.com> 5.5-27.20061209
+- update to patch 20061209
+- strip large tables from shared libraries, reduce number of relocations
+- package utils linked with libncurses instead of libncursesw
+- package only wide-character headers
+
* Thu Nov 30 2006 Miroslav Lichvar <mlichvar at redhat.com> 5.5-26.20060715
- move also hardlinked entries (#217750)
- search /etc/terminfo for local terminfo entries
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 17 Jul 2006 08:49:22 -0000 1.18
+++ sources 11 Dec 2006 15:12:09 -0000 1.19
@@ -1,5 +1,3 @@
e73c1ac10b4bfc46db43b2ddfd6244ef ncurses-5.5.tar.gz
-b3eae4c2ff35929f4cff7a594f845abd patch-5.5-20060625.sh.gz
-afdb339e6bc6d524178b1f2538f98f96 ncurses-5.5-20060701.patch.gz
-1e166f462b6b00a294d701f0fd8321bd ncurses-5.5-20060708.patch.gz
-cc0d0fc36a09733d55e6f01c06dfad93 ncurses-5.5-20060715.patch.gz
+65f5eec1980ece6ae8accfc6c9c527ac ncurses-5.5-20060909-patch.sh.bz2
+3c54db0ba78467953bffa7cfc1f506e4 ncurses-5.5-20060909-20061209.patch.bz2
--- ncurses-5.4-xterm-kbs.patch DELETED ---
--- ncurses-5.5-20060715-cflags.patch DELETED ---
--- ncurses-5.5-20060715-tgetent.patch DELETED ---
--- ncurses-5.5-20060715-tgetstr.patch DELETED ---
--- ncurses-linux DELETED ---
--- ncurses-linux-m DELETED ---
More information about the fedora-cvs-commits
mailing list