From d847379e9c5c943ec781b8bdad5b2e86dc08c158 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 16 Jan 2012 22:31:34 +0100 Subject: [PATCH] ncurses: Updated (5.9-20110423 -> 5.9-20120107) Important the 'pkg_config_sysroot.patch' was disabled because it didn't applied correctly but we need to fix that issue again. Besides that we have to fix some other pkgconfig related parts within configure to honor $PKG_CONFIG_SYSROOT if it is set. One thing I have observed is that it currently checks the pkgconfig directories of the host for deciding to install .pc files when doing a cross build. --- .../ncurses-5.9-add-rxvt-unicode-terminfo.patch | 16 ++++++++++------ base/ncurses/ncurses.conf | 4 +++- base/ncurses/ncurses.desc | 10 +++++----- ...t.patch => pkg_config_sysroot.patch.disabled} | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) rename base/ncurses/{pkg_config_sysroot.patch => pkg_config_sysroot.patch.disabled} (93%) diff --git a/base/ncurses/ncurses-5.9-add-rxvt-unicode-terminfo.patch b/base/ncurses/ncurses-5.9-add-rxvt-unicode-terminfo.patch index 459d9b2c3..1afaa0310 100644 --- a/base/ncurses/ncurses-5.9-add-rxvt-unicode-terminfo.patch +++ b/base/ncurses/ncurses-5.9-add-rxvt-unicode-terminfo.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../ncurses/ncurses-5.9-add-rxvt-unicode-terminfo.patch -# Copyright (C) 2011 The OpenSDE Project +# Copyright (C) 2012 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,10 +14,9 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -diff -up ncurses-5.9/misc/terminfo.src.urxvt ncurses-5.9/misc/terminfo.src ---- ncurses-5.9/misc/terminfo.src.urxvt 2011-07-18 16:24:45.304407369 +0200 -+++ ncurses-5.9/misc/terminfo.src 2011-07-18 16:26:27.854562083 +0200 -@@ -4243,6 +4243,173 @@ rxvt-cygwin-native|rxvt terminal emulato +--- ncurses-5.9/misc/terminfo.src.orig 2012-01-14 15:01:29.000000000 +0100 ++++ ncurses-5.9/misc/terminfo.src 2012-01-17 23:59:02.492061471 +0100 +@@ -4399,6 +4399,178 @@ rxvt-16color|xterm with 16 colors like aixterm, ncv#32, use=ibm+16color, use=rxvt, @@ -188,6 +187,11 @@ diff -up ncurses-5.9/misc/terminfo.src.urxvt ncurses-5.9/misc/terminfo.src + fsl=\007, + dsl=\E]2;\007, + ++rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), ++ colors#256, ++ pairs#32767, ++ use=rxvt-unicode, ++ + #### MRXVT # mrxvt 0.5.4 # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/base/ncurses/ncurses.conf b/base/ncurses/ncurses.conf index aba4b7c18..cf021b5d3 100644 --- a/base/ncurses/ncurses.conf +++ b/base/ncurses/ncurses.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../ncurses/ncurses.conf -# Copyright (C) 2006 - 2011 The OpenSDE Project +# Copyright (C) 2006 - 2012 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -188,5 +188,7 @@ else # generate and install .pc files for pkg-config if pkginstalled pkgconfig; then var_append extraconfopt " " "--enable-pc-files" + # without this .pc files will get installed into $datadir/pkgconfig + var_append extraconfopt " " "--with-pkg-config-libdir=$libdir/pkgconfig" fi fi diff --git a/base/ncurses/ncurses.desc b/base/ncurses/ncurses.desc index 2b1f2c163..43986f6d9 100644 --- a/base/ncurses/ncurses.desc +++ b/base/ncurses/ncurses.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../ncurses/ncurses.desc -[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -33,12 +33,12 @@ [L] MIT [S] Stable -[V] 5.9-20110423 +[V] 5.9-20120107 [P] X 01-3-----9 104.000 [D] 4009676220 ncurses-5.9.tar.gz ftp://invisible-island.net/ncurses/ # Official upstream patches # Important: Preserve the order of the patches! -[D] 2030388512 ncurses-5.9-20110409.patch.gz ftp://invisible-island.net/ncurses/5.9/ -[D] 584087369 ncurses-5.9-20110416.patch.gz ftp://invisible-island.net/ncurses/5.9/ -[D] 1554268252 ncurses-5.9-20110423.patch.gz ftp://invisible-island.net/ncurses/5.9/ +[D] 1956314015 ncurses-5.9-20111224-patch.sh.bz2 ftp://invisible-island.net/ncurses/5.9/ +[D] 2514510284 ncurses-5.9-20111231.patch.gz ftp://invisible-island.net/ncurses/5.9/ +[D] 300234261 ncurses-5.9-20120107.patch.gz ftp://invisible-island.net/ncurses/5.9/ diff --git a/base/ncurses/pkg_config_sysroot.patch b/base/ncurses/pkg_config_sysroot.patch.disabled similarity index 93% rename from base/ncurses/pkg_config_sysroot.patch rename to base/ncurses/pkg_config_sysroot.patch.disabled index d580554ae..10e280d7f 100644 --- a/base/ncurses/pkg_config_sysroot.patch +++ b/base/ncurses/pkg_config_sysroot.patch.disabled @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../ncurses/pkg_config_sysroot.patch -# Copyright (C) 2011 The OpenSDE Project +# 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. #