From 07af84e9f3298aff0518c61633526d6b6299377a76975c4d465f3e55e8c4ff13 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 2 Nov 2015 13:04:47 +0000 Subject: [PATCH] Accepting request 341814 from home:sleep_walker:branches:Base:System - remove hunk from ncurses-6.0.dif modifying configure.in according to NEWS (20110924) it is not used anymore You can also easily verify that by grepping sources. - drop ncurses-5.9-overwrite.dif as not neededd (WITH_OVERWRITE=$with_overwrite is in configure already twice anyway) It's not placed right after the detection code but a bit later. You can easily verify that by grepping sources. - drop ncurses-6.0-avoid-line-markers.dif as not needed (see ncurses/base/MKlib_gen.sh 69-84) I also verified that by build. OBS-URL: https://build.opensuse.org/request/show/341814 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=226 --- ncurses-5.9-overwrite.dif | 25 ------------------------- ncurses-6.0-avoid-line-markers.dif | 15 --------------- ncurses-6.0.dif | 13 +------------ ncurses.changes | 10 ++++++++++ ncurses.spec | 4 ---- 5 files changed, 11 insertions(+), 56 deletions(-) delete mode 100644 ncurses-5.9-overwrite.dif delete mode 100644 ncurses-6.0-avoid-line-markers.dif diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif deleted file mode 100644 index 4ac6512..0000000 --- a/ncurses-5.9-overwrite.dif +++ /dev/null @@ -1,25 +0,0 @@ ---- - configure | 1 + - configure.in | 1 + - 2 files changed, 2 insertions(+) - ---- configure.in -+++ configure.in 2012-01-30 16:31:47.000000000 +0000 -@@ -475,6 +475,7 @@ AC_ARG_ENABLE(overwrite, - [with_overwrite=$enableval], - [if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi]) - AC_MSG_RESULT($with_overwrite) -+WITH_OVERWRITE=$with_overwrite - - AC_MSG_CHECKING(if external terminfo-database is used) - AC_ARG_ENABLE(database, ---- configure -+++ configure 2013-09-30 09:17:52.000000000 +0000 -@@ -6956,6 +6956,7 @@ else - fi; - echo "$as_me:6991: result: $with_overwrite" >&5 - echo "${ECHO_T}$with_overwrite" >&6 -+WITH_OVERWRITE="$with_overwrite" - - echo "$as_me:6994: checking if external terminfo-database is used" >&5 - echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-6.0-avoid-line-markers.dif b/ncurses-6.0-avoid-line-markers.dif deleted file mode 100644 index 096dce5..0000000 --- a/ncurses-6.0-avoid-line-markers.dif +++ /dev/null @@ -1,15 +0,0 @@ ---- - ncurses/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- ncurses/Makefile.in -+++ ncurses/Makefile.in 2015-08-13 15:08:16.989519655 +0000 -@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : - $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ - - ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h -- $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ -+ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@ - - init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list - ./make_keys$(BUILD_EXEEXT) keys.list > $@ diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 1bbda99..d4ef263 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -1,7 +1,6 @@ --- aclocal.m4 | 40 +++++++------ configure | 41 +++++++------ - configure.in | 1 include/curses.h.in | 3 include/termcap.h.in | 2 include/tic.h | 4 - @@ -19,7 +18,7 @@ ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_termcap.c | 21 ++++-- test/test.priv.h | 4 - - 20 files changed, 239 insertions(+), 79 deletions(-) + 19 files changed, 238 insertions(+), 79 deletions(-) --- aclocal.m4 +++ aclocal.m4 2015-04-27 10:47:04.000000000 +0000 @@ -150,16 +149,6 @@ ;; esac done ---- configure.in -+++ configure.in 2012-01-30 16:31:47.000000000 +0000 -@@ -1918,6 +1918,7 @@ if test "$with_termlib" != no ; then - TINFO_LDFLAGS="-L${LIB_DIR}" - SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" - fi -+ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" - else - # the next lines are needed for linking libtic over libncurses - TINFO_NAME=${LIB_NAME} --- configure +++ configure 2015-04-27 10:46:08.000000000 +0000 @@ -5857,7 +5857,7 @@ case $cf_cv_system_name in diff --git a/ncurses.changes b/ncurses.changes index d3edc38..d88692b 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Oct 31 12:04:22 UTC 2015 - sleep_walker@opensuse.org + +- remove hunk from ncurses-6.0.dif modifying configure.in + according to NEWS (20110924) it is not used anymore +- drop ncurses-5.9-overwrite.dif as not neededd + (WITH_OVERWRITE=$with_overwrite is in configure already twice anyway) +- drop ncurses-6.0-avoid-line-markers.dif as not needed + (see ncurses/base/MKlib_gen.sh 69-84) + ------------------------------------------------------------------- Mon Oct 12 09:30:14 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index f249112..a14ae9c 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -65,10 +65,8 @@ Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-6.0.dif Patch1: ncurses-5.9-ibm327x.dif -Patch3: ncurses-5.9-overwrite.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif -Patch6: ncurses-6.0-avoid-line-markers.dif Patch7: ncurses-6.0-wildcard_for_ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc @@ -281,11 +279,9 @@ rm -fr tack tar xfz %{S:5} mv tack-* tack %patch -P 1 -p0 -b .327x -%patch -P 3 -p0 -b .ow %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .lc %patch -P 0 -p0 -b .p0 -%patch -P 6 -p0 -b .p6 %patch -P 7 -p1 -b .p7 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh