OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   04-Dec-2009 16:20:24
  Branch: HEAD                             Handle: 2009120415202300

  Modified files:
    openpkg-src/ncurses     ncurses.patch ncurses.spec

  Log:
    kick out nasty Name collion error which occurs when screen(1) is
    linked against ncurses

  Summary:
    Revision    Changes     Path
    1.21        +14 -0      openpkg-src/ncurses/ncurses.patch
    1.453       +1  -1      openpkg-src/ncurses/ncurses.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ncurses/ncurses.patch
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 ncurses.patch
  --- openpkg-src/ncurses/ncurses.patch 15 Mar 2009 09:53:09 -0000      1.20
  +++ openpkg-src/ncurses/ncurses.patch 4 Dec 2009 15:20:23 -0000       1.21
  @@ -111,3 +111,17 @@
    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: ncurses/tinfo/comp_parse.c
  +--- ncurses/tinfo/comp_parse.c.orig  2009-12-04 16:12:09 +0100
  ++++ ncurses/tinfo/comp_parse.c       2009-12-04 16:14:28 +0100
  +@@ -202,8 +202,10 @@
  +             && _nc_entry_match(qp->tterm.term_names, rp->tterm.term_names)) 
{
  +             matchcount++;
  +             if (matchcount == 1) {
  ++#if 0
  +                 (void) fprintf(stderr, "Name collision between %s",
  +                                _nc_first_name(qp->tterm.term_names));
  ++#endif
  +                 multiples++;
  +             }
  +             if (matchcount >= 1)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ncurses/ncurses.spec
  ============================================================================
  $ cvs diff -u -r1.452 -r1.453 ncurses.spec
  --- openpkg-src/ncurses/ncurses.spec  29 Nov 2009 18:47:38 -0000      1.452
  +++ openpkg-src/ncurses/ncurses.spec  4 Dec 2009 15:20:23 -0000       1.453
  @@ -97,7 +97,7 @@
   Group:        Terminal
   License:      MIT-style
   Version:      %{V_base}.%{V_patchL}
  -Release:      20091129
  +Release:      20091204
   
   #   list of sources
   Source0:      ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to