8 changed files with 6 additions and 287 deletions
Split View
Diff Options
-
+0 -27base/ncurses/buildcc-define_gnu_source.patch
-
+0 -28base/ncurses/compile.patch
-
+0 -32base/ncurses/cross-build.patch.disabled
-
+0 -51base/ncurses/install-no-rm.patch.disabled
-
+3 -13base/ncurses/ncurses.conf
-
+3 -38base/ncurses/ncurses.desc
-
+0 -58base/ncurses/parallel-make.patch.disabled
-
+0 -40base/ncurses/pkg_config_sysroot.patch.disabled
@ -1,27 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../ncurses/buildcc-define_gnu_source.patch |
|||
# Copyright (C) 2010 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 --- |
|||
|
|||
--- ncurses-5.6/ncurses/Makefile.in.orig 2006-10-14 21:08:11.000000000 +0200
|
|||
+++ ncurses-5.6/ncurses/Makefile.in 2010-03-04 10:12:20.314173792 +0100
|
|||
@@ -94,7 +94,7 @@
|
|||
|
|||
BUILD_CPPFLAGS = -I../include @BUILD_CPPFLAGS@ |
|||
BUILD_CC = @BUILD_CC@ |
|||
-BUILD_CCFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@
|
|||
+BUILD_CCFLAGS = -D_GNU_SOURCE -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@
|
|||
BUILD_LDFLAGS = @BUILD_LDFLAGS@ |
|||
BUILD_LIBS = @BUILD_LIBS@ |
|||
|
|||
@ -1,28 +0,0 @@ |
|||
# --- 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) |
|||
|
|||
@ -1,32 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../ncurses/cross-build.patch.disabled |
|||
# Copyright (C) 2004 - 2006 The T2 SDE 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 --- |
|||
|
|||
Of course one must not inject the cross systems include directory for the |
|||
system compiler ... |
|||
|
|||
- Rene Rebe <rene@exactcode.de> |
|||
|
|||
--- ncurses-5.4/ncurses/Makefile.in 2003-11-01 23:48:53.000000000 +0100 |
|||
+++ ncurses-5.4-fixed/ncurses/Makefile.in 2005-02-02 10:12:13.435016760 +0100 |
|||
@@ -93,7 +93,7 @@ |
|||
CCFLAGS = $(CPPFLAGS) $(CFLAGS) |
|||
|
|||
BUILD_CC = @BUILD_CC@ |
|||
-BUILD_CCFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) @BUILD_CPPFLAGS@ @BUILD_CFLAGS@ |
|||
+BUILD_CCFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I. -I../include -D_GNU_SOURCE |
|||
BUILD_LDFLAGS = @BUILD_LDFLAGS@ |
|||
BUILD_LIBS = @BUILD_LIBS@ |
|||
|
|||
@ -1,51 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../ncurses/install-no-rm.patch.disabled |
|||
# Copyright (C) 2006 The OpenSDE Project |
|||
# Copyright (C) 2004 - 2006 The T2 SDE 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 --- |
|||
|
|||
One must not rm a library - especially not when the system - e.g. bash - |
|||
depends on it ... |
|||
|
|||
- Rene Rebe <rene@exactcode.de> |
|||
|
|||
--- ./mk-1st.awk.orig 2004-01-10 20:48:43.000000000 +0000 |
|||
+++ ./mk-1st.awk 2005-06-12 12:05:30.000000000 +0000 |
|||
@@ -52,8 +52,7 @@ |
|||
# |
|||
function symlink(src,dst) { |
|||
if ( src != dst ) { |
|||
- printf "rm -f %s; ", dst |
|||
- printf "$(LN_S) %s %s; ", src, dst |
|||
+ printf "$(LN_S) -f %s %s; ", src, dst |
|||
} |
|||
} |
|||
function rmlink(directory, dst) { |
|||
@@ -224,7 +223,6 @@ |
|||
src_name = sprintf("../lib/%s", end_name); |
|||
dst_name = sprintf("$(DESTDIR)$(libdir)/%s", end_name); |
|||
printf "\t@echo installing %s as %s\n", src_name, dst_name |
|||
- printf "\t-@rm -f %s\n", dst_name |
|||
printf "\t$(INSTALL_LIB) %s %s\n", src_name, dst_name |
|||
|
|||
sharedlinks("$(DESTDIR)$(libdir)") |
|||
@@ -240,7 +238,7 @@ |
|||
} else { |
|||
ovr_name = sprintf("libcurses%s", suffix) |
|||
printf "\t@echo linking %s to %s\n", end_name, ovr_name |
|||
- printf "\tcd $(DESTDIR)$(libdir) && (rm -f %s; $(LN_S) %s %s; )\n", ovr_name, end_name, ovr_name |
|||
+ printf "\tcd $(DESTDIR)$(libdir) && ($(LN_S) -f %s %s; )\n", ovr_name, end_name, ovr_name |
|||
} |
|||
} |
|||
if ( ldconfig != "" ) { |
|||
@ -1,58 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../ncurses/parallel-make.patch.disabled |
|||
# Copyright (C) 2006 The T2 SDE 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 --- |
|||
|
|||
diff -ur ncurses-5.4/ncurses/Makefile.in ncurses-5.4-fixed/ncurses/Makefile.in |
|||
--- ncurses-5.4/ncurses/Makefile.in 2006-07-03 20:08:45.000000000 +0000 |
|||
+++ ncurses-5.4-fixed/ncurses/Makefile.in 2006-07-03 20:18:41.000000000 +0000 |
|||
@@ -141,7 +141,6 @@ |
|||
|
|||
AUTO_SRC = \ |
|||
../include/nomacros.h \ |
|||
- codes.c \ |
|||
comp_captab.c \ |
|||
expanded.c \ |
|||
fallback.c \ |
|||
@@ -150,7 +149,6 @@ |
|||
lib_gen.c \ |
|||
lib_keyname.c \ |
|||
link_test.c \ |
|||
- names.c \ |
|||
unctrl.c |
|||
|
|||
TEST_DEPS = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@ |
|||
@@ -200,7 +198,7 @@ |
|||
|
|||
make_keys$(BUILD_EXEEXT) : \ |
|||
$(tinfo)/make_keys.c \ |
|||
- names.c |
|||
+ name-codes-stamp |
|||
$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS) |
|||
|
|||
make_hash$(BUILD_EXEEXT) : \ |
|||
@@ -220,11 +218,12 @@ |
|||
lib_keyname.c: keys.list $(base)/MKkeyname.awk |
|||
$(AWK) -f $(base)/MKkeyname.awk keys.list > $@ |
|||
|
|||
-names.c codes.c: $(tinfo)/MKnames.awk |
|||
+name-codes-stamp: $(tinfo)/MKnames.awk |
|||
$(AWK) -f $(tinfo)/MKnames.awk $(srcdir)/../include/@TERMINFO_CAPS@ |
|||
cat namehdr boolnames boolfnames numnames numfnames strnames strfnames nameftr >names.c |
|||
cat namehdr boolcodes numcodes strcodes codeftr >codes.c |
|||
-rm -f namehdr nameftr codeftr boolnames boolfnames boolcodes numnames numfnames numcodes strnames strfnames strcodes |
|||
+ echo 1 >name-codes-stamp |
|||
|
|||
unctrl.c: $(base)/MKunctrl.awk |
|||
echo | $(AWK) -f $(base)/MKunctrl.awk >$@ |
|||
@ -1,40 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../ncurses/pkg_config_sysroot.patch.disabled |
|||
# Copyright (C) 2011 - 2012 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 --- |
|||
|
|||
--- ./configure.in.amery 2011-06-01 22:45:01.000000000 +0200 |
|||
+++ ./configure.in 2011-06-01 22:46:44.000000000 +0200 |
|||
@@ -178,6 +178,9 @@ |
|||
fi |
|||
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` |
|||
if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then |
|||
+ if test -n "$PKG_CONFIG_SYSROOT_DIR" ; then |
|||
+ PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e "s,^$PKG_CONFIG_SYSROOT_DIR,,"` |
|||
+ fi |
|||
AC_ARG_ENABLE(pc-files, |
|||
[ --enable-pc-files generate and install .pc files for pkg-config], |
|||
[enable_pc_files=$enableval], |
|||
--- ./configure.amery 2011-06-01 22:52:18.000000000 +0200 |
|||
+++ ./configure 2011-06-01 22:53:44.000000000 +0200 |
|||
@@ -3627,6 +3627,9 @@ |
|||
fi |
|||
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` |
|||
if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then |
|||
+ if test -n "$PKG_CONFIG_SYSROOT_DIR" ; then |
|||
+ PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e "s,^$PKG_CONFIG_SYSROOT_DIR,,"` |
|||
+ fi |
|||
|
|||
# Check whether --enable-pc-files or --disable-pc-files was given. |
|||
if test "${enable_pc_files+set}" = set; then |
|||