Hello community,

here is the log from the commit of package swig for openSUSE:Factory checked in 
at 2013-10-02 20:29:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/swig (Old)
 and      /work/SRC/openSUSE:Factory/.swig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "swig"

Changes:
--------
--- /work/SRC/openSUSE:Factory/swig/swig.changes        2013-09-26 
20:02:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.swig.new/swig.changes   2013-10-02 
20:29:03.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Sep 30 20:18:08 UTC 2013 - badshah...@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).
+
+-------------------------------------------------------------------

New:
----
  swig-lua-fix-void-return-for-int-functions.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ swig.spec ++++++
--- /var/tmp/diff_new_pack.SMOKeU/_old  2013-10-02 20:29:04.000000000 +0200
+++ /var/tmp/diff_new_pack.SMOKeU/_new  2013-10-02 20:29:04.000000000 +0200
@@ -33,6 +33,8 @@
 Patch11:        0001-Fix-Ruby-tracking-code-to-use-C-hash.patch
 # Ruby 1.8.6 (SLE 10) differs in object tracking, kkae...@suse.de
 Patch12:        ruby-1.8.6-newobject.patch
+# PATCH-FIX-UPSTREAM swig-lua-fix-void-return-for-int-functions.patch 
bnc#843310 badshah...@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 @@
 %endif
 %endif
 %patch9
+%patch13 -p1
 
 %build
 %configure --disable-ccache

++++++ swig-lua-fix-void-return-for-int-functions.patch ++++++
>From ea4a4e435f721380555fea039bd5dc758eda43ae Mon Sep 17 00:00:00 2001
From: Atri <badshah...@gmail.com>
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

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to