summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu2016-10-31 11:09:44 +1100
committerJonathan Liu2016-10-31 11:09:44 +1100
commit51cdfcc80b4bc98a8d662a2e8ae792a7999d8573 (patch)
treeb8e5a3f15ba1a3696826f311665810105ccb4cba
parent729eeb70055956977c6c07e8ade2635f1a68526c (diff)
downloadaur-51cdfcc80b4bc98a8d662a2e8ae792a7999d8573.tar.gz
Update to 1.3.3-6
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--fix_local_stl_import.patch20
3 files changed, 29 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0338344f707..af84440a52c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon May 23 02:57:46 UTC 2016
+# Mon Oct 31 00:09:43 UTC 2016
pkgbase = meshlab
pkgdesc = System for processing and editing triangular meshes
pkgver = 1.3.3
- pkgrel = 5
+ pkgrel = 6
url = http://meshlab.sourceforge.net/
install = meshlab.install
arch = i686
@@ -18,6 +18,7 @@ pkgbase = meshlab
depends = qt4
noextract = MeshLabSrc_AllInc_v133.tgz
source = http://downloads.sourceforge.net/project/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz
+ source = fix_local_stl_import.patch
source = gcc-4.7.patch
source = lapack.patch
source = mpir.patch
@@ -28,6 +29,7 @@ pkgbase = meshlab
source = meshlabserver.1
source = meshlab.desktop
md5sums = cbdd83d4f3ed69e7a9837c34ebae307a
+ md5sums = 5582b6a1bcd7fd46b4854e1f4a8aea7f
md5sums = 65d7ff92ad2d6e74119af9c0e377bb37
md5sums = 4139d3217f1540c67306545213126391
md5sums = 308f1b90f7de56f9df1485808713ed53
diff --git a/PKGBUILD b/PKGBUILD
index ca39eaa443f..5de33b353d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jonathan Liu <net147@gmail.com>
pkgname=meshlab
pkgver=1.3.3
-pkgrel=5
+pkgrel=6
pkgdesc="System for processing and editing triangular meshes"
arch=('i686' 'x86_64')
url="http://meshlab.sourceforge.net/"
@@ -9,6 +9,7 @@ license=('GPL2')
depends=('bzip2' 'desktop-file-utils' 'glu' 'lapack' 'mpir' 'openssl' 'qt4')
install="${pkgname}.install"
source=("http://downloads.sourceforge.net/project/meshlab/meshlab/MeshLab%20v${pkgver//[a-z]/}/MeshLabSrc_AllInc_v${pkgver//./}.tgz"
+ "fix_local_stl_import.patch"
"gcc-4.7.patch"
"lapack.patch"
"mpir.patch"
@@ -20,6 +21,7 @@ source=("http://downloads.sourceforge.net/project/meshlab/meshlab/MeshLab%20v${p
"meshlab.desktop")
noextract=("MeshLabSrc_AllInc_v${pkgver//./}.tgz")
md5sums=('cbdd83d4f3ed69e7a9837c34ebae307a'
+ '5582b6a1bcd7fd46b4854e1f4a8aea7f'
'65d7ff92ad2d6e74119af9c0e377bb37'
'4139d3217f1540c67306545213126391'
'308f1b90f7de56f9df1485808713ed53'
@@ -38,6 +40,8 @@ prepare() {
# remove bundled headers and libraries
rm -fr meshlab/src/external/{inc,lib}
+ # fix text import breaking for different locales
+ patch -Np0 -i "${srcdir}/fix_local_stl_import.patch"
# fix compile errors with GCC 4.7
patch -Np0 -i "${srcdir}/qt-4.8.patch"
# fix Qt 4.8 compatibility
diff --git a/fix_local_stl_import.patch b/fix_local_stl_import.patch
new file mode 100644
index 00000000000..0b6282ba793
--- /dev/null
+++ b/fix_local_stl_import.patch
@@ -0,0 +1,20 @@
+Index: meshlab/src/meshlab/main.cpp
+===================================================================
+--- meshlab/src/meshlab/main.cpp (révision 6608)
++++ meshlab/src/meshlab/main.cpp (copie de travail)
+@@ -20,6 +20,7 @@
+ * for more details. *
+ * *
+ ****************************************************************************/
++#include <locale.h>
+ #include <common/mlapplication.h>
+ #include <QMessageBox>
+ #include "mainwindow.h"
+@@ -29,6 +30,7 @@
+ {
+
+ MeshLabApplication app(argc, argv);
++ setlocale(LC_ALL, "C");
+ QLocale::setDefault(QLocale::C);
+ QCoreApplication::setOrganizationName(MeshLabApplication::organization());
+ #if QT_VERSION >= 0x050100