Disable all tests on RISC-V (riscv64)

BUILDSTDERR: checking python testcase overload_extend_c java_lib_arrays_dimensionless_wrap.cxx: In function 'jdouble Java_java_1lib_1arrays_1dimensionless_java_1lib_1arrays_1dimensionlessJNI_arr_1ll(JNIEnv*, jclass, jlongArray, jint)': BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:1162:47: error: invalid conversion from 'long long int**' to 'jlong**' {aka 'long int**'} [-fpermissive] BUILDSTDERR: 1162 | if (!SWIG_JavaArrayInLonglong(jenv, &jarr1, (long long **)&arg1, jarg1)) return 0; BUILDSTDERR: | ^~~~~~~~~~~~~~~~~~~ BUILDSTDERR: | | BUILDSTDERR: | long long int** BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:714:74: note: initializing argument 3 of 'int SWIG_JavaArrayInLonglong(JNIEnv*, jlong**, jlong**, jlongArray)' BUILDSTDERR: 714 | static int SWIG_JavaArrayInLonglong (JNIEnv *jenv, jlong **jarr, jlong **carr, jlongArray input) { BUILDSTDERR: | ~~~~~~~~^~~~ BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:1166:45: error: invalid conversion from 'long long int*' to 'jlong*' {aka 'long int*'} [-fpermissive] BUILDSTDERR: 1166 | SWIG_JavaArrayArgoutLonglong(jenv, jarr1, (long long *)arg1, jarg1); BUILDSTDERR: | ^~~~~~~~~~~~~~~~~ BUILDSTDERR: | | BUILDSTDERR: | long long int* BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:735:77: note: initializing argument 3 of 'void SWIG_JavaArrayArgoutLonglong(JNIEnv*, jlong*, jlong*, jlongArray)' BUILDSTDERR: 735 | static void SWIG_JavaArrayArgoutLonglong (JNIEnv *jenv, jlong *jarr, jlong *carr, jlongArray input) { BUILDSTDERR: | ~~~~~~~^~~~ BUILDSTDERR: make[2]: *** [../../../../Examples/Makefile:609: java_cpp] Error 1 BUILDSTDERR: make[1]: *** [Makefile:87: java_lib_arrays_dimensionless.cpptest] Error 2 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Merge remote-tracking branch 'up/master' into master-riscv64
2019-08-21 08:30:18 -07:00 · 2019-08-21 08:28:37 -07:00 · 2019-08-12 14:34:44 +02:00 · 2019-08-07 12:58:20 +02:00 · 2019-07-27 00:42:01 +00:00 · 2019-06-05 15:27:55 +02:00
18 changed files with 2858 additions and 1275 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,4 @@ swig-2.0.0.tar.gz
 /swig-3.0.10.tar.gz
 /swig-3.0.11.tar.gz
 /swig-3.0.12.tar.gz
+/swig-4.0.0.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (swig-3.0.12.tar.gz) = 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb
+SHA512 (swig-4.0.0.tar.gz) = c897b87fb8b21caf8d1bee2c39cb9675a3b0ee047110e808c310a2787f8b89585738726e9f517c64e9d2f1b8311136365c569528f399b444b1081f69689b7165
--- a/swig-3.0.12-Correct-php-testcase.patch
+++ b/swig-3.0.12-Correct-php-testcase.patch
@ -1,26 +0,0 @@
-From 0a9113dcba2930b658cb67f9ba1c63ad8eebd88f Mon Sep 17 00:00:00 2001
-From: William S Fulton <wsf@fultondesigns.co.uk>
-Date: Tue, 19 Sep 2017 07:37:29 +0100
-Subject: [PATCH] Correct php testcase
-
---
- Examples/test-suite/php/preproc_constants_runme.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Examples/test-suite/php/preproc_constants_runme.php b/Examples/test-suite/php/preproc_constants_runme.php
-index ef32867..bd216c2 100644
--- a/Examples/test-suite/php/preproc_constants_runme.php
-+++ b/Examples/test-suite/php/preproc_constants_runme.php
-@@ -61,8 +61,8 @@ check::equal(gettype(preproc_constants::EXPR_OR), "integer", "preproc_constants.
- check::equal(gettype(preproc_constants::EXPR_LAND), "boolean", "preproc_constants.EXPR_LAND has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_LOR), "boolean", "preproc_constants.EXPR_LOR has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants::EXPR_MIXED1), "double", "preproc_constants.EXPR_MIXED1 has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
-check::equal(gettype(preproc_constants::EXPR_MIXED1), "integer", "preproc_constants.EXPR_MIXED1 has unexpected type");
- 
- ?>
-- 
-2.9.5
-
--- a/swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_ConvertF.patch
+++ b/swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_ConvertF.patch
@ -1,58 +0,0 @@
-From 21f532975f59f0c156c76cc739f5a93f57d8f6cb Mon Sep 17 00:00:00 2001
-From: Mark Dufour <m.dufour@kopano.com>
-Date: Tue, 14 Feb 2017 10:48:30 +0100
-Subject: [PATCH] [Coverity] fix issue reported for
- SWIG_Python_ConvertFunctionPtr
-
-Fix Coverity issue reported for SWIG_Python_ConvertFunctionPtr:
-
-"Execution cannot reach this statement: *ptr = vptr;"
-
-Because if 'ty' is null, then desc becomes null and we return with
-SWIG_ERROR. So 'ty' cannot be null at 'if (ty)'.
---
- Lib/python/pyrun.swg | 21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
-index ab1237f62..939a69204 100644
--- a/Lib/python/pyrun.swg
-+++ b/Lib/python/pyrun.swg
-@@ -1287,25 +1287,22 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
-     return SWIG_ConvertPtr(obj, ptr, ty, 0);
-   } else {
-     void *vptr = 0;
-    
-+    swig_cast_info *tc;
-+
-     /* here we get the method pointer for callbacks */
-     const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
-     if (desc)
-       desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
-    if (!desc) 
-+    if (!desc)
-       return SWIG_ERROR;
-    if (ty) {
-      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
-+    tc = SWIG_TypeCheck(desc,ty);
-+    if (tc) {
-+      int newmemory = 0;
-+      *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-+      assert(!newmemory); /* newmemory handling not yet implemented */
-     } else {
-      *ptr = vptr;
-+      return SWIG_ERROR;
-     }
-     return SWIG_OK;
-   }
-- 
-2.14.3
-
--- a/swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_FixMetho.patch
+++ b/swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_FixMetho.patch
@ -1,36 +0,0 @@
-From 9825fcbab5c4ddd867432f9922bebfbec7b78af0 Mon Sep 17 00:00:00 2001
-From: Mark Dufour <m.dufour@kopano.com>
-Date: Tue, 14 Feb 2017 10:34:37 +0100
-Subject: [PATCH] [Coverity] fix issue reported for SWIG_Python_FixMethods
-
-Fix Coverity issue reported for SWIG_Python_FixMethods:
-
-"buffer_size: Calling strncpy with a source string whose length
-(10 chars) is greater than or equal to the size argument (10)
-will fail to null-terminate buff."
-
-The issue is only reported for the "swig_ptr: " line, but for
-consistency we replace both occurrences of strncpy with memcpy.
---
- Lib/python/pyinit.swg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Lib/python/pyinit.swg b/Lib/python/pyinit.swg
-index 2cc582841..fe45ac941 100644
--- a/Lib/python/pyinit.swg
-+++ b/Lib/python/pyinit.swg
-@@ -306,9 +306,9 @@ SWIG_Python_FixMethods(PyMethodDef *methods,
- 	  char *ndoc = (char*)malloc(ldoc + lptr + 10);
- 	  if (ndoc) {
- 	    char *buff = ndoc;
-	    strncpy(buff, methods[i].ml_doc, ldoc);
-+	    memcpy(buff, methods[i].ml_doc, ldoc);
- 	    buff += ldoc;
-	    strncpy(buff, "swig_ptr: ", 10);
-+	    memcpy(buff, "swig_ptr: ", 10);
- 	    buff += 10;
- 	    SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
- 	    methods[i].ml_doc = ndoc;
-- 
-2.14.3
-
--- a/swig-3.0.12-Coverity-fix-issue-reported-for-wrapper-argument-che.patch
+++ b/swig-3.0.12-Coverity-fix-issue-reported-for-wrapper-argument-che.patch
@ -1,41 +0,0 @@
-From 13eeebd2fb3005abc876957c68bde6a92510aa44 Mon Sep 17 00:00:00 2001
-From: Mark Dufour <m.dufour@kopano.com>
-Date: Tue, 14 Feb 2017 10:53:14 +0100
-Subject: [PATCH] [Coverity] fix issue reported for wrapper argument checking
-
-Fix Coverity issue reported for wrapper argument checking:
-
-"Null-checking args suggests that it may be null, but it has already
-been dereferenced on all paths leading to the check."
-
-So 'args' is null checked, but after dereferencing it with
-PyTuple_Check(args).
---
- Source/Modules/python.cxx | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
-index a6801fc4e..5e058e773 100644
--- a/Source/Modules/python.cxx
-+++ b/Source/Modules/python.cxx
-@@ -2541,9 +2541,14 @@ public:
- 
-     if (!fastunpack) {
-       Wrapper_add_local(f, "ii", "Py_ssize_t ii");
-      if (maxargs - (add_self ? 1 : 0) > 0)
-	Append(f->code, "if (!PyTuple_Check(args)) SWIG_fail;\n");
-      Append(f->code, "argc = args ? PyObject_Length(args) : 0;\n");
-+
-+      if (maxargs - (add_self ? 1 : 0) > 0) {
-+        Append(f->code, "if (!PyTuple_Check(args)) SWIG_fail;\n");
-+        Append(f->code, "argc = PyObject_Length(args);\n");
-+      } else {
-+        Append(f->code, "argc = args ? PyObject_Length(args) : 0;\n");
-+      }
-+
-       if (add_self)
- 	Append(f->code, "argv[0] = self;\n");
-       Printf(f->code, "for (ii = 0; (ii < %d) && (ii < argc); ii++) {\n", add_self ? maxargs - 1 : maxargs);
-- 
-2.14.3
-
--- a/swig-3.0.12-Fix-Coverity-issue-reported-for-setslice-pycontainer.patch
+++ b/swig-3.0.12-Fix-Coverity-issue-reported-for-setslice-pycontainer.patch
@ -1,40 +0,0 @@
-From 5803e81d488e97623fe29b8629b977be01a8229e Mon Sep 17 00:00:00 2001
-From: Mark Dufour <m.dufour@kopano.com>
-Date: Mon, 6 Mar 2017 21:16:41 +0100
-Subject: [PATCH] Fix Coverity issue reported for setslice (pycontainer.swg):
-
-"CID 11151 (#3-1 of 3): Using invalid iterator (INVALIDATE_ITERATOR)18.
-increment_iterator: Incrementing iterator it though it is already past
-the end of its container."
-
-Coverity does not understand 'replace_count', so warns that we may go
-past self->end() (or self->rend() I guess).
---
- Lib/python/pycontainer.swg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg
-index d40b0baa8..9aefb4fc7 100644
--- a/Lib/python/pycontainer.swg
-+++ b/Lib/python/pycontainer.swg
-@@ -351,7 +351,7 @@ namespace swig {
-         typename Sequence::const_iterator isit = is.begin();
-         typename Sequence::iterator it = self->begin();
-         std::advance(it,ii);
-        for (size_t rc=0; rc<replacecount; ++rc) {
-+        for (size_t rc=0; rc<replacecount && it != self->end(); ++rc) {
-           *it++ = *isit++;
-           for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
-             it++;
-@@ -367,7 +367,7 @@ namespace swig {
-       typename Sequence::const_iterator isit = is.begin();
-       typename Sequence::reverse_iterator it = self->rbegin();
-       std::advance(it,size-ii-1);
-      for (size_t rc=0; rc<replacecount; ++rc) {
-+      for (size_t rc=0; rc<replacecount && it != self->rend(); ++rc) {
-         *it++ = *isit++;
-         for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
-           it++;
-- 
-2.14.3
-
--- a/swig-3.0.12-Fix-generated-code-for-constant-expressions-containi.patch
+++ b/swig-3.0.12-Fix-generated-code-for-constant-expressions-containi.patch
@ -1,191 +0,0 @@
-From 90ba174fcea1618af57aa594199541d47a89b7f6 Mon Sep 17 00:00:00 2001
-From: William S Fulton <wsf@fultondesigns.co.uk>
-Date: Sun, 17 Sep 2017 19:02:55 +0100
-Subject: [PATCH 1/2] Fix generated code for constant expressions containing
- wchar_t L literals.
-
-Such as:
-  # define __WCHAR_MAX    (0x7fffffff + L'\0')
-
-Reported on swig-user mailing list.
---
- CHANGES.current                                         | 5 +++++
- Examples/test-suite/csharp/preproc_constants_c_runme.cs | 3 ++-
- Examples/test-suite/csharp/preproc_constants_runme.cs   | 2 ++
- Examples/test-suite/d/preproc_constants_c_runme.1.d     | 2 ++
- Examples/test-suite/d/preproc_constants_c_runme.2.d     | 2 ++
- Examples/test-suite/d/preproc_constants_runme.1.d       | 2 ++
- Examples/test-suite/d/preproc_constants_runme.2.d       | 2 ++
- Examples/test-suite/php/preproc_constants_c_runme.php   | 2 ++
- Examples/test-suite/php/preproc_constants_runme.php     | 2 ++
- Examples/test-suite/php5/preproc_constants_c_runme.php  | 2 ++
- Examples/test-suite/php5/preproc_constants_runme.php    | 2 ++
- Examples/test-suite/preproc_constants.i                 | 3 +++
- Source/CParse/parser.y                                  | 2 +-
- 13 files changed, 29 insertions(+), 2 deletions(-)
-
-#diff --git a/CHANGES.current b/CHANGES.current
-#index 1e4a244..b455a9f 100644
-#--- a/CHANGES.current
-#+++ b/CHANGES.current
-#@@ -7,6 +7,11 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
-# Version 4.0.0 (in progress)
-# ===========================
-# 
-#+2017-09-17: wsfulton
-#+            Fix generated code for constant expressions containing wchar_t L literals such as:
-#+              # define __WCHAR_MAX    (0x7fffffff + L'\0')
-#+              # define __WCHAR_MIN    (-__WCHAR_MAX - 1)
-#+
-# 2017-09-10: mlamarre
-#             [Python] Patch #1083. Define_DEBUG to 1 to do exactly like Visual Studio
-#             /LDd, /MDd or /MTd compiler options.
-diff --git a/Examples/test-suite/csharp/preproc_constants_c_runme.cs b/Examples/test-suite/csharp/preproc_constants_c_runme.cs
-index 76c684d..1c28e49 100644
--- a/Examples/test-suite/csharp/preproc_constants_c_runme.cs
-+++ b/Examples/test-suite/csharp/preproc_constants_c_runme.cs
-@@ -61,7 +61,8 @@ public class runme {
-     assert( typeof(int) == preproc_constants_c.EXPR_LAND.GetType() );
-     assert( typeof(int) == preproc_constants_c.EXPR_LOR.GetType() );
-     assert( typeof(double) == preproc_constants_c.EXPR_CONDITIONAL.GetType() );
-
-+    assert( typeof(int) == preproc_constants_c.EXPR_WCHAR_MAX.GetType() );
-+    assert( typeof(int) == preproc_constants_c.EXPR_WCHAR_MIN.GetType() );
-   }
-   static void assert(bool assertion) {
-     if (!assertion)
-diff --git a/Examples/test-suite/csharp/preproc_constants_runme.cs b/Examples/test-suite/csharp/preproc_constants_runme.cs
-index 9fae591..6b02e30 100644
--- a/Examples/test-suite/csharp/preproc_constants_runme.cs
-+++ b/Examples/test-suite/csharp/preproc_constants_runme.cs
-@@ -60,6 +60,8 @@ public class runme {
-     assert( typeof(bool) == preproc_constants.EXPR_LAND.GetType() );
-     assert( typeof(bool) == preproc_constants.EXPR_LOR.GetType() );
-     assert( typeof(double) == preproc_constants.EXPR_CONDITIONAL.GetType() );
-+    assert( typeof(int) == preproc_constants.EXPR_WCHAR_MAX.GetType() );
-+    assert( typeof(int) == preproc_constants.EXPR_WCHAR_MIN.GetType() );
- 
-   }
-   static void assert(bool assertion) {
-diff --git a/Examples/test-suite/d/preproc_constants_c_runme.1.d b/Examples/test-suite/d/preproc_constants_c_runme.1.d
-index d846c71..2b349af 100644
--- a/Examples/test-suite/d/preproc_constants_c_runme.1.d
-+++ b/Examples/test-suite/d/preproc_constants_c_runme.1.d
-@@ -61,4 +61,6 @@ void main() {
-   static assert(is(int == typeof(EXPR_LAND())));
-   static assert(is(int == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/d/preproc_constants_c_runme.2.d b/Examples/test-suite/d/preproc_constants_c_runme.2.d
-index 9bdbb93..1bac525 100644
--- a/Examples/test-suite/d/preproc_constants_c_runme.2.d
-+++ b/Examples/test-suite/d/preproc_constants_c_runme.2.d
-@@ -61,4 +61,6 @@ void main() {
-   static assert(is(int == typeof(EXPR_LAND())));
-   static assert(is(int == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/d/preproc_constants_runme.1.d b/Examples/test-suite/d/preproc_constants_runme.1.d
-index 009405f..f743f48 100644
--- a/Examples/test-suite/d/preproc_constants_runme.1.d
-+++ b/Examples/test-suite/d/preproc_constants_runme.1.d
-@@ -60,4 +60,6 @@ void main() {
-   static assert(is(bool == typeof(EXPR_LAND())));
-   static assert(is(bool == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/d/preproc_constants_runme.2.d b/Examples/test-suite/d/preproc_constants_runme.2.d
-index 2d92ef0..0d96c37 100644
--- a/Examples/test-suite/d/preproc_constants_runme.2.d
-+++ b/Examples/test-suite/d/preproc_constants_runme.2.d
-@@ -60,4 +60,6 @@ void main() {
-   static assert(is(bool == typeof(EXPR_LAND())));
-   static assert(is(bool == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-+  static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/php/preproc_constants_c_runme.php b/Examples/test-suite/php/preproc_constants_c_runme.php
-index af9b76e..e59fe18 100644
--- a/Examples/test-suite/php/preproc_constants_c_runme.php
-+++ b/Examples/test-suite/php/preproc_constants_c_runme.php
-@@ -62,5 +62,7 @@ check::equal(gettype(preproc_constants_c::EXPR_OR), "integer", "preproc_constant
- check::equal(gettype(preproc_constants_c::EXPR_LAND), "integer", "preproc_constants.EXPR_LAND has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_LOR), "integer", "preproc_constants.EXPR_LOR has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
-+check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
- 
- ?>
-diff --git a/Examples/test-suite/php/preproc_constants_runme.php b/Examples/test-suite/php/preproc_constants_runme.php
-index 5c9119b..8e117ea 100644
--- a/Examples/test-suite/php/preproc_constants_runme.php
-+++ b/Examples/test-suite/php/preproc_constants_runme.php
-@@ -61,5 +61,7 @@ check::equal(gettype(preproc_constants::EXPR_OR), "integer", "preproc_constants.
- check::equal(gettype(preproc_constants::EXPR_LAND), "boolean", "preproc_constants.EXPR_LAND has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_LOR), "boolean", "preproc_constants.EXPR_LOR has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
-+check::equal(gettype(preproc_constants::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
- 
- ?>
-diff --git a/Examples/test-suite/php5/preproc_constants_c_runme.php b/Examples/test-suite/php5/preproc_constants_c_runme.php
-index 1ea0195..d978fab 100644
--- a/Examples/test-suite/php5/preproc_constants_c_runme.php
-+++ b/Examples/test-suite/php5/preproc_constants_c_runme.php
-@@ -62,5 +62,7 @@ check::equal(gettype(preproc_constants_c::EXPR_OR), "integer", "preproc_constant
- check::equal(gettype(preproc_constants_c::EXPR_LAND), "integer", "preproc_constants.EXPR_LAND has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_LOR), "integer", "preproc_constants.EXPR_LOR has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
-+check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
- 
- ?>
-diff --git a/Examples/test-suite/php5/preproc_constants_runme.php b/Examples/test-suite/php5/preproc_constants_runme.php
-index fb9ee4f..7527026 100644
--- a/Examples/test-suite/php5/preproc_constants_runme.php
-+++ b/Examples/test-suite/php5/preproc_constants_runme.php
-@@ -70,5 +70,7 @@ check::equal(gettype(preproc_constants::EXPR_LAND), "integer", "preproc_constant
- check::equal(gettype(preproc_constants::EXPR_LOR), "integer", "preproc_constants.EXPR_LOR has unexpected type");
- 
- check::equal(gettype(preproc_constants::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
-+check::equal(gettype(preproc_constants::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
- 
- ?>
-diff --git a/Examples/test-suite/preproc_constants.i b/Examples/test-suite/preproc_constants.i
-index 3a999ad..16b44c9 100644
--- a/Examples/test-suite/preproc_constants.i
-+++ b/Examples/test-suite/preproc_constants.i
-@@ -87,6 +87,9 @@
- #define EXPR_LOR         0xFF || 1
- #define EXPR_CONDITIONAL true ? 2 : 2.2
- 
-+#define EXPR_WCHAR_MAX   (0x7fffffff + L'\0')
-+#define EXPR_WCHAR_MIN   (-EXPR_WCHAR_MAX - 1)
-+
- #define EXPR_CHAR_COMPOUND_ADD 'A' + 12
- #define EXPR_CHAR_COMPOUND_LSHIFT 'B' << 6
- #define H_SUPPRESS_SCALING_MAGIC (('s'<<24) | ('u'<<16) | ('p'<<8) | 'p')
-diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
-index 2e92cd0..273dadb 100644
--- a/Source/CParse/parser.y
-+++ b/Source/CParse/parser.y
-@@ -194,7 +194,7 @@ int SWIG_cparse_template_reduce(int treduce) {
-  * ----------------------------------------------------------------------------- */
- 
- static int promote_type(int t) {
-  if (t <= T_UCHAR || t == T_CHAR) return T_INT;
-+  if (t <= T_UCHAR || t == T_CHAR || t == T_WCHAR) return T_INT;
-   return t;
- }
- 
-- 
-2.9.5
-
--- a/swig-3.0.12-Fix-go-version-matching-in-configure-for-go1.10.patch
+++ b/swig-3.0.12-Fix-go-version-matching-in-configure-for-go1.10.patch
@ -1,51 +0,0 @@
-From 5f6012039abb6ec9e9dfea801effa6b02fd102bc Mon Sep 17 00:00:00 2001
-From: Vsevolod Kvachev <rasielll@gmail.com>
-Date: Thu, 19 Apr 2018 23:04:37 +0300
-Subject: [PATCH] Fix go version matching in configure for go1.10
-
---
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 833cb37bf..ba1631743 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -2597,7 +2597,7 @@ else
-     GOVERSIONOPTION=version
-     go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
-     case "$go_version" in
-    go1 | go1.[[01234]]*)
-+    go1 | go1.[[01234]] | go1.[[01234]].*)
-       GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
-       ;;
-     *)
-@@ -2606,7 +2606,7 @@ else
-     esac
-     AC_MSG_CHECKING([whether go version is too old])
-     case $go_version in
-    go1.1* | go1.0* | go1 )
-+    go1.1.* | go1.1 | go1.0 | go1.0.* | go1 )
-       AC_MSG_RESULT([yes - minimum version is 1.2])
-       GO=
-       GOOPT="-intgosize 32"
-@@ -2624,13 +2624,13 @@ else
-       ;;
-     esac
-     case $go_version in
-    go1.0* | go1 | go1.1*)
-+    go1.0 | go1.0.* | go1 | go1.1 | go1.1.*)
-       GOOPT="$GOOPT -use-shlib"
-       ;;
-    go1.2*)
-+    go1.2 | go1.2.*)
-       GO12=true
-       ;;
-    go1.3* | go1.4*)
-+    go1.3 | go1.3.* | go1.4 | go1.4.*)
-       GO13=true
-       ;;
-     *)
-- 
-2.14.3
-
--- a/swig-3.0.12-Fix-testsuite-to-work-without-.-in-INC.patch
+++ b/swig-3.0.12-Fix-testsuite-to-work-without-.-in-INC.patch
@ -1,61 +0,0 @@
-From 8855ef2b482c09da9255079b0fac92d08c8308fb Mon Sep 17 00:00:00 2001
-From: Olly Betts <olly@survex.com>
-Date: Tue, 13 Jun 2017 17:32:37 +1200
-Subject: [PATCH] [Perl] Fix testsuite to work without . in @INC
-
-"." was removed from @INC in Perl 5.26 for security reasons, and has
-also been removed from older versions in some distros.
-
-Fixes https://github.com/swig/swig/issues/997 reported by lfam.
---
- CHANGES.current                            | 6 ++++++
- Examples/Makefile.in                       | 2 +-
- Examples/test-suite/perl5/run-perl-test.pl | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-#diff --git a/CHANGES.current b/CHANGES.current
-#index ac620c9..6b379a9 100644
-#--- a/CHANGES.current
-#+++ b/CHANGES.current
-#@@ -7,6 +7,12 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
-# Version 4.0.0 (in progress)
-# ===========================
-# 
-#+2017-06-13: olly
-#+	    [Perl] Fix testsuite to work without . in @INC - it was removed in
-#+	    Perl 5.26 for security reasons, and has also been removed from
-#+	    older versions in some distros.  Fixes
-#+	    https://github.com/swig/swig/issues/997 reported by lfam.
-#+
-# 2017-06-03: wsfulton
-#             Fix %import on a file containing a file scope %fragment forced inclusion to not
-#             generate the fragment contents as %import should not result in code being generated.
-diff --git a/Examples/Makefile.in b/Examples/Makefile.in
-index 7682b56..8a88fb5 100644
--- a/Examples/Makefile.in
-+++ b/Examples/Makefile.in
-@@ -282,7 +282,7 @@ perl5_static_cpp: $(SRCDIR_SRCS)
- # -----------------------------------------------------------------
- 
- perl5_run:
-	$(RUNTOOL) $(PERL) $(PERL5_SCRIPT) $(RUNPIPE)
-+	$(RUNTOOL) $(PERL) -I. $(PERL5_SCRIPT) $(RUNPIPE)
- 
- # -----------------------------------------------------------------
- # Version display
-diff --git a/Examples/test-suite/perl5/run-perl-test.pl b/Examples/test-suite/perl5/run-perl-test.pl
-index 106bf00..5ea4e511 100644
--- a/Examples/test-suite/perl5/run-perl-test.pl
-+++ b/Examples/test-suite/perl5/run-perl-test.pl
-@@ -7,7 +7,7 @@ use strict;
- 
- my $command = shift @ARGV;
- 
-my $output = `$^X $command 2>&1`;
-+my $output = `$^X -I. $command 2>&1`;
- 
- die "SWIG Perl test failed: \n\n$output\n"
-   if $?;
-- 
-2.9.4
-
--- a/swig-3.0.12-Fix-type-promotion-wrapping-some-non-trivial-constan.patch
+++ b/swig-3.0.12-Fix-type-promotion-wrapping-some-non-trivial-constan.patch
@ -1,185 +0,0 @@
-From 9e2a12416cf6ce7b926829aff353fe2d9019f135 Mon Sep 17 00:00:00 2001
-From: William S Fulton <wsf@fultondesigns.co.uk>
-Date: Mon, 18 Sep 2017 07:06:27 +0100
-Subject: [PATCH 2/2] Fix type promotion wrapping some non-trivial constant
- expressions
-
-This was previously an integral type instead of a floating point type:
---
- CHANGES.current                                         | 5 +++++
- Examples/test-suite/csharp/preproc_constants_c_runme.cs | 1 +
- Examples/test-suite/csharp/preproc_constants_runme.cs   | 1 +
- Examples/test-suite/d/preproc_constants_c_runme.1.d     | 1 +
- Examples/test-suite/d/preproc_constants_c_runme.2.d     | 1 +
- Examples/test-suite/d/preproc_constants_runme.1.d       | 1 +
- Examples/test-suite/d/preproc_constants_runme.2.d       | 1 +
- Examples/test-suite/php/preproc_constants_c_runme.php   | 1 +
- Examples/test-suite/php/preproc_constants_runme.php     | 1 +
- Examples/test-suite/php5/preproc_constants_c_runme.php  | 1 +
- Examples/test-suite/php5/preproc_constants_runme.php    | 1 +
- Examples/test-suite/preproc_constants.i                 | 1 +
- Source/CParse/parser.y                                  | 1 +
- 13 files changed, 17 insertions(+)
-
-#diff --git a/CHANGES.current b/CHANGES.current
-#index b455a9f..f76e5a5 100644
-#--- a/CHANGES.current
-#+++ b/CHANGES.current
-#@@ -7,6 +7,11 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
-# Version 4.0.0 (in progress)
-# ===========================
-# 
-#+2017-09-18: wsfulton
-#+            Fix type promotion wrapping constant expressions of the form:
-#+              # define EXPR_MIXED1    (0x80 + 11.1) - 1
-#+            This was previously an integral type instead of a floating point type.
-#+
-# 2017-09-17: wsfulton
-#             Fix generated code for constant expressions containing wchar_t L literals such as:
-#               # define __WCHAR_MAX    (0x7fffffff + L'\0')
-diff --git a/Examples/test-suite/csharp/preproc_constants_c_runme.cs b/Examples/test-suite/csharp/preproc_constants_c_runme.cs
-index 1c28e49..7f40ce4 100644
--- a/Examples/test-suite/csharp/preproc_constants_c_runme.cs
-+++ b/Examples/test-suite/csharp/preproc_constants_c_runme.cs
-@@ -61,6 +61,7 @@ public class runme {
-     assert( typeof(int) == preproc_constants_c.EXPR_LAND.GetType() );
-     assert( typeof(int) == preproc_constants_c.EXPR_LOR.GetType() );
-     assert( typeof(double) == preproc_constants_c.EXPR_CONDITIONAL.GetType() );
-+    assert( typeof(double) == preproc_constants_c.EXPR_MIXED1.GetType() );
-     assert( typeof(int) == preproc_constants_c.EXPR_WCHAR_MAX.GetType() );
-     assert( typeof(int) == preproc_constants_c.EXPR_WCHAR_MIN.GetType() );
-   }
-diff --git a/Examples/test-suite/csharp/preproc_constants_runme.cs b/Examples/test-suite/csharp/preproc_constants_runme.cs
-index 6b02e30..0d8981f 100644
--- a/Examples/test-suite/csharp/preproc_constants_runme.cs
-+++ b/Examples/test-suite/csharp/preproc_constants_runme.cs
-@@ -60,6 +60,7 @@ public class runme {
-     assert( typeof(bool) == preproc_constants.EXPR_LAND.GetType() );
-     assert( typeof(bool) == preproc_constants.EXPR_LOR.GetType() );
-     assert( typeof(double) == preproc_constants.EXPR_CONDITIONAL.GetType() );
-+    assert( typeof(double) == preproc_constants.EXPR_MIXED1.GetType() );
-     assert( typeof(int) == preproc_constants.EXPR_WCHAR_MAX.GetType() );
-     assert( typeof(int) == preproc_constants.EXPR_WCHAR_MIN.GetType() );
- 
-diff --git a/Examples/test-suite/d/preproc_constants_c_runme.1.d b/Examples/test-suite/d/preproc_constants_c_runme.1.d
-index 2b349af..b79ee3b 100644
--- a/Examples/test-suite/d/preproc_constants_c_runme.1.d
-+++ b/Examples/test-suite/d/preproc_constants_c_runme.1.d
-@@ -61,6 +61,7 @@ void main() {
-   static assert(is(int == typeof(EXPR_LAND())));
-   static assert(is(int == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(double == typeof(EXPR_MIXED1())));
-   static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-   static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/d/preproc_constants_c_runme.2.d b/Examples/test-suite/d/preproc_constants_c_runme.2.d
-index 1bac525..260bf8d 100644
--- a/Examples/test-suite/d/preproc_constants_c_runme.2.d
-+++ b/Examples/test-suite/d/preproc_constants_c_runme.2.d
-@@ -61,6 +61,7 @@ void main() {
-   static assert(is(int == typeof(EXPR_LAND())));
-   static assert(is(int == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(double == typeof(EXPR_MIXED1())));
-   static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-   static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/d/preproc_constants_runme.1.d b/Examples/test-suite/d/preproc_constants_runme.1.d
-index f743f48..84a99c8 100644
--- a/Examples/test-suite/d/preproc_constants_runme.1.d
-+++ b/Examples/test-suite/d/preproc_constants_runme.1.d
-@@ -60,6 +60,7 @@ void main() {
-   static assert(is(bool == typeof(EXPR_LAND())));
-   static assert(is(bool == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(double == typeof(EXPR_MIXED1())));
-   static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-   static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/d/preproc_constants_runme.2.d b/Examples/test-suite/d/preproc_constants_runme.2.d
-index 0d96c37..f6638f4 100644
--- a/Examples/test-suite/d/preproc_constants_runme.2.d
-+++ b/Examples/test-suite/d/preproc_constants_runme.2.d
-@@ -60,6 +60,7 @@ void main() {
-   static assert(is(bool == typeof(EXPR_LAND())));
-   static assert(is(bool == typeof(EXPR_LOR())));
-   static assert(is(double == typeof(EXPR_CONDITIONAL())));
-+  static assert(is(double == typeof(EXPR_MIXED1())));
-   static assert(is(int == typeof(EXPR_WCHAR_MAX())));
-   static assert(is(int == typeof(EXPR_WCHAR_MIN())));
- }
-diff --git a/Examples/test-suite/php/preproc_constants_c_runme.php b/Examples/test-suite/php/preproc_constants_c_runme.php
-index e59fe18..20868dc 100644
--- a/Examples/test-suite/php/preproc_constants_c_runme.php
-+++ b/Examples/test-suite/php/preproc_constants_c_runme.php
-@@ -62,6 +62,7 @@ check::equal(gettype(preproc_constants_c::EXPR_OR), "integer", "preproc_constant
- check::equal(gettype(preproc_constants_c::EXPR_LAND), "integer", "preproc_constants.EXPR_LAND has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_LOR), "integer", "preproc_constants.EXPR_LOR has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants_c::EXPR_MIXED1), "double", "preproc_constants.EXPR_MIXED1 has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
- 
-diff --git a/Examples/test-suite/php/preproc_constants_runme.php b/Examples/test-suite/php/preproc_constants_runme.php
-index 8e117ea..ef32867 100644
--- a/Examples/test-suite/php/preproc_constants_runme.php
-+++ b/Examples/test-suite/php/preproc_constants_runme.php
-@@ -63,5 +63,6 @@ check::equal(gettype(preproc_constants::EXPR_LOR), "boolean", "preproc_constants
- check::equal(gettype(preproc_constants::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
-+check::equal(gettype(preproc_constants::EXPR_MIXED1), "integer", "preproc_constants.EXPR_MIXED1 has unexpected type");
- 
- ?>
-diff --git a/Examples/test-suite/php5/preproc_constants_c_runme.php b/Examples/test-suite/php5/preproc_constants_c_runme.php
-index d978fab..d55d423 100644
--- a/Examples/test-suite/php5/preproc_constants_c_runme.php
-+++ b/Examples/test-suite/php5/preproc_constants_c_runme.php
-@@ -62,6 +62,7 @@ check::equal(gettype(preproc_constants_c::EXPR_OR), "integer", "preproc_constant
- check::equal(gettype(preproc_constants_c::EXPR_LAND), "integer", "preproc_constants.EXPR_LAND has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_LOR), "integer", "preproc_constants.EXPR_LOR has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants_c::EXPR_MIXED1), "double", "preproc_constants.EXPR_MIXED1 has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
- check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
- 
-diff --git a/Examples/test-suite/php5/preproc_constants_runme.php b/Examples/test-suite/php5/preproc_constants_runme.php
-index 7527026..01137b0 100644
--- a/Examples/test-suite/php5/preproc_constants_runme.php
-+++ b/Examples/test-suite/php5/preproc_constants_runme.php
-@@ -70,6 +70,7 @@ check::equal(gettype(preproc_constants::EXPR_LAND), "integer", "preproc_constant
- check::equal(gettype(preproc_constants::EXPR_LOR), "integer", "preproc_constants.EXPR_LOR has unexpected type");
- 
- check::equal(gettype(preproc_constants::EXPR_CONDITIONAL), "double", "preproc_constants.EXPR_CONDITIONAL has unexpected type");
-+check::equal(gettype(preproc_constants::EXPR_MIXED1), "double", "preproc_constants.EXPR_MIXED1 has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
- check::equal(gettype(preproc_constants::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
- 
-diff --git a/Examples/test-suite/preproc_constants.i b/Examples/test-suite/preproc_constants.i
-index 16b44c9..628cae1 100644
--- a/Examples/test-suite/preproc_constants.i
-+++ b/Examples/test-suite/preproc_constants.i
-@@ -86,6 +86,7 @@
- #define EXPR_LAND        0xFF && 1
- #define EXPR_LOR         0xFF || 1
- #define EXPR_CONDITIONAL true ? 2 : 2.2
-+#define EXPR_MIXED1      (0x80 + 11.1) - 1
- 
- #define EXPR_WCHAR_MAX   (0x7fffffff + L'\0')
- #define EXPR_WCHAR_MIN   (-EXPR_WCHAR_MAX - 1)
-diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
-index 273dadb..3df9896 100644
--- a/Source/CParse/parser.y
-+++ b/Source/CParse/parser.y
-@@ -6338,6 +6338,7 @@ valexpr        : exprnum { $$ = $1; }
- 		       break;
- 		   }
- 		 }
-+		 $$.type = promote($2.type, $4.type);
-  	       }
-                | LPAREN expr pointer RPAREN expr %prec CAST {
-                  $$ = $5;
-- 
-2.9.5
-
--- a/swig-node-v7.patch
+++ b/swig-node-v7.patch
@ -1,541 +0,0 @@
-From f08d7a63a92a3ba89d97bdfcc206e1e1c4804c0f Mon Sep 17 00:00:00 2001
-From: Patrick Schneider <patrick.schneider@meetnow.eu>
-Date: Thu, 13 Apr 2017 15:02:53 +0200
-Subject: [PATCH 1/2] Add Node 7.x aka V8 5.2+ support
-
-* Use WeakCallbackInfo instead of WeakCallbackData
-* Use GetPrivate instead of GetHiddenValue
-* Adopted new signature for SetWeak to support destructor calling
-* SetAccessor deprecation fixed
-* Proper version checks where applicable
---
- Lib/javascript/v8/javascriptcode.swg    | 27 +++++++++++++++++-----
- Lib/javascript/v8/javascripthelpers.swg | 29 +++++++++++++++++++++---
- Lib/javascript/v8/javascriptinit.swg    | 16 +++++++++++--
- Lib/javascript/v8/javascriptrun.swg     | 40 ++++++++++++++++++++++++++++-----
- 4 files changed, 95 insertions(+), 17 deletions(-)
-
-diff --git a/Lib/javascript/v8/javascriptcode.swg b/Lib/javascript/v8/javascriptcode.swg
-index fb7d55c2ad..b8c5089816 100644
--- a/Lib/javascript/v8/javascriptcode.swg
-+++ b/Lib/javascript/v8/javascriptcode.swg
-@@ -133,10 +133,13 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
-   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SWIGV8_Proxy *proxy) {
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
- static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-   v8::Local<v8::Object> object = data.GetValue();
-   SWIGV8_Proxy *proxy = data.GetParameter();
-+#else
-+  static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
-+  SWIGV8_Proxy *proxy = data.GetParameter();
- #endif
- 
-   if(proxy->swigCMemOwn && proxy->swigCObject) {
-@@ -147,7 +150,9 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
-   }
-   delete proxy;
- 
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   object.Clear();
-+#endif
-   
- #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-   object.Dispose();
-@@ -155,7 +160,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
-   object.Dispose(isolate);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-   object->Dispose(isolate);
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   object->Dispose();
- #endif
- }
-@@ -177,10 +182,13 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
-   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- static void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object> *object, SWIGV8_Proxy *proxy) {
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
- static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-   v8::Local<v8::Object> object = data.GetValue();
-   SWIGV8_Proxy *proxy = data.GetParameter();
-+#else
-+static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
-+  SWIGV8_Proxy *proxy = data.GetParameter();
- #endif
- 
-   if(proxy->swigCMemOwn && proxy->swigCObject) {
-@@ -197,7 +205,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
-   object->Dispose(isolate);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   object->Dispose();
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   object.Clear();
- #endif
- }
-@@ -211,7 +219,11 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
-  * ----------------------------------------------------------------------------- */
- %fragment("js_getter", "templates")
- %{
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
- static SwigV8ReturnValue $jswrapper(v8::Local<v8::String> property, const SwigV8PropertyCallbackInfo &info) {
-+#else
-+static SwigV8ReturnValue $jswrapper(v8::Local<v8::Name> property, const SwigV8PropertyCallbackInfo &info) {
-+#endif
-   SWIGV8_HANDLESCOPE();
-   
-   v8::Handle<v8::Value> jsresult;
-@@ -233,8 +245,11 @@ fail:
-  * ----------------------------------------------------------------------------- */
- %fragment("js_setter", "templates")
- %{
-static void $jswrapper(v8::Local<v8::String> property, v8::Local<v8::Value> value,
-  const SwigV8PropertyCallbackInfoVoid &info) {
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+static void $jswrapper(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
-+#else
-+static void $jswrapper(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
-+#endif
-   SWIGV8_HANDLESCOPE();
-   
-   $jslocals
-diff --git a/Lib/javascript/v8/javascripthelpers.swg b/Lib/javascript/v8/javascripthelpers.swg
-index 091467df4d..74610793af 100644
--- a/Lib/javascript/v8/javascripthelpers.swg
-+++ b/Lib/javascript/v8/javascripthelpers.swg
-@@ -6,11 +6,16 @@ typedef v8::InvocationCallback  SwigV8FunctionCallback;
- typedef v8::AccessorGetter      SwigV8AccessorGetterCallback;
- typedef v8::AccessorSetter      SwigV8AccessorSetterCallback;
- typedef v8::AccessorInfo        SwigV8PropertyCallbackInfoVoid;
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
- typedef v8::FunctionCallback            SwigV8FunctionCallback;
- typedef v8::AccessorGetterCallback      SwigV8AccessorGetterCallback;
- typedef v8::AccessorSetterCallback      SwigV8AccessorSetterCallback;
- typedef v8::PropertyCallbackInfo<void>  SwigV8PropertyCallbackInfoVoid;
-+#else
-+typedef v8::FunctionCallback            SwigV8FunctionCallback;
-+typedef v8::AccessorNameGetterCallback  SwigV8AccessorGetterCallback;
-+typedef v8::AccessorNameSetterCallback  SwigV8AccessorSetterCallback;
-+typedef v8::PropertyCallbackInfo<void>  SwigV8PropertyCallbackInfoVoid;
- #endif
- 
- /**
-@@ -65,18 +70,36 @@ SWIGRUNTIME void SWIGV8_AddStaticFunction(v8::Handle<v8::Object> obj, const char
-  */
- SWIGRUNTIME void SWIGV8_AddStaticVariable(v8::Handle<v8::Object> obj, const char* symbol,
-   SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) {
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   obj->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter);
-+#else
-+  obj->SetAccessor(SWIGV8_CURRENT_CONTEXT(), SWIGV8_SYMBOL_NEW(symbol), getter, setter);
-+#endif
- }
- 
-SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::String> property, v8::Local<v8::Value> value,
-  const SwigV8PropertyCallbackInfoVoid& info)
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
-+#else
-+SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
-+#endif
- {
-     char buffer[256];
-     char msg[512];
-     int res;
- 
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-     property->WriteUtf8(buffer, 256);
-     res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
-+#else
-+    v8::Local<v8::String> sproperty;
-+    if (property->ToString(SWIGV8_CURRENT_CONTEXT()).ToLocal(&sproperty)) {
-+      sproperty->WriteUtf8(buffer, 256);
-+      res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
-+    }
-+    else {
-+      res = -1;
-+    }
-+#endif
- 
-     if(res<0) {
-       SWIG_exception(SWIG_ERROR, "Tried to write read-only variable.");
-diff --git a/Lib/javascript/v8/javascriptinit.swg b/Lib/javascript/v8/javascriptinit.swg
-index 34befa7ce7..86008d927f 100644
--- a/Lib/javascript/v8/javascriptinit.swg
-+++ b/Lib/javascript/v8/javascriptinit.swg
-@@ -7,15 +7,27 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
-   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
-   v8::Local<v8::External> mod = SWIGV8_EXTERNAL_NEW(swig_module);
-   assert(!mod.IsEmpty());
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   global_obj->SetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"), mod);
-+#else
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
-+  global_obj->SetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey, mod);
-+#endif
- }
- 
- SWIGRUNTIME swig_module_info *
- SWIG_V8_GetModule(void *) {
-   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   v8::Local<v8::Value> moduleinfo = global_obj->GetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"));
-+#else
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
-+  v8::Local<v8::Value> moduleinfo;
-+  if (!global_obj->GetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey).ToLocal(&moduleinfo))
-+    return 0;
-+#endif
- 
-  if (moduleinfo.IsEmpty())
-+  if (moduleinfo.IsEmpty() || moduleinfo->IsNull() || moduleinfo->IsUndefined())
-   {
-     // It's not yet loaded
-     return 0;
-@@ -23,7 +35,7 @@ SWIG_V8_GetModule(void *) {
- 
-   v8::Local<v8::External> moduleinfo_extern = v8::Local<v8::External>::Cast(moduleinfo);
- 
-  if (moduleinfo_extern.IsEmpty())
-+  if (moduleinfo_extern.IsEmpty() || moduleinfo_extern->IsNull() || moduleinfo_extern->IsUndefined())
-   {
-     // Something's not right
-     return 0;
-diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg
-index 5ac52a51dc..30002c02a3 100644
--- a/Lib/javascript/v8/javascriptrun.swg
-+++ b/Lib/javascript/v8/javascriptrun.swg
-@@ -193,8 +193,10 @@ public:
-   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Value> object, void *parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   void (*dtor) (const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data);
-+#else
-+  void (*dtor) (const v8::WeakCallbackInfo<SWIGV8_Proxy> &data);
- #endif
- };
- 
-@@ -241,9 +243,12 @@ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Val
-   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
- SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-   SWIGV8_Proxy *proxy = data.GetParameter();
-+#else
-+SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
-+  SWIGV8_Proxy *proxy = data.GetParameter();
- #endif
- 
-   delete proxy;
-@@ -312,12 +317,18 @@ SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, sw
-   } else {
-     cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
-   }
-#else
-+#elifif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
-     cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
-   } else {
-     cdata->handle.SetWeak(cdata, SWIGV8_Proxy_DefaultDtor);
-   }
-+#else
-+  if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
-+    cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor, v8::WeakCallbackType::kParameter);
-+  } else {
-+    cdata->handle.SetWeak(cdata, SWIGV8_Proxy_DefaultDtor, v8::WeakCallbackType::kParameter);
-+  }
- #endif
- 
- #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-@@ -470,7 +481,14 @@ int SwigV8Packed_Check(v8::Handle<v8::Value> valRef) {
-   
-   v8::Handle<v8::Object> objRef = valRef->ToObject();
-   if(objRef->InternalFieldCount() < 1) return false;
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   v8::Handle<v8::Value> flag = objRef->GetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"));
-+#else
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
-+  v8::Local<v8::Value> flag;
-+  if (!objRef->GetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey).ToLocal(&flag))
-+    return false;
-+#endif
-   return (flag->IsBoolean() && flag->BooleanValue());
- }
- 
-@@ -519,10 +537,13 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persist
-   SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SwigV8PackedData *cdata) {
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
- SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Object, SwigV8PackedData> &data) {
-   v8::Local<v8::Object> object = data.GetValue();
-   SwigV8PackedData *cdata = data.GetParameter();
-+#else
-+SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackInfo<SwigV8PackedData> &data) {
-+  SwigV8PackedData *cdata = data.GetParameter();
- #endif
- 
-   delete cdata;
-@@ -537,7 +558,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Ob
-   object->Dispose(isolate);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   object->Dispose();
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   object.Clear();
- #endif
- }
-@@ -550,7 +571,12 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
- //  v8::Handle<v8::Object> obj = SWIGV8_OBJECT_NEW();
-   v8::Local<v8::Object> obj = SWIGV8_OBJECT_NEW();
- 
-+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   obj->SetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"), SWIGV8_BOOLEAN_NEW(true));
-+#else
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
-+  obj->SetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey, SWIGV8_BOOLEAN_NEW(true));
-+#endif
- 
- #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511)
-   obj->SetPointerInInternalField(0, cdata);
-@@ -573,9 +599,11 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
-   cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete);
-#else
-+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-   cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete);
- //  v8::V8::SetWeak(&cdata->handle, cdata, _wrap_SwigV8PackedData_delete);
-+#else
-+  cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete, v8::WeakCallbackType::kParameter);
- #endif
- 
- #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
-
-From 9ce8d7e7c99e75163318428aeff6e60d398fcdca Mon Sep 17 00:00:00 2001
-From: Patrick Schneider <patrick.schneider@meetnow.eu>
-Date: Thu, 13 Apr 2017 19:39:44 +0200
-Subject: [PATCH 2/2] Remove warnings on Node 6.x aka V8 5.0 and 5.1
-
-The proposed changes targetted at 5.2 (or 5.4 to be more precise, since there is no Node release with V8 5.2 or 5.3) work for lower versions as well and bust the deprecation warnings there.
---
- Lib/javascript/v8/javascriptcode.swg    | 14 +++++++-------
- Lib/javascript/v8/javascripthelpers.swg |  8 ++++----
- Lib/javascript/v8/javascriptinit.swg    |  4 ++--
- Lib/javascript/v8/javascriptrun.swg     | 16 ++++++++--------
- 4 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/Lib/javascript/v8/javascriptcode.swg b/Lib/javascript/v8/javascriptcode.swg
-index b8c5089816..c4aaf3db0c 100644
--- a/Lib/javascript/v8/javascriptcode.swg
-+++ b/Lib/javascript/v8/javascriptcode.swg
-@@ -133,7 +133,7 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
-   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SWIGV8_Proxy *proxy) {
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
- static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-   v8::Local<v8::Object> object = data.GetValue();
-   SWIGV8_Proxy *proxy = data.GetParameter();
-@@ -150,7 +150,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
-   }
-   delete proxy;
- 
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
-   object.Clear();
- #endif
-   
-@@ -160,7 +160,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
-   object.Dispose(isolate);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
-   object->Dispose(isolate);
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
-   object->Dispose();
- #endif
- }
-@@ -182,7 +182,7 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
-   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- static void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object> *object, SWIGV8_Proxy *proxy) {
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
- static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-   v8::Local<v8::Object> object = data.GetValue();
-   SWIGV8_Proxy *proxy = data.GetParameter();
-@@ -205,7 +205,7 @@ static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
-   object->Dispose(isolate);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   object->Dispose();
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
-   object.Clear();
- #endif
- }
-@@ -219,7 +219,7 @@ static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
-  * ----------------------------------------------------------------------------- */
- %fragment("js_getter", "templates")
- %{
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
- static SwigV8ReturnValue $jswrapper(v8::Local<v8::String> property, const SwigV8PropertyCallbackInfo &info) {
- #else
- static SwigV8ReturnValue $jswrapper(v8::Local<v8::Name> property, const SwigV8PropertyCallbackInfo &info) {
-@@ -245,7 +245,7 @@ fail:
-  * ----------------------------------------------------------------------------- */
- %fragment("js_setter", "templates")
- %{
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
- static void $jswrapper(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
- #else
- static void $jswrapper(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
-diff --git a/Lib/javascript/v8/javascripthelpers.swg b/Lib/javascript/v8/javascripthelpers.swg
-index 74610793af..7b8a5ec237 100644
--- a/Lib/javascript/v8/javascripthelpers.swg
-+++ b/Lib/javascript/v8/javascripthelpers.swg
-@@ -6,7 +6,7 @@ typedef v8::InvocationCallback  SwigV8FunctionCallback;
- typedef v8::AccessorGetter      SwigV8AccessorGetterCallback;
- typedef v8::AccessorSetter      SwigV8AccessorSetterCallback;
- typedef v8::AccessorInfo        SwigV8PropertyCallbackInfoVoid;
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
- typedef v8::FunctionCallback            SwigV8FunctionCallback;
- typedef v8::AccessorGetterCallback      SwigV8AccessorGetterCallback;
- typedef v8::AccessorSetterCallback      SwigV8AccessorSetterCallback;
-@@ -70,14 +70,14 @@ SWIGRUNTIME void SWIGV8_AddStaticFunction(v8::Handle<v8::Object> obj, const char
-  */
- SWIGRUNTIME void SWIGV8_AddStaticVariable(v8::Handle<v8::Object> obj, const char* symbol,
-   SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) {
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
-   obj->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter);
- #else
-   obj->SetAccessor(SWIGV8_CURRENT_CONTEXT(), SWIGV8_SYMBOL_NEW(symbol), getter, setter);
- #endif
- }
- 
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
- SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
- #else
- SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
-@@ -87,7 +87,7 @@ SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::Name> property, v8::Local<v8
-     char msg[512];
-     int res;
- 
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
-     property->WriteUtf8(buffer, 256);
-     res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
- #else
-diff --git a/Lib/javascript/v8/javascriptinit.swg b/Lib/javascript/v8/javascriptinit.swg
-index 86008d927f..e83f478d9d 100644
--- a/Lib/javascript/v8/javascriptinit.swg
-+++ b/Lib/javascript/v8/javascriptinit.swg
-@@ -7,7 +7,7 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
-   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
-   v8::Local<v8::External> mod = SWIGV8_EXTERNAL_NEW(swig_module);
-   assert(!mod.IsEmpty());
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
-   global_obj->SetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"), mod);
- #else
-   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
-@@ -18,7 +18,7 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
- SWIGRUNTIME swig_module_info *
- SWIG_V8_GetModule(void *) {
-   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
-   v8::Local<v8::Value> moduleinfo = global_obj->GetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"));
- #else
-   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
-diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg
-index 30002c02a3..0af9f4eb0a 100644
--- a/Lib/javascript/v8/javascriptrun.swg
-+++ b/Lib/javascript/v8/javascriptrun.swg
-@@ -193,7 +193,7 @@ public:
-   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Value> object, void *parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
-   void (*dtor) (const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data);
- #else
-   void (*dtor) (const v8::WeakCallbackInfo<SWIGV8_Proxy> &data);
-@@ -243,7 +243,7 @@ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Val
-   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
- SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
-   SWIGV8_Proxy *proxy = data.GetParameter();
- #else
-@@ -317,7 +317,7 @@ SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, sw
-   } else {
-     cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
-   }
-#elifif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
-   if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
-     cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
-   } else {
-@@ -481,7 +481,7 @@ int SwigV8Packed_Check(v8::Handle<v8::Value> valRef) {
-   
-   v8::Handle<v8::Object> objRef = valRef->ToObject();
-   if(objRef->InternalFieldCount() < 1) return false;
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
-   v8::Handle<v8::Value> flag = objRef->GetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"));
- #else
-   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
-@@ -537,7 +537,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persist
-   SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
- SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SwigV8PackedData *cdata) {
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
- SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Object, SwigV8PackedData> &data) {
-   v8::Local<v8::Object> object = data.GetValue();
-   SwigV8PackedData *cdata = data.GetParameter();
-@@ -558,7 +558,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackInfo<SwigV8
-   object->Dispose(isolate);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   object->Dispose();
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
-   object.Clear();
- #endif
- }
-@@ -571,7 +571,7 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
- //  v8::Handle<v8::Object> obj = SWIGV8_OBJECT_NEW();
-   v8::Local<v8::Object> obj = SWIGV8_OBJECT_NEW();
- 
-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#if (V8_MAJOR_VERSION-0) < 5
-   obj->SetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"), SWIGV8_BOOLEAN_NEW(true));
- #else
-   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
-@@ -599,7 +599,7 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
-   cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete);
- #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-   cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete);
-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
-+#elif (V8_MAJOR_VERSION-0) < 5
-   cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete);
- //  v8::V8::SetWeak(&cdata->handle, cdata, _wrap_SwigV8PackedData_delete);
- #else
--- a/swig-octave-ldflags.patch
+++ b/swig-octave-ldflags.patch
@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 1873797..754238f 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1114,7 +1114,10 @@ if test -n "$OCTAVE"; then
+ 
+    AC_MSG_CHECKING([for Octave linker flags])
+    OCTAVE_LDFLAGS=
+-   for var in RDYNAMIC_FLAG LFLAGS RLD_FLAG OCTAVE_LIBS LIBS; do
+   for var in OCTLIBDIR; do
+     OCTAVE_LDFLAGS="${OCTAVE_LDFLAGS} "-L`env - ${mkoctfile} -p ${var}`
+   done
+   for var in RDYNAMIC_FLAG RLD_FLAG OCTAVE_LIBS LIBS; do
+      OCTAVE_LDFLAGS="${OCTAVE_LDFLAGS} "`env - ${mkoctfile} -p ${var}`
+    done
+    AC_MSG_RESULT([$OCTAVE_LDFLAGS])
--- a/swig-octave5.1.patch
+++ b/swig-octave5.1.patch
@ -0,0 +1,28 @@
+commit c38b7de6a120e6392abff50afd9bb919cc858cfc
+Author: Orion Poplawski <orion@nwra.com>
+Date:   Sun Mar 10 11:47:27 2019 -0600
+
+    Fix format-security error with octave 5.1
+
+diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg
+index 3012331..ff614e6 100644
+--- a/Lib/octave/octrun.swg
+++ b/Lib/octave/octrun.swg
+@@ -51,7 +51,7 @@ SWIGRUNTIME octave_value SWIG_Error(int code, const char *msg) {
+   octave_value type(SWIG_ErrorType(code));
+   std::string r = msg;
+   r += " (" + type.string_value() + ")";
+-  error(r.c_str());
+  error("%s", r.c_str());
+   return octave_value(r);
+ }
+ 
+@@ -840,7 +840,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
+       const std::string opname = std::string("__") + octave_base_value::get_umap_name(umap) + std::string("__");
+       octave_value ret;
+       if (!dispatch_unary_op(opname, ret)) {
+-        error((opname + std::string(" method not found")).c_str());
+        error("%s", (opname + std::string(" method not found")).c_str());
+         return octave_value();
+       }
+       return ret;
--- a/swig.spec
+++ b/swig.spec
@ -1,17 +1,31 @@
 # We can skip tests
-%ifnarch riscv64
 %bcond_without testsuite
-%else
-%bcond_with testsuite
+
+%if %{without testsuite}
+%global tcl 0
+%global lualang 0
+%global phplang 0
+%global rubylang 0
+%global python2lang 0
+%global python3lang 0
+%global golang 0
+%global octave 0
+%global Rlang 0
+%global javalang 0
 %endif

 %{!?tcl:%global tcl 1}
 %{!?guile:%global guile 0}
 %{!?lualang:%global lualang 1}
-# Disable PHP tests, because they fail with PHP 7.2.0
-%{!?phplang:%global phplang 0}
+%{!?phplang:%global phplang 1}
+# Disable Ruby test failed with swig 4.0.0
+%ifarch s390 s390x
+%{!?rubylang:%global rubylang 0}
+%else
 %{!?rubylang:%global rubylang 1}
-%{!?python2lang:%global python2lang 0}
+%endif
+%{!?python2lang:%global python2lang 1}
+%{!?python3lang:%global python3lang 1}

 %if 0%{?rhel}
 %{!?golang:%global golang 0}
@ -23,13 +37,14 @@
 %{!?Rlang:%global Rlang 1}
 %bcond_without build_ccache_swig
 %endif
-%ifarch aarch64 %{arm} %{mips} ppc64le ppc %{power64} s390 s390x riscv64
+%ifarch aarch64 %{arm} %{mips} ppc64le ppc %{power64} s390 s390x
 %{!?javalang:%global javalang 0}
 %else
 %{!?javalang:%global javalang 1}
 %endif

-%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64le
+# Do not run Go tests, they failed with 4.0.0 on ppc64le
+%ifarch %{ix86} x86_64 %{arm} aarch64
 %{!?golang:%global golang 1}
 %else
 %{!?golang:%global golang 0}
@ -37,8 +52,8 @@

 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
-Version: 3.0.12
-Release: 21.0.riscv64%{?dist}
+Version: 4.0.0
+Release: 5.0.riscv64%{?dist}
 License: GPLv3+ and BSD
 URL:     http://swig.sourceforge.net/
 Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
@ -51,26 +66,18 @@ Source4: ccache-swig.csh
 %endif

 Patch0:  swig308-Do-not-use-isystem.patch
-Patch1:  swig-3.0.12-Fix-testsuite-to-work-without-.-in-INC.patch
-# Upstream pull request to support Node v7/v8
-Patch2:  https://patch-diff.githubusercontent.com/raw/swig/swig/pull/968/swig-node-v7.patch
-# Fix generated code for constant expressions containing wchar_t L
-# literals.
-Patch3:  swig-3.0.12-Fix-generated-code-for-constant-expressions-containi.patch
-Patch4:  swig-3.0.12-Fix-type-promotion-wrapping-some-non-trivial-constan.patch
-Patch5:  swig-3.0.12-Correct-php-testcase.patch
-Patch6:  swig-3.0.12-Fix-go-version-matching-in-configure-for-go1.10.patch
-# Backport upstream Coverity fixes (BZ# 1570037)
-Patch7:  swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_FixMetho.patch
-Patch8:  swig-3.0.12-Fix-Coverity-issue-reported-for-setslice-pycontainer.patch
-Patch9:  swig-3.0.12-Coverity-fix-issue-reported-for-wrapper-argument-che.patch
-Patch10: swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_ConvertF.patch
+# https://github.com/swig/swig/pull/1522
+Patch1:  swig-octave-ldflags.patch
+# Fix Go tests for Go 1.13-beta1 (BZ#1736731)
+Patch2:  swig400-Fix-all-Go-tests-to-build-with-go-build.patch
+Patch3:  swig400-Restore-setting-of-GOVERSIONOPTION.patch
+Patch4:  swig400-Fix-Go-version-check-and-Go-in-tree-example-tests.patch

 BuildRequires: perl-interpreter, pcre-devel
 %if %{python2lang}
 BuildRequires: python2-devel
 %endif
-BuildRequires: python3-devel
+BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: autoconf, automake, gawk, dos2unix
 BuildRequires: gcc-c++
 BuildRequires: help2man
@ -99,6 +106,7 @@ BuildRequires: octave-devel
 %endif
 %if %{golang}
 BuildRequires: golang
+BuildRequires: golang-bin
 BuildRequires: golang-shared
 BuildRequires: golang-src
 %endif
@ -121,17 +129,20 @@ BuildRequires: php, php-devel
 %description
 Simplified Wrapper and Interface Generator (SWIG) is a software
 development tool for connecting C, C++ and Objective C programs with a
-variety of high-level programming languages.  SWIG is primarily used
-with Perl, Python and Tcl/TK, but it has also been extended to Java,
-Eiffel and Guile. SWIG is normally used to create high-level
-interpreted programming environments, systems integration, and as a
-tool for building user interfaces
+variety of high-level programming languages. SWIG is used with different
+types of target languages including common scripting languages such as
+Javascript, Perl, PHP, Python, Tcl and Ruby. The list of supported
+languages also includes non-scripting languages such as C#, D, Go language,
+Java including Android, Lua, OCaml, Octave, Scilab and R. Also several
+interpreted and compiled Scheme implementations (Guile, MzScheme/Racket)
+are supported. SWIG is most commonly used to create high-level interpreted
+or compiled programming environments, user interfaces, and as a tool for
+testing and prototyping C/C++ software.

 %if %{with build_ccache_swig}
 %package -n ccache-swig
 Summary:   Fast compiler cache
 License:   GPLv2+
-Group:     Development/Tools
 Requires:  swig
 Conflicts: swig < 3.0.8-2

@ -144,7 +155,6 @@ being done again. ccache-swig is ccache plus support for SWIG.
 %package doc
 Summary:   Documentation files for SWIG
 License:   BSD
-Group:     Development/Tools
 BuildArch: noarch

 %description doc
@ -160,19 +170,13 @@ This package contains file with commands for easier debugging of SWIG
 in gdb.

 %prep
-%setup -q
+%setup -q -n swig-%{version}

 %patch0 -p1 -b .isystem
-%patch1 -p1
-%patch2 -p1 -b .bak
+%patch1 -p1 -b .octave-ldflags
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1

 for all in CHANGES README; do
    iconv -f ISO88591 -t UTF8 < $all > $all.new
@ -193,9 +197,18 @@ done
 %else
  --without-python \
 %endif
+%if %{python3lang}
  --with-python3=%__python3 \
+%else
+  --without-python3 \
+%endif
 %if %{phplang}
  --with-php=%{__php} \
+%else
+  --without-php \
+%endif
+%if ! %{tcl}
+  --without-tcl \
 %endif
 %if ! %{javalang}
  --without-java \
@ -216,10 +229,12 @@ done
 ;
 make %{?_smp_mflags}

+%ifnarch riscv64
 %if %{with testsuite}
 # Test suite
 make check
 %endif
+%endif

 %install
 # Remove all arch dependent files in Examples/ created during tests
@ -336,9 +351,35 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb
 %{_datadir}/%{name}/gdb

 %changelog
-* Sun Jul 29 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 3.0.12-21.0.riscv64
- Enable Java for RISC-V (riscv64)
- Disable testsuite for RISC-V (riscv64) as it takes too long
+* Wed Aug 21 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 4.0.0-5.0.riscv64
+- Disable all tests on RISC-V (riscv64)
+
+* Mon Aug 12 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-5
+- Backport upstream fix for Go tests (BZ#1736731)
+
+* Tue Aug 06 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-4
+- Disable Go tests, they fail with Go 1.13-beta
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jun 05 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-2
+- Updated package description
+
+* Fri May 03 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-1
+- Update to 4.0.0
+
+* Sat Apr 27 2019 Orion Poplawski <orion@nwra.com> - 3.0.12-25
+- Add patches for octave 5.1 support
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.12-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 3.0.12-23
+- Rebuilt for Boost 1.69
+
+* Thu Nov 15 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-22
+- Add support for Octave 4.4

 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.12-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
--- a/swig400-Fix-Go-version-check-and-Go-in-tree-example-tests.patch
+++ b/swig400-Fix-Go-version-check-and-Go-in-tree-example-tests.patch
@ -0,0 +1,54 @@
+From 62136ff782e9bf6641970f716d7d40afcf6c49ea Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Fri, 9 Aug 2019 14:06:45 -0700
+Subject: [PATCH] Fix Go version check and Go in-tree example tests
+
+Fixes #1607
+---
+ Examples/Makefile.in | 4 ++--
+ configure.ac         | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Examples/Makefile.in b/Examples/Makefile.in
+index 9e05d2763..6fbca29db 100644
+--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
+@@ -1484,7 +1484,7 @@ go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
+ 	  rm -f gopath/$(GOMOD)/src/runme/*; \
+ 	fi
+ 	if test -f $(SRCDIR)$(RUNME).go; then \
+-	  cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \
+	  cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
+ 	fi
+ 	GOPATH=`pwd`/gopath/$(GOMOD); \
+ 	export GOPATH; \
+@@ -1533,7 +1533,7 @@ go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
+ 	  rm -f gopath/$(GOMOD)/src/runme/*; \
+ 	fi
+ 	if test -f $(SRCDIR)$(RUNME).go; then \
+-	  cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \
+	  cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
+ 	fi
+ 	GOPATH=`pwd`/gopath/$(GOMOD); \
+ 	export GOPATH; \
+diff --git a/configure.ac b/configure.ac
+index 73c38a72c..63509cd66 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -2391,10 +2391,11 @@ else
+ 
+   if test -n "$GO" ; then
+     GOVERSIONOPTION=version
+    go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
+     AC_MSG_CHECKING([whether go version is too old])
+     case $go_version in
+-    go1.[012345]*)
+-      AC_MSG_RESULT([yes - minimum version is 1.6])
+    go1.[012]*)
+      AC_MSG_RESULT([yes - minimum version is 1.3])
+       GO=
+       GOOPT="-intgosize 32"
+       ;;
+-- 
+2.20.1
+
--- a/swig400-Fix-all-Go-tests-to-build-with-go-build.patch
+++ b/swig400-Fix-all-Go-tests-to-build-with-go-build.patch
--- a/swig400-Restore-setting-of-GOVERSIONOPTION.patch
+++ b/swig400-Restore-setting-of-GOVERSIONOPTION.patch
@ -0,0 +1,25 @@
+From 6b108c19e1504c937e1a7d50147575dd8e624b73 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Thu, 8 Aug 2019 22:59:57 -0700
+Subject: [PATCH 2/2] Restore setting of GOVERSIONOPTION
+
+Accidentally removed in last commit.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index a38e97d2a..73c38a72c 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -2390,6 +2390,7 @@ else
+   GOVERSIONOPTION=
+ 
+   if test -n "$GO" ; then
+    GOVERSIONOPTION=version
+     AC_MSG_CHECKING([whether go version is too old])
+     case $go_version in
+     go1.[012345]*)
+-- 
+2.20.1
+
Author	SHA1	Message	Date
David Abdurachmanov	55fcdcc55e	Disable all tests on RISC-V (riscv64) BUILDSTDERR: checking python testcase overload_extend_c java_lib_arrays_dimensionless_wrap.cxx: In function 'jdouble Java_java_1lib_1arrays_1dimensionless_java_1lib_1arrays_1dimensionlessJNI_arr_1ll(JNIEnv, jclass, jlongArray, jint)': BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:1162:47: error: invalid conversion from 'long long int' to 'jlong' {aka 'long int'} [-fpermissive] BUILDSTDERR: 1162 \| if (!SWIG_JavaArrayInLonglong(jenv, &jarr1, (long long )&arg1, jarg1)) return 0; BUILDSTDERR: \| ^~~~~~~~~~~~~~~~~~~ BUILDSTDERR: \| \| BUILDSTDERR: \| long long int* BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:714:74: note: initializing argument 3 of 'int SWIG_JavaArrayInLonglong(JNIEnv, jlong, jlong, jlongArray)' BUILDSTDERR: 714 \| static int SWIG_JavaArrayInLonglong (JNIEnv jenv, jlong jarr, jlong carr, jlongArray input) { BUILDSTDERR: \| ~~~~~~~~^~~~ BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:1166:45: error: invalid conversion from 'long long int' to 'jlong' {aka 'long int'} [-fpermissive] BUILDSTDERR: 1166 \| SWIG_JavaArrayArgoutLonglong(jenv, jarr1, (long long )arg1, jarg1); BUILDSTDERR: \| ^~~~~~~~~~~~~~~~~ BUILDSTDERR: \| \| BUILDSTDERR: \| long long int* BUILDSTDERR: java_lib_arrays_dimensionless_wrap.cxx:735:77: note: initializing argument 3 of 'void SWIG_JavaArrayArgoutLonglong(JNIEnv, jlong, jlong, jlongArray)' BUILDSTDERR: 735 \| static void SWIG_JavaArrayArgoutLonglong (JNIEnv jenv, jlong jarr, jlong carr, jlongArray input) { BUILDSTDERR: \| ~~~~~~~^~~~ BUILDSTDERR: make[2]: * [../../../../Examples/Makefile:609: java_cpp] Error 1 BUILDSTDERR: make[1]: * [Makefile:87: java_lib_arrays_dimensionless.cpptest] Error 2 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2019-08-21 08:30:18 -07:00
David Abdurachmanov	f5f8e06505	Merge remote-tracking branch 'up/master' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2019-08-21 08:28:37 -07:00
Jitka Plesnikova	84ea8a4c67	Backport upstream fix for Go tests (BZ#1736731)	2019-08-12 14:34:44 +02:00
Jitka Plesnikova	9f07bb8030	Disable Go tests	2019-08-07 12:58:20 +02:00
Fedora Release Engineering	02347479a3	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-27 00:42:01 +00:00
Jitka Plesnikova	17b9b5c606	Updated package description	2019-06-05 15:27:55 +02:00
Jitka Plesnikova	315c07294e	Update package description	2019-05-14 08:40:21 +02:00
Jitka Plesnikova	bc26ef20c1	Update to 4.0.0	2019-05-06 08:17:06 +02:00
Jitka Plesnikova	df96fc9c40	Update to 4.0.0	2019-05-03 14:52:42 +02:00
Orion Poplawski	b74d8bc1be	Add patches for octave 5.1 support	2019-04-27 08:50:12 -06:00
Fedora Release Engineering	e084217e71	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-03 09:07:04 +00:00
Igor Gnatenko	baabb14839	Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag	2019-01-28 20:24:51 +01:00
Jonathan Wakely	5a0337f3d0	Rebuilt for Boost 1.69	2019-01-25 08:26:34 +00:00
Jitka Plesnikova	e01a76a62b	Add support for Octave 4.4	2018-11-15 10:46:14 +01:00