Updated to 2.13.0

4 files changed, 11 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5418889da0c..f1aaa9b1c679 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 = 3
+	pkgver = 2.13.0
+	pkgrel = 1
 	url = http://www.geuz.org/gmsh/
 	arch = i686
 	arch = x86_64
@@ -19,16 +19,12 @@ pkgbase = gmsh
 	optdepends = python2: for onelab.py
 	optdepends = python: for onelab.py
 	options = !emptydirs
-	source = http://www.geuz.org/gmsh/src/gmsh-2.12.0-source.tgz
+	source = http://www.geuz.org/gmsh/src/gmsh-2.13.0-source.tgz
 	source = gmsh.desktop
 	source = gmsh.completion
-	source = string-refpointer.diff
-	source = 130_gcc6_fix.patch
-	md5sums = 03cbeb28c1e2b4fd5c2065be25df8b8f
+	md5sums = 4a7476a5dc2426fdaf300b599b819c69
 	md5sums = e63dc24ba025741fc1a82633b475e4a8
 	md5sums = 9ee4b5bf27956de5aa412bbc939660d3
-	md5sums = ef9faa9020a790eead71201a12685d84
-	md5sums = a0925bbf2fa5abd27a2d3e36034bc185
 
 pkgname = gmsh
 
diff --git a/130_gcc6_fix.patch b/130_gcc6_fix.patch
deleted file mode 100644
index b26e3757669e..000000000000
--- a/130_gcc6_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 e719ba765468..ff66da8540e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: gborzi <gborzi@ieee.org>
 # Contributor: mickele <mimocciola@yahoo.com>
 pkgname=gmsh
-pkgver=2.12.0
-pkgrel=3
+pkgver=2.13.0
+pkgrel=1
 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,27 +13,20 @@ 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 130_gcc6_fix.patch)
-md5sums=('03cbeb28c1e2b4fd5c2065be25df8b8f'
+source=("${url}src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion)
+md5sums=('4a7476a5dc2426fdaf300b599b819c69'
          'e63dc24ba025741fc1a82633b475e4a8'
-         '9ee4b5bf27956de5aa412bbc939660d3'
-         'ef9faa9020a790eead71201a12685d84'
-         'a0925bbf2fa5abd27a2d3e36034bc185')
+         '9ee4b5bf27956de5aa412bbc939660d3')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}-source"
 
    # Help links to local doc (package gmsh-docs)
-   sed -e "s|http://geuz.org/gmsh/doc/texinfo/|file:///usr/share/doc/gmsh/gmsh.html|" \
+   sed -e "s|http://gmsh.info/doc/texinfo/|file:///usr/share/doc/gmsh/gmsh.html|" \
        -i Fltk/graphicWindow.cpp
-   sed -e "s|http://geuz.org/gmsh/doc/|file:///usr/share/licenses/gmsh/|" \
+   sed -e "s|http://gmsh.info/doc/|file:///usr/share/licenses/gmsh/|" \
        -i Fltk/helpWindow.cpp
 
-   # 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
 
    cd build
diff --git a/string-refpointer.diff b/string-refpointer.diff
deleted file mode 100644
index 104c4d474179..000000000000
--- a/string-refpointer.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gmsh-2.12.0-source.orig/Geo/GModelIO_MED.cpp gmsh-2.12.0-source/Geo/GModelIO_MED.cpp
---- gmsh-2.12.0-source.orig/Geo/GModelIO_MED.cpp	2016-01-06 13:59:42.000000000 +0100
-+++ gmsh-2.12.0-source/Geo/GModelIO_MED.cpp	2016-04-30 20:50:20.965186247 +0200
-@@ -522,7 +522,8 @@
-     return 0;
-   }
- 
--  char *meshName = (char*)getName().c_str();
-+  std::string strMeshName = getName();
-+  char * meshName = (char*)strMeshName.c_str();
- 
-   // Gmsh always writes 3D unstructured meshes
- #if (MED_MAJOR_NUM == 3)