Hello community,
here is the log from the commit of package zsh for openSUSE:Factory checked in
at 2020-10-06 17:06:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zsh (Old)
and /work/SRC/openSUSE:Factory/.zsh.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zsh"
Tue Oct 6 17:06:09 2020 rev:94 rq:830225 version:5.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/zsh/zsh.changes 2020-05-08 23:00:59.517327882
+0200
+++ /work/SRC/openSUSE:Factory/.zsh.new.4249/zsh.changes 2020-10-06
17:06:22.061281502 +0200
@@ -1,0 +2,5 @@
+Tue Aug 25 13:25:50 UTC 2020 - Martin Liška <mli...@suse.cz>
+
+- Add ncurses-fix.patch in order to fix ncurses failure.
+
+-------------------------------------------------------------------
New:
----
ncurses-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zsh.spec ++++++
--- /var/tmp/diff_new_pack.exujLj/_old 2020-10-06 17:06:24.589283686 +0200
+++ /var/tmp/diff_new_pack.exujLj/_new 2020-10-06 17:06:24.589283686 +0200
@@ -40,6 +40,7 @@
Patch1: trim-unneeded-completions.patch
# PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc
completion
Patch2: zsh-osc-completion.patch
+Patch3: ncurses-fix.patch
BuildRequires: groff
BuildRequires: libcap-devel
BuildRequires: ncurses-devel
@@ -96,6 +97,7 @@
%patch1 -p1
%endif
%patch2 -p1
+%patch3 -p1
# Remove executable bit
chmod 0644 Etc/changelog2html.pl
++++++ ncurses-fix.patch ++++++
>From c6a85163619ed1cee89ab047a0d98108ed46828d Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d...@daniel.shahaf.name>
Date: Fri, 28 Aug 2020 02:36:35 +0000
Subject: [PATCH] github #64: Fix a build-time error when building against
ncurses that hadn't been built with --enable-wgetch-events.
The --enable-wgetch-events codepath is experimental (according to
ncurses-6.2/INSTALL) and off by default (according to
ncurses-6.2/configure.in). With that codepath disabled, the macro
KEY_EVENT is not provided, which (before this commit) manifested as a
build-time error:
[ 245s] gcc -c -I. -I../../Src -I../../Src -I../../Src/Zle -I.
-DHAVE_CONFIG_H -DMODULE -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong
-funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection
-Werror=return-type -flto=auto -g -fPIE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600
-I/usr/include/ncursesw -fPIC -o curses..o curses.c
[ 246s] In file included from curses.c:210:
[ 246s] curses_keys.h:93:15: error: 'KEY_EVENT' undeclared here (not in a
function); did you mean 'KEY_RESET'?
[ 246s] 93 | {"EVENT", KEY_EVENT},
[ 246s] | ^~~~~~~~~
[ 246s] | KEY_RESET
curses_keys.h is only used for setting the "kevent" output parameter of
'zcurses input' (and the associated $zcurses_keycodes special variable),
so there's no harm in just leaving KEY_EVENT out of it. (That codepath
deals gracefully with numeric values that don't correspond to any of the
known compile-time values, as that can happen whenever the build- and
run-time versions of ncurses don't provide the same set of KEY_* macros,
with or without relation to that configure flag.)
Reported by Martin Liska.
---
ChangeLog | 6 ++++++
Src/Modules/curses_keys.awk | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Src/Modules/curses_keys.awk b/Src/Modules/curses_keys.awk
index ffb182c35..25bd63c7e 100644
--- a/Src/Modules/curses_keys.awk
+++ b/Src/Modules/curses_keys.awk
@@ -12,8 +12,13 @@ BEGIN {nkeydefs = 0}
END {
printf("static const struct zcurses_namenumberpair keypad_names[] = {\n")
- for (i = 0; i < 0 + nkeydefs; i++)
+ for (i = 0; i < 0 + nkeydefs; i++) {
+ if (name[i] == "EVENT")
+ printf("#ifdef KEY_EVENT\n")
printf(" {\"%s\", KEY_%s},\n", name[i], name[i])
+ if (name[i] == "EVENT")
+ printf("#endif\n")
+ }
printf(" {NULL, 0}\n")
printf("};\n")
}
++++++ zshrc ++++++
--- /var/tmp/diff_new_pack.exujLj/_old 2020-10-06 17:06:24.737283813 +0200
+++ /var/tmp/diff_new_pack.exujLj/_new 2020-10-06 17:06:24.737283813 +0200
@@ -256,6 +256,7 @@
alias egrep='egrep --color=auto'
alias fgrep='fgrep --color=auto'
alias grep='grep --color=auto'
+alias ip='ip --color=auto'
alias l='ls -alF'
alias la='ls -la'
alias ll='ls -l'
