[gmsh] 01/02: Fix narrow conversion error with GCC-6. (Closes: #811792)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gmsh.

commit c596f2b81f44974ab516d2f86ad148f1769559a2
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Jan 31 00:21:27 2016 +0100

    Fix narrow conversion error with GCC-6. (Closes: #811792)
---
 debian/patches/130_gcc6_fix.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/130_gcc6_fix.patch b/debian/patches/130_gcc6_fix.patch
new file mode 100644
index 0000000..f673103
--- /dev/null
+++ b/debian/patches/130_gcc6_fix.patch
@@ -0,0 +1,27 @@
+Description: Fix narrow conversion error with GCC-6
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/811792
+Last-Update: 2016-01-30
+
+Index: gmsh-2.11.0+dfsg1/Fltk/FlGui.cpp
+===================================================================
+--- gmsh-2.11.0+dfsg1.orig/Fltk/FlGui.cpp
++++ gmsh-2.11.0+dfsg1/Fltk/FlGui.cpp
+@@ -370,7 +370,7 @@ FlGui::FlGui(int argc, char **argv)
+   // nothing to do here
+ #else
+   fl_open_display();
+-  static char gmsh32x32[] = {
++  static unsigned char gmsh32x32[] = {
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x40, 0x03, 0x00,
+     0x00, 0x40, 0x03, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x20, 0x07, 0x00,
+     0x00, 0x10, 0x0f, 0x00, 0x00, 0x10, 0x0f, 0x00, 0x00, 0x08, 0x1f, 0x00,
+@@ -384,7 +384,7 @@ FlGui::FlGui(int argc, char **argv)
+     0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};
+   graph[0]->getWindow()->icon
+     ((const char*)XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
+-                                        gmsh32x32, 32, 32));
++                                        (char*)(gmsh32x32), 32, 32));
+ #endif
+ 
+   graph[0]->getWindow()->show(argc >0 ? 1 : 0, argv);
diff --git a/debian/patches/series b/debian/patches/series
index 92cad25..0769bce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 100_enable_tetgen.patch
 110_fix_cmake_hdf5.patch
 120_relax_python_vers.patch
+130_gcc6_fix.patch

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