Hello community, here is the log from the commit of package ibus-pinyin for openSUSE:Factory checked in at 2014-05-02 13:56:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-pinyin (Old) and /work/SRC/openSUSE:Factory/.ibus-pinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-pinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-pinyin/ibus-pinyin.changes 2013-11-24 12:03:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-pinyin.new/ibus-pinyin.changes 2014-05-02 13:56:08.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 29 11:09:49 UTC 2014 - [email protected] + +- Add ibus-pinyin-fixes-lua-compile.patch: fix build with Lua 5.2 + (Fedora). +- Switch BuildRequires to lua-devel. + +------------------------------------------------------------------- New: ---- ibus-pinyin-fixes-lua-compile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-pinyin.spec ++++++ --- /var/tmp/diff_new_pack.HxQnWM/_old 2014-05-02 13:56:09.000000000 +0200 +++ /var/tmp/diff_new_pack.HxQnWM/_new 2014-05-02 13:56:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ibus-pinyin # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,13 +27,15 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz # PATCH-FIX-FEDORA ibus-pinyin-support-set-content-type-method.patch bnc#847718 Patch1: ibus-pinyin-support-set-content-type-method.patch +# PATCH-FIX-FEDORA ibus-pinyin-fixes-lua-compile.patch [email protected] -- fix build with lua 5.2 +Patch2: ibus-pinyin-fixes-lua-compile.patch BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: ibus-devel >= 1.4.99 BuildRequires: intltool BuildRequires: libuuid-devel -BuildRequires: lua51-devel +BuildRequires: lua-devel >= 5.1 BuildRequires: python >= 2.5 BuildRequires: pyzy-devel >= 1.0 BuildRequires: sqlite3 @@ -55,6 +57,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %configure --disable-static \ ++++++ ibus-pinyin-fixes-lua-compile.patch ++++++ >From c42d0a870697e95301deabe0bcb770a68649c81d Mon Sep 17 00:00:00 2001 From: Peng Wu <[email protected]> Date: Wed, 31 Jul 2013 10:53:14 +0800 Subject: [PATCH] fixes lua 5.2 compile --- lua/lua-plugin-init.c | 8 ++++++++ lua/lua-plugin.c | 9 +++++++++ 2 files changed, 17 insertions(+) --- a/lua/lua-plugin-init.c +++ b/lua/lua-plugin-init.c @@ -26,6 +26,17 @@ #include "lua-plugin.h" +#if LUA_VERSION_NUM >= 502 +/* ugly hack for lua 5.2 */ + +#define lua_objlen lua_rawlen +#undef luaL_register +#define luaL_register(L,n,f) \ + { if ((n) == NULL) luaL_setfuncs(L,f,0); else luaL_newlib(L,f); } + +#endif + + static const luaL_Reg lualibs[] = { {"", luaopen_base}, {LUA_TABLIBNAME, luaopen_table}, --- a/lua/lua-plugin.c +++ b/lua/lua-plugin.c @@ -25,6 +25,15 @@ #include "lua-plugin.h" +#if LUA_VERSION_NUM >= 502 +/* ugly hack for lua 5.2 */ + +#define lua_open luaL_newstate + +#define lua_objlen lua_rawlen + +#endif + #define IBUS_ENGINE_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), IBUS_TYPE_ENGINE_PLUGIN, IBusEnginePluginPrivate)) struct _IBusEnginePluginPrivate{ --- a/lua/lmyoslib.c +++ b/lua/lmyoslib.c @@ -19,7 +19,15 @@ #include "lauxlib.h" #include "lualib.h" +#if LUA_VERSION_NUM >= 502 +/* ugly hack for lua 5.2 */ +#define lua_objlen lua_rawlen +#undef luaL_register +#define luaL_register(L,n,f) \ + { if ((n) == NULL) luaL_setfuncs(L,f,0); else luaL_newlib(L,f); } + +#endif /* ** {====================================================== -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
