Fixed gcc6 compilation

4 files changed, 37 insertions, 5 deletions

diff --git a/.PKGBUILD.swp b/.PKGBUILD.swp
new file mode 100644
index 000000000000..48d51f2e8a15
--- /dev/null
+++ b/.PKGBUILD.swp
diff --git a/.SRCINFO b/.SRCINFO
index 67a1a607bc5d..a5418889da0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gmsh
 	pkgdesc = An automatic 3D finite element mesh generator with pre and post-processing facilities.
 	pkgver = 2.12.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.geuz.org/gmsh/
 	arch = i686
 	arch = x86_64
@@ -23,10 +23,12 @@ pkgbase = gmsh
 	source = gmsh.desktop
 	source = gmsh.completion
 	source = string-refpointer.diff
+	source = 130_gcc6_fix.patch
 	md5sums = 03cbeb28c1e2b4fd5c2065be25df8b8f
 	md5sums = e63dc24ba025741fc1a82633b475e4a8
 	md5sums = 9ee4b5bf27956de5aa412bbc939660d3
 	md5sums = ef9faa9020a790eead71201a12685d84
+	md5sums = a0925bbf2fa5abd27a2d3e36034bc185
 
 pkgname = gmsh
 
diff --git a/130_gcc6_fix.patch b/130_gcc6_fix.patch
new file mode 100644
index 000000000000..b26e3757669e
--- /dev/null
+++ b/130_gcc6_fix.patch
@@ -0,0 +1,27 @@
+Description: Fix narrow conversion error with GCC-6
+Author: Anton Gladky <gladk@debian.org>
+Bug-Debian: https://bugs.debian.org/811792
+Last-Update: 2016-01-30
+
+Index: gmsh-2.12.0-source/Fltk/FlGui.cpp
+===================================================================
+--- gmsh-2.12.0-source.orig/Fltk/FlGui.cpp
++++ gmsh-2.12.0-source/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/PKGBUILD b/PKGBUILD
index 7c00319d3e77..e719ba765468 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: mickele <mimocciola@yahoo.com>
 pkgname=gmsh
 pkgver=2.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An automatic 3D finite element mesh generator with pre and post-processing facilities."
 arch=('i686' 'x86_64')
 url="http://www.geuz.org/gmsh/"
@@ -13,11 +13,12 @@ optdepends=('gmsh-docs: docs for gmsh'
             'python2: for onelab.py'
             'python: for onelab.py')
 options=(!emptydirs)
-source=("${url}src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion string-refpointer.diff)
+source=("${url}src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion string-refpointer.diff 130_gcc6_fix.patch)
 md5sums=('03cbeb28c1e2b4fd5c2065be25df8b8f'
          'e63dc24ba025741fc1a82633b475e4a8'
          '9ee4b5bf27956de5aa412bbc939660d3'
-         'ef9faa9020a790eead71201a12685d84')
+         'ef9faa9020a790eead71201a12685d84'
+         'a0925bbf2fa5abd27a2d3e36034bc185')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}-source"
@@ -30,6 +31,8 @@ build() {
 
    # Fix MED file saving, provided by Michele Mocciola 
    patch -Np1 -i "${srcdir}/string-refpointer.diff"
+   # Fix gcc 6 compilation, patch from debian
+   patch -Np1 -i "${srcdir}/130_gcc6_fix.patch"
 
    mkdir -p build
 
@@ -45,7 +48,7 @@ package() {
    cd "${srcdir}/${pkgname}-${pkgver}-source/build"
    make DESTDIR=${pkgdir} install
    install -D -m644 "${pkgdir}/usr/bin/onelab.py" "${pkgdir}/usr/lib/python2.7/site-packages/onelab.py"
-   install -D -m644 "${pkgdir}/usr/bin/onelab.py" "${pkgdir}/usr/lib/python3.4/site-packages/onelab.py"
+   install -D -m644 "${pkgdir}/usr/bin/onelab.py" "${pkgdir}/usr/lib/python3.5/site-packages/onelab.py"
    rm "${pkgdir}/usr/bin/onelab.py"
 
    install -D -m644 "${srcdir}/${pkgname}-${pkgver}-source/utils/icons/solid_128x128.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"