MED file saving fixed

3 files changed, 23 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e6a2a1d869e..67a1a607bc5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Mar  6 16:59:09 UTC 2016
 pkgbase = gmsh
 	pkgdesc = An automatic 3D finite element mesh generator with pre and post-processing facilities.
 	pkgver = 2.12.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.geuz.org/gmsh/
 	arch = i686
 	arch = x86_64
@@ -24,9 +22,11 @@ pkgbase = gmsh
 	source = http://www.geuz.org/gmsh/src/gmsh-2.12.0-source.tgz
 	source = gmsh.desktop
 	source = gmsh.completion
+	source = string-refpointer.diff
 	md5sums = 03cbeb28c1e2b4fd5c2065be25df8b8f
 	md5sums = e63dc24ba025741fc1a82633b475e4a8
 	md5sums = 9ee4b5bf27956de5aa412bbc939660d3
+	md5sums = ef9faa9020a790eead71201a12685d84
 
 pkgname = gmsh
 
diff --git a/PKGBUILD b/PKGBUILD
index 54ef764297c4..7c00319d3e77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: mickele <mimocciola@yahoo.com>
 pkgname=gmsh
 pkgver=2.12.0
-pkgrel=1
+pkgrel=2
 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,10 +13,11 @@ 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)
+source=("${url}src/${pkgname}-${pkgver}-source.tgz" gmsh.desktop gmsh.completion string-refpointer.diff)
 md5sums=('03cbeb28c1e2b4fd5c2065be25df8b8f'
          'e63dc24ba025741fc1a82633b475e4a8'
-         '9ee4b5bf27956de5aa412bbc939660d3')
+         '9ee4b5bf27956de5aa412bbc939660d3'
+         'ef9faa9020a790eead71201a12685d84')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}-source"
@@ -27,6 +28,9 @@ build() {
    sed -e "s|http://geuz.org/gmsh/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"
+
    mkdir -p build
 
    cd build
diff --git a/string-refpointer.diff b/string-refpointer.diff
new file mode 100644
index 000000000000..104c4d474179
--- /dev/null
+++ b/string-refpointer.diff
@@ -0,0 +1,13 @@
+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)