Djam/swig
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/swig.git synced 2025-02-23 17:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New version 3.0.10

Browse source 
Add patch for Octave 4.2 support
This commit is contained in:
Andrey Bondrov 2016-12-29 17:41:37 +10:00
parent 4d3fdd3eb4
commit c7cb27e326
4 changed files with 67 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
swig-3.0.8.tar.gz: 1f45e96219536b3423b8d4dbd03614ffccca9c33
swig-3.0.10.tar.gz: c672b8535394cfb204c70de7c66e69fb20a95647

62
swig-3.0.10-octave.patch Normal file
View file

@ -0,0 +1,62 @@
--- swig-3.0.10/Lib/octave/octopers.swg.orig 2016-12-03 02:02:12.071560260 +0100
+++ swig-3.0.10/Lib/octave/octopers.swg 2016-12-03 02:04:04.883696992 +0100
@@ -25,8 +25,6 @@
// __div__ a / b
// __pow__ a ^ b
// __ldiv__ a \ b
-// __lshift__ a << b
-// __rshift__ a >> b
// __lt__ a < b
// __le__ a <= b
// __eq__ a == b
@@ -51,8 +49,6 @@
%rename(__mul__) *::operator*;
%rename(__div__) *::operator/;
%rename(__mod__) *::operator%;
-%rename(__lshift__) *::operator<<;
-%rename(__rshift__) *::operator>>;
%rename(__el_and__) *::operator&&;
%rename(__el_or__) *::operator||;
%rename(__xor__) *::operator^;
@@ -75,8 +71,6 @@
%ignoreoperator(MULEQ) operator*=;
%ignoreoperator(DIVEQ) operator/=;
%ignoreoperator(MODEQ) operator%=;
-%ignoreoperator(LSHIFTEQ) operator<<=;
-%ignoreoperator(RSHIFTEQ) operator>>=;
%ignoreoperator(ANDEQ) operator&=;
%ignoreoperator(OREQ) operator|=;
%ignoreoperator(XOREQ) operator^=;
--- swig-3.0.10/Lib/octave/octrun.swg.orig 2016-12-03 02:02:17.491662734 +0100
+++ swig-3.0.10/Lib/octave/octrun.swg 2016-12-03 02:04:26.394105259 +0100
@@ -1340,8 +1340,6 @@
swig_binary_op(div);
swig_binary_op(pow);
swig_binary_op(ldiv);
- swig_binary_op(lshift);
- swig_binary_op(rshift);
swig_binary_op(lt);
swig_binary_op(le);
swig_binary_op(eq);
@@ -1371,8 +1369,6 @@
swigreg_binary_op(div);
swigreg_binary_op(pow);
swigreg_binary_op(ldiv);
- swigreg_binary_op(lshift);
- swigreg_binary_op(rshift);
swigreg_binary_op(lt);
swigreg_binary_op(le);
swigreg_binary_op(eq);
--- swig-3.0.10/Lib/octave/octruntime.swg.orig 2016-12-03 02:02:42.242130927 +0100
+++ swig-3.0.10/Lib/octave/octruntime.swg 2016-12-03 02:03:32.933091044 +0100
@@ -9,8 +9,9 @@
#include <octave/ov-scalar.h>
#include <octave/ov-fcn-handle.h>
#include <octave/parse.h>
-#include <octave/toplev.h>
+#include <octave/interpreter.h>
#include <octave/unwind-prot.h>
+#include <octave/call-stack.h>
%}
%insert(runtime) "swigrun.swg";

8
swig.spec
View file

@ -4,14 +4,14 @@
Summary: Simplified Wrapper and Interface Generator (SWIG)
Name: swig
Version: 3.0.8
Release: 2
Version: 3.0.10
Release: 1
Epoch: 1
License: BSD
Group: Development/Other
Url: http://www.swig.org/
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: swig308-Fix-li_boost_array-test.patch
Patch0: swig-3.0.10-octave.patch
BuildRequires: bison
BuildRequires: imake
BuildRequires: libtool
@ -71,7 +71,7 @@ documentation.
%prep
%setup -q
%patch0 -p1 -b .pylib
%patch0 -p1 -b .octave~
%build
./autogen.sh

12
swig308-Fix-li_boost_array-test.patch
View file

@ -1,12 +0,0 @@
diff -up swig-3.0.8/Examples/test-suite/li_boost_array.i.orig swig-3.0.8/Examples/test-suite/li_boost_array.i
--- swig-3.0.8/Examples/test-suite/li_boost_array.i.orig 2016-01-06 08:09:48.851786620 +0100
+++ swig-3.0.8/Examples/test-suite/li_boost_array.i 2016-01-06 08:10:54.028471052 +0100
@@ -31,7 +31,7 @@ namespace boost {
%inline %{
boost::array<int, 6> arrayOutVal() {
- const char carray[] = { -2, -1, 0, 0, 1, 2 };
+ const signed char carray[] = { -2, -1, 0, 0, 1, 2 };
boost::array<int, 6> myarray;
for (size_t i=0; i<6; ++i) {
myarray[i] = carray[i];