diff --git a/swig-lua-fix-void-return-for-int-functions.patch b/swig-lua-fix-void-return-for-int-functions.patch new file mode 100644 index 0000000..34fde99 --- /dev/null +++ b/swig-lua-fix-void-return-for-int-functions.patch @@ -0,0 +1,42 @@ +From ea4a4e435f721380555fea039bd5dc758eda43ae Mon Sep 17 00:00:00 2001 +From: Atri +Date: Tue, 1 Oct 2013 01:28:26 +0530 +Subject: [PATCH] Lua: Fix void return for non-void functions + +Commit #c3f3880d caused the functions +SWIGINTERN int SWIG_Lua_add_namespace_details(lua_State* L, +swig_lua_namespace* ns) +and +SWIGINTERN int SWIG_Lua_namespace_register(lua_State* L, +swig_lua_namespace* ns) +to return void when int returns were expected resulting in the build +failures for plplot's lua bindings for example. This commit fixes the +issue. +--- + Lib/lua/luarun.swg | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg +index 4d851bd..8485ed4 100644 +--- a/Lib/lua/luarun.swg ++++ b/Lib/lua/luarun.swg +@@ -524,7 +524,7 @@ SWIGINTERN int SWIG_Lua_add_namespace_details(lua_State* L, swig_lua_namespace* + + /* clear stack - remove metatble */ + lua_pop(L,1); +- ++ return 0; + } + + /* helper function. creates namespace table and add it to module table */ +@@ -555,6 +555,7 @@ SWIGINTERN int SWIG_Lua_namespace_register(lua_State* L, swig_lua_namespace* ns) + + lua_setmetatable(L,-2); /* set metatable */ + lua_rawset(L,-3); /* add namespace to module table */ ++ return 0; + } + /* ----------------------------------------------------------------------------- + * global variable support code: classes +-- +1.8.4 + diff --git a/swig.changes b/swig.changes index d7cd983..0d3ab55 100644 --- a/swig.changes +++ b/swig.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 30 20:18:08 UTC 2013 - badshah400@gmail.com + +- Add swig-lua-fix-void-return-for-int-functions.patch to fix + void returns in non-void functions for its lua binding; patch + submitted upstream (bnc#84331, + https://github.com/swig/swig/issues/93). + ------------------------------------------------------------------- Thu Sep 26 07:04:29 UTC 2013 - kkaempf@suse.com diff --git a/swig.spec b/swig.spec index 865f6f2..2679f9e 100644 --- a/swig.spec +++ b/swig.spec @@ -33,6 +33,8 @@ Patch10: ruby-2.0-encoding-utf8.patch Patch11: 0001-Fix-Ruby-tracking-code-to-use-C-hash.patch # Ruby 1.8.6 (SLE 10) differs in object tracking, kkaempf@suse.de Patch12: ruby-1.8.6-newobject.patch +# PATCH-FIX-UPSTREAM swig-lua-fix-void-return-for-int-functions.patch bnc#843310 badshah400@gmail.com -- Fix functions returning void when int is expected for lua bindings +Patch13: swig-lua-fix-void-return-for-int-functions.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel @@ -138,6 +140,7 @@ understandig SWIG usage. %endif %endif %patch9 +%patch13 -p1 %build %configure --disable-ccache