OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Oct-2007 09:22:42 Branch: HEAD Handle: 2007101408224100 Modified files: openpkg-src/ncurses ncurses.patch ncurses.spec Log: upgrading package: ncurses 5.6.20071006 -> 5.6.20071013 Summary: Revision Changes Path 1.15 +55 -51 openpkg-src/ncurses/ncurses.patch 1.344 +5 -3 openpkg-src/ncurses/ncurses.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/ncurses/ncurses.patch ============================================================================ $ cvs diff -u -r1.14 -r1.15 ncurses.patch --- openpkg-src/ncurses/ncurses.patch 2 Sep 2007 18:18:59 -0000 1.14 +++ openpkg-src/ncurses/ncurses.patch 14 Oct 2007 07:22:41 -0000 1.15 @@ -8,8 +8,8 @@ arbitrary C compiler (usually a non-GCC 3.x vendor compiler!). Index: include/curses.h.in ---- include/curses.h.in.orig 2007-05-01 14:30:17 +0200 -+++ include/curses.h.in 2007-05-01 14:30:18 +0200 +--- include/curses.h.in.orig 2007-10-14 08:55:05 +0200 ++++ include/curses.h.in 2007-10-14 08:55:05 +0200 @@ -69,7 +69,11 @@ * User-definable tweak to disable the include of <stdbool.h>. */ @@ -24,10 +24,10 @@ /* Index: ncurses/Makefile.in ---- ncurses/Makefile.in.orig 2007-05-01 14:30:17 +0200 -+++ ncurses/Makefile.in 2007-05-01 14:30:18 +0200 +--- ncurses/Makefile.in.orig 2007-10-14 08:55:05 +0200 ++++ ncurses/Makefile.in 2007-10-14 08:55:05 +0200 @@ -154,7 +154,7 @@ - names-stamp + keys.list TEST_DEPS = ../lib/@[EMAIL PROTECTED]@DFT_DEP_SUFFIX@ -TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ @@ -35,8 +35,8 @@ TEST_LDFLAGS = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@ TEST_PROGS = \ -@@ -275,7 +275,8 @@ - @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(TEST_LDFLAGS) +@@ -269,7 +269,8 @@ + @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS) lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \ - ../@DFT_OBJ_SUBDIR@/dump_entry$o @@ -46,18 +46,22 @@ link_test$x : ./link_test.c $(TEST_DEPS) \ Index: progs/Makefile.in ---- progs/Makefile.in.orig 2007-05-01 14:30:17 +0200 -+++ progs/Makefile.in 2007-05-01 14:30:18 +0200 -@@ -99,7 +99,7 @@ +--- progs/Makefile.in.orig 2007-10-14 08:55:05 +0200 ++++ progs/Makefile.in 2007-10-14 09:18:48 +0200 +@@ -109,10 +109,10 @@ + + LDFLAGS_DEFAULT = $([EMAIL PROTECTED]@) + +-LIBS_TIC = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ ++LIBS_TIC = @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ + LDFLAGS_TIC = $([EMAIL PROTECTED]@) $(LIBS_TIC) - LD = @LD@ - LINK = @LINK_PROGS@ $(LIBTOOL_LINK) --LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LDFLAGS@ @LD_MODEL@ @LIBS@ -+LDFLAGS = @EXTRA_LDFLAGS@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LDFLAGS@ @LD_MODEL@ @LIBS@ - - LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL) - LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) -@@ -207,7 +207,8 @@ +-LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ ++LIBS_TINFO = @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ + LDFLAGS_TINFO = $([EMAIL PROTECTED]@) $(LIBS_TINFO) + + LINT = @LINT@ +@@ -213,7 +213,8 @@ DEPS_TIC = \ $(MODEL)/tic$o \ @@ -66,9 +70,9 @@ + $(MODEL)/comp_parse$o tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h - @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@ -@@ -226,14 +227,16 @@ - @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@ + @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@ +@@ -231,14 +232,16 @@ + @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@ DEPS_TPUT = \ - $(MODEL)/tput$o @@ -76,7 +80,7 @@ + $(MODEL)/lib_tparm$o tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h - @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@ + @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@ DEPS_INFOCMP = \ $(MODEL)/infocmp$o \ @@ -85,10 +89,34 @@ + $(MODEL)/comp_parse$o infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES) - @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@ + @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@ +Index: tack/Makefile.in +--- tack/Makefile.in.orig 2006-12-17 16:58:32 +0100 ++++ tack/Makefile.in 2007-10-14 08:55:05 +0200 +@@ -93,7 +93,7 @@ + LOCAL_LIBDIR = @top_builddir@/lib + + LD = @LD@ +-LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC) ++LINK = @LINK_PROGS@ $(LIBTOOL_LINK) + LDFLAGS = @EXTRA_LDFLAGS@ \ + @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ + +Index: tack/edit.c +--- tack/edit.c.orig 2006-06-24 23:22:42 +0200 ++++ tack/edit.c 2007-10-14 08:55:05 +0200 +@@ -33,6 +33,8 @@ + static void show_untested(struct test_list *, int *, int *); + static void show_changed(struct test_list *, int *, int *); + ++#define _nc_info_hash_table _nc_get_hash_table(0) ++ + #define SHOW_VALUE 1 + #define SHOW_EDIT 2 + #define SHOW_DELETE 3 Index: test/Makefile.in ---- test/Makefile.in.orig 2007-05-01 14:30:17 +0200 -+++ test/Makefile.in 2007-05-01 14:30:18 +0200 +--- test/Makefile.in.orig 2007-10-14 08:55:04 +0200 ++++ test/Makefile.in 2007-10-14 08:55:05 +0200 @@ -87,7 +87,7 @@ LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@ @@ -108,8 +136,8 @@ LINT = @LINT@ Index: test/programs ---- test/programs.orig 2007-05-01 14:30:17 +0200 -+++ test/programs 2007-05-01 14:30:18 +0200 +--- test/programs.orig 2007-10-14 08:55:04 +0200 ++++ test/programs 2007-10-14 08:55:05 +0200 @@ -37,7 +37,7 @@ chgat $(LDFLAGS_CURSES) $(LOCAL_LIBS) chgat color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set @@ -119,27 +147,3 @@ demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field demo_keyok $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_keyok demo_menus $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_menus -Index: tack/Makefile.in ---- tack/Makefile.in.orig 2006-12-17 16:58:32 +0100 -+++ tack/Makefile.in 2007-05-08 08:45:30 +0200 -@@ -93,7 +93,7 @@ - LOCAL_LIBDIR = @top_builddir@/lib - - LD = @LD@ --LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC) -+LINK = @LINK_PROGS@ $(LIBTOOL_LINK) - LDFLAGS = @EXTRA_LDFLAGS@ \ - @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ - -Index: tack/edit.c ---- tack/edit.c.orig 2006-06-24 23:22:42 +0200 -+++ tack/edit.c 2007-09-02 20:16:00 +0200 -@@ -33,6 +33,8 @@ - static void show_untested(struct test_list *, int *, int *); - static void show_changed(struct test_list *, int *, int *); - -+#define _nc_info_hash_table _nc_get_hash_table(0) -+ - #define SHOW_VALUE 1 - #define SHOW_EDIT 2 - #define SHOW_DELETE 3 @@ . patch -p0 <<'@@ .' Index: openpkg-src/ncurses/ncurses.spec ============================================================================ $ cvs diff -u -r1.343 -r1.344 ncurses.spec --- openpkg-src/ncurses/ncurses.spec 7 Oct 2007 08:06:41 -0000 1.343 +++ openpkg-src/ncurses/ncurses.spec 14 Oct 2007 07:22:41 -0000 1.344 @@ -36,9 +36,10 @@ %define V_patch10 20070915 %define V_patch11 20070929 %define V_patch12 20071006 +%define V_patch13 20071013 %define V_patchB %{V_patch1} -%define V_patchL %{V_patch12} -%define V_patches 11 +%define V_patchL %{V_patch13} +%define V_patches 13 # package information Name: ncurses @@ -51,7 +52,7 @@ Group: Terminal License: MIT-style Version: %{V_base}.%{V_patchL} -Release: 20071007 +Release: 20071014 # list of sources Source0: ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz @@ -67,6 +68,7 @@ Patch10: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch10}.patch.gz Patch11: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch11}.patch.gz Patch12: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch12}.patch.gz +Patch13: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch13}.patch.gz Patch100: ncurses.patch # build information @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org