diff --git a/base/ncurses/compile.patch b/base/ncurses/compile.patch new file mode 100644 index 000000000..b3b525a4a --- /dev/null +++ b/base/ncurses/compile.patch @@ -0,0 +1,28 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../ncurses/compile.patch +# Copyright (C) 2009 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./c++/Makefile.in.orig ++++ ./c++/Makefile.in +@@ -75,7 +75,7 @@ + INCDIR = ../include + CPPFLAGS = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ + +-CC = ${CXX} ++override CC = ${CXX} + CCFLAGS = $(CPPFLAGS) $(CXXFLAGS) + + CFLAGS_LIBTOOL = $(CCFLAGS) + diff --git a/base/ncurses/ncurses.conf b/base/ncurses/ncurses.conf index 926e8204f..9f3ce009c 100644 --- a/base/ncurses/ncurses.conf +++ b/base/ncurses/ncurses.conf @@ -18,7 +18,7 @@ prefix= set_confopt if ! atstage native; then - var_append extraconfopt " " "--without-cxx --without-cxx-binding" + var_append extraconfopt " " "--without-cxx --without-cxx-binding --with-build-cppflags=-D_GNU_SOURCE" fi # saving our local patches and empty the patchfiles variable @@ -30,6 +30,8 @@ for x in `match_source_file -p 'patch'` ; do var_append patchfiles " " "$x" done +hook_add prepatch 5 "bunzip2 < `match_source_file -p termtypes` > misc/terminfo.src" + # append our local patches var_append patchfiles " " "$localpatches" diff --git a/base/ncurses/ncurses.desc b/base/ncurses/ncurses.desc index 61034e66c..a5756d0ec 100644 --- a/base/ncurses/ncurses.desc +++ b/base/ncurses/ncurses.desc @@ -1,9 +1,8 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../ncurses/ncurses.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -34,13 +33,8 @@ [L] MIT [S] Stable -[V] 5.6-20070311 +[V] 5.7 [P] X -1-3-----9 104.000 -[D] 4140944326 ncurses-5.6.tar.gz ftp://ftp.gnu.org/pub/gnu/ncurses/ - -# Official patches we include. -# Important: Preserve the order of the patches -[D] 3584753430 ncurses-5.6-20070303-patch.sh.bz2 ftp://invisible-island.net/ncurses/5.6/ -[D] 1882521252 ncurses-5.6-20070310.patch.gz ftp://invisible-island.net/ncurses/5.6/ -[D] 1047580831 ncurses-5.6-20070311.patch.gz ftp://invisible-island.net/ncurses/5.6/ +[D] 45974054 ncurses-5.7.tar.gz ftp://ftp.gnu.org/pub/gnu/ncurses/ +[D] 430723242 termtypes.ti.gz http://catb.org/~esr/terminfo/