SHA256
1
0
forked from pool/neovim

Accepting request 766157 from editors

- Add fix-buf_set_term_title.patch in order to fix build issue.
- Set CFLAGS and CXXFLAGS in order to respect $optflags.

OBS-URL: https://build.opensuse.org/request/show/766157
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neovim?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2020-01-22 21:45:05 +00:00 committed by Git OBS Bridge
commit c598558198
3 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index c5e756905..db41c7007 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -706,7 +706,7 @@ static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
case VTERM_PROP_TITLE: {
buf_T *buf = handle_get_buffer(term->buf_handle);
- buf_set_term_title(buf, val->string);
+ buf_set_term_title(buf, (char*)val->string.str);
break;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 21 20:45:43 UTC 2020 - Martin Liška <mliska@suse.cz>
- Add fix-buf_set_term_title.patch in order to fix build issue.
- Set CFLAGS and CXXFLAGS in order to respect $optflags.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 13 11:42:39 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> Fri Dec 13 11:42:39 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package neovim # spec file for package neovim
# #
# Copyright (c) 2019 SUSE LLC # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,8 @@ Source99: neovim-rpmlintrc
Patch0: neovim.patch Patch0: neovim.patch
# PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mcepl@cepl.eu build with old Lua with external bit module # PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mcepl@cepl.eu build with old Lua with external bit module
Patch1: neovim-0.1.7-bitop.patch Patch1: neovim-0.1.7-bitop.patch
# PATCH-FIX-OPENSUSE fix-buf_set_term_title.patch fixes a different API with libvterm
Patch2: fix-buf_set_term_title.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -92,6 +94,7 @@ parts of Vim, without compromise, and more.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
# Remove __DATE__ and __TIME__. # Remove __DATE__ and __TIME__.
BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}') BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
@ -105,6 +108,8 @@ HOSTNAME=OBS
USERNAME=OBS USERNAME=OBS
mkdir -p build mkdir -p build
pushd build pushd build
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
%{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \ %{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
%ifarch aarch64 ppc64 %ifarch aarch64 ppc64
-DPREFER_LUA=ON \ -DPREFER_LUA=ON \