diff --git a/.gitignore b/.gitignore index 1a847c8..657e0f2 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /ibus-libpinyin-1.15.4.tar.gz /ibus-libpinyin-1.15.5.tar.gz /ibus-libpinyin-1.15.6.tar.gz +/ibus-libpinyin-1.15.7.tar.gz diff --git a/ibus-libpinyin-c89.patch b/ibus-libpinyin-c89.patch deleted file mode 100644 index 96a2863..0000000 --- a/ibus-libpinyin-c89.patch +++ /dev/null @@ -1,28 +0,0 @@ -Lua plugin: Add pointer casts for C89 compatibility - -This addresses a build failure with GCC 14. - -Submitted upstream: - -diff --git a/lua/lua-plugin-init.c b/lua/lua-plugin-init.c -index c6fa9bac806167a4..e6e86ec8c2511a1c 100644 ---- a/lua/lua-plugin-init.c -+++ b/lua/lua-plugin-init.c -@@ -409,7 +409,7 @@ static int ime_utf8_to_utf16(lua_State* L){ - gunichar2 * str = g_utf8_to_utf16(s, l, NULL, &written, NULL); - - /* not includes trailing-zero */ -- luaL_addlstring(&buf, str, written * sizeof(gunichar2)); -+ luaL_addlstring(&buf, (const char *)str, written * sizeof(gunichar2)); - luaL_pushresult(&buf); - - g_free(str); -@@ -419,7 +419,7 @@ static int ime_utf8_to_utf16(lua_State* L){ - - static int ime_utf16_to_utf8(lua_State* L){ - size_t l; -- const gunichar2 * s = luaL_checklstring(L, 1, &l); -+ const gunichar2 * s = (const gunichar2 *)luaL_checklstring(L, 1, &l); - - luaL_Buffer buf; - luaL_buffinit(L, &buf); diff --git a/ibus-libpinyin.spec b/ibus-libpinyin.spec index 8473f7d..12c284a 100644 --- a/ibus-libpinyin.spec +++ b/ibus-libpinyin.spec @@ -1,8 +1,8 @@ %global snapshot 0 Name: ibus-libpinyin -Version: 1.15.6 -Release: 4%{?dist} +Version: 1.15.7 +Release: 1%{?dist} Summary: Intelligent Pinyin engine based on libpinyin for IBus License: GPL-3.0-or-later URL: https://github.com/libpinyin/ibus-libpinyin @@ -10,7 +10,6 @@ Source0: http://downloads.sourceforge.net/libpinyin/ibus-libpinyin/%{name}-%{ %if %snapshot Patch0: ibus-libpinyin-1.15.x-head.patch %endif -Patch1: ibus-libpinyin-c89.patch Requires: python3-gobject Requires: ibus >= 1.5.11 @@ -42,7 +41,6 @@ input method based on libpinyin for IBus. %if %snapshot %patch0 -p1 -b .head %endif -%patch1 -p1 %build %configure --disable-static \ @@ -83,6 +81,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libbopo %{_datadir}/ibus/component/* %changelog +* Thu Feb 1 2024 Peng Wu - 1.15.7-1 +- Update to 1.15.7 +- bug fixes + * Wed Jan 24 2024 Fedora Release Engineering - 1.15.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index a492609..aff9f56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-libpinyin-1.15.6.tar.gz) = 80c0043999fff6718098c9462774ddea6dd4785410d28326bab6dcb304a11af73594a806a2b6483ef5ccc42d79d9a2e95f0b4a29e2e08008de997d4a98e7f62b +SHA512 (ibus-libpinyin-1.15.7.tar.gz) = 084dc38178024ef0d13e2291c2b208c7fe431a7e8c5c4c579205480cae56cdd0076f3c2ce755353a2dc8d8e09141540431c189003a93cb85c598ee64d2947610