From 1687a9a4c15e9a045550c2dcc02d41a8ee23c874 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 8 Feb 2012 14:49:11 +0100 Subject: [PATCH] update to patch 20120204 --- .gitignore | 3 ++- ncurses-libs.patch | 27 +++++++++++++++------------ ncurses-urxvt.patch | 8 ++++---- ncurses.spec | 7 ++++--- sources | 3 ++- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 14afdb1..7937e6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ncurses-5.9.tar.gz -/ncurses-5.9-20110409-20110716.patch.bz2 +/ncurses-5.9-20111224-patch.sh.bz2 +/ncurses-5.9-20111231-20120204.patch.bz2 diff --git a/ncurses-libs.patch b/ncurses-libs.patch index 86aa310..0675cf1 100644 --- a/ncurses-libs.patch +++ b/ncurses-libs.patch @@ -1,33 +1,36 @@ ---- ncurses-5.6/menu/Makefile.in.libs 2007-06-13 15:01:12.000000000 +0200 -+++ ncurses-5.6/menu/Makefile.in 2007-06-13 15:01:13.000000000 +0200 -@@ -95,7 +95,7 @@ LINK = $(LIBTOOL_LINK) +diff -up ncurses-5.9/form/Makefile.in.libs ncurses-5.9/form/Makefile.in +--- ncurses-5.9/form/Makefile.in.libs 2012-02-07 18:25:33.000000000 +0100 ++++ ncurses-5.9/form/Makefile.in 2012-02-07 18:26:45.915065925 +0100 +@@ -100,7 +100,7 @@ LINK = $(LIBTOOL_LINK) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ + RPATH_LIST = @RPATH_LIST@ MK_SHARED_LIB = @MK_SHARED_LIB@ - ---- ncurses-5.6/panel/Makefile.in.libs 2007-06-13 15:01:12.000000000 +0200 -+++ ncurses-5.6/panel/Makefile.in 2007-06-13 15:01:13.000000000 +0200 -@@ -96,7 +96,7 @@ LINK = $(LIBTOOL_LINK) +diff -up ncurses-5.9/menu/Makefile.in.libs ncurses-5.9/menu/Makefile.in +--- ncurses-5.9/menu/Makefile.in.libs 2012-02-07 18:25:33.000000000 +0100 ++++ ncurses-5.9/menu/Makefile.in 2012-02-07 18:26:03.251063857 +0100 +@@ -100,7 +100,7 @@ LINK = $(LIBTOOL_LINK) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ + RPATH_LIST = @RPATH_LIST@ MK_SHARED_LIB = @MK_SHARED_LIB@ - ---- ncurses-5.6/form/Makefile.in.libs 2007-06-13 15:01:12.000000000 +0200 -+++ ncurses-5.6/form/Makefile.in 2007-06-13 15:01:13.000000000 +0200 -@@ -95,7 +95,7 @@ LINK = $(LIBTOOL_LINK) +diff -up ncurses-5.9/panel/Makefile.in.libs ncurses-5.9/panel/Makefile.in +--- ncurses-5.9/panel/Makefile.in.libs 2012-02-07 18:25:33.000000000 +0100 ++++ ncurses-5.9/panel/Makefile.in 2012-02-07 18:26:28.798065062 +0100 +@@ -101,7 +101,7 @@ LINK = $(LIBTOOL_LINK) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ + RPATH_LIST = @RPATH_LIST@ MK_SHARED_LIB = @MK_SHARED_LIB@ - diff --git a/ncurses-urxvt.patch b/ncurses-urxvt.patch index c4d617d..e2886a1 100644 --- a/ncurses-urxvt.patch +++ b/ncurses-urxvt.patch @@ -1,7 +1,7 @@ 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.urxvt 2012-02-07 18:28:00.000000000 +0100 ++++ ncurses-5.9/misc/terminfo.src 2012-02-07 18:28:50.650076519 +0100 +@@ -4417,6 +4417,173 @@ rxvt-cygwin-native|rxvt terminal emulato rxvt-16color|xterm with 16 colors like aixterm, ncv#32, use=ibm+16color, use=rxvt, @@ -172,6 +172,6 @@ diff -up ncurses-5.9/misc/terminfo.src.urxvt ncurses-5.9/misc/terminfo.src + fsl=\007, + dsl=\E]2;\007, + + #### MRXVT # mrxvt 0.5.4 # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/ncurses.spec b/ncurses.spec index f34ae62..cbd62af 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -7,7 +7,8 @@ Group: System Environment/Base URL: http://invisible-island.net/ncurses/ncurses.html Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz -Patch1: ncurses-5.9-20110409-20110716.patch.bz2 +Patch1: ncurses-5.9-20111224-patch.sh.bz2 +Patch2: ncurses-5.9-20111231-20120204.patch.bz2 Patch8: ncurses-config.patch Patch9: ncurses-libs.patch Patch11: ncurses-urxvt.patch @@ -91,6 +92,7 @@ The ncurses-static package includes static libraries of the ncurses library. %setup -q %patch1 -p1 +%patch2 -p1 %patch8 -p1 -b .config %patch9 -p1 -b .libs @@ -114,11 +116,10 @@ done --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\ --enable-overwrite \\\ --enable-pc-files \\\ + --with-pkg-config-libdir=%{_libdir}/pkgconfig \\\ --with-termlib=tinfo \\\ --with-chtype=long -export PKG_CONFIG_LIBDIR=%{_libdir}/pkgconfig - mkdir narrowc widec cd narrowc ln -s ../configure . diff --git a/sources b/sources index dac372c..4c13869 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz -68d3169181b0e526f16367a6d5333a39 ncurses-5.9-20110409-20110716.patch.bz2 +3138ed61b6290f201f3456ddc2dc8e38 ncurses-5.9-20111224-patch.sh.bz2 +801567a454758ced0e1c7adc7bf58b9a ncurses-5.9-20111231-20120204.patch.bz2