!4 Fix build with lua 5.4

Merge pull request !4 from ultra_planet/master
This commit is contained in:
openeuler-ci-bot 2020-08-08 10:37:05 +08:00 committed by Gitee
commit 3e92e93fc4
2 changed files with 30 additions and 2 deletions

22
fixes-lmyoslib.c.patch Normal file
View File

@ -0,0 +1,22 @@
From f3faeeff3fbe3bf9e30ed4461c2c8d0466966e56 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Mon, 6 Jul 2020 09:59:05 +0800
Subject: [PATCH] fixes lmyoslib.c
---
lua/lmyoslib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lua/lmyoslib.c b/lua/lmyoslib.c
index 868fc56..fc6a24b 100644
--- a/lua/lmyoslib.c
+++ b/lua/lmyoslib.c
@@ -57,7 +57,7 @@ static int getfield (lua_State *L, const char *key, int d) {
res = (int)lua_tointeger(L, -1);
else {
if (d < 0)
- return luaL_error(L, "field " LUA_QS " missing in date table", key);
+ return luaL_error(L, "field '%s' missing in date table", key);
res = d;
}
lua_pop(L, 1);

View File

@ -1,11 +1,14 @@
Name: ibus-libpinyin
Version: 1.10.0
Release: 5
Release: 6
Summary: Intelligent Pinyin engine based on libpinyin for IBus
License: GPLv2+
Group: System Environment/Libraries
URL: https://github.com/libpinyin/ibus-libpinyin
Source0: http://downloads.sourceforge.net/libpinyin/ibus-libpinyin/%{name}-%{version}.tar.gz
Patch0001: fixes-lmyoslib.c.patch
Requires: python3-gobject ibus >= 1.5.11
BuildRequires: gcc-c++ gettext-devel intltool libtool pkgconfig sqlite-devel libuuid-devel lua-devel
BuildRequires: python3-devel desktop-file-utils ibus-devel >= 1.5.11 libpinyin-devel >= 2.1.0
@ -19,7 +22,7 @@ It includes a Chinese Pinyin input method and a Chinese ZhuYin (Bopomofo)
input method based on libpinyin for IBus.
%prep
%autosetup -n %{name}-%{version}
%autosetup -n %{name}-%{version} -p1
%build
%configure --disable-static \
@ -63,5 +66,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/ibus-setup-libbopomof
%{_libexecdir}/ibus-setup-libpinyin
%changelog
* Sat Aug 08 2020 lingsheng <lingsheng@huawei.com> - 1.10.0-6
- Fix build with lua 5.4
* Tue Mar 10 2020 wangzhishun <wangzhishun1@huawei.com> - 1.10.0-5
- Package init