[scilab] 19/29: Refresh patch for gcc 7

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit 1def6117ace5556561a2ef57e0455e9240b18f27
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Nov 15 21:05:06 2017 +0100

    Refresh patch for gcc 7
---
 debian/changelog           |  1 +
 debian/patches/gcc-7.patch | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eae3143..bca2d8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ scilab (6.0.0-1) UNRELEASED; urgency=medium
     - Refresh patch for the jogl2 api. 
     - Refresh patch for the hdf5 1.10 api. 
     - Drop patch to remove non-free code : it came from upstream. 
+    - Refresh patch for gcc 7.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Tue, 14 Nov 2017 16:46:25 +0100
 
diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
index 8fb3fe3..d82d20a 100644
--- a/debian/patches/gcc-7.patch
+++ b/debian/patches/gcc-7.patch
@@ -1,13 +1,26 @@
-Index: scilab-5.5.2/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
-===================================================================
---- scilab-5.5.2.orig/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
-+++ scilab-5.5.2/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
-@@ -54,7 +54,7 @@ int sci_xcosPalLoad(char *fname, unsigne
+Description: make the code work with gcc 7 too
+Author: Gilles Filippini
+Forwarded: no
+
+--- a/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
++++ b/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
+@@ -59,7 +59,7 @@
      {
          // FIXME #7266 workaround
          // check category emptyness
--        if (category == NULL || (lenCategory == 1 && *category == '\0'))
-+        if (category == NULL || (lenCategory == 1 && *category == NULL))
+-        if (category == NULL || (lenCategory == 1 && **category == '\0'))
++        if (category == NULL || (lenCategory == 1 && **category == NULL))
          {
              Palette::loadPal(getScilabJavaVM(), name);
          }
+--- a/modules/io/src/cpp/loadlib.cpp
++++ b/modules/io/src/cpp/loadlib.cpp
+@@ -38,7 +38,7 @@
+ {
+     types::Library* lib = NULL;
+ 
+-    wchar_t* pwstXML = pathconvertW(_wstXML.data(), FALSE, FALSE, AUTO_STYLE);
++    wchar_t* pwstXML = pathconvertW(_wstXML.data(), (BOOL)FALSE, (BOOL)FALSE, AUTO_STYLE);
+     wchar_t* pwstPathLib = expandPathVariableW(pwstXML);
+ 
+     bool expanded = true;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git