aboutsummaryrefslogtreecommitdiff
path: root/academic
diff options
context:
space:
mode:
authorDaniil Bratashov <dn2010@gmail.com>2016-10-20 21:45:36 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-10-20 21:45:36 +0700
commit2e92d45fb981d3003eec9b2b900c51dd5cf11f88 (patch)
treebf46974edb8b9562670bde42f6201de988856ff6 /academic
parent7bcc6d2c0997d43594d163ff3aa8c6ae983a03f0 (diff)
academic/gwyddion: Allow build without libminizip.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/gwyddion/gwyddion-2.46-no-minizip.patch12
-rw-r--r--academic/gwyddion/gwyddion.SlackBuild5
2 files changed, 16 insertions, 1 deletions
diff --git a/academic/gwyddion/gwyddion-2.46-no-minizip.patch b/academic/gwyddion/gwyddion-2.46-no-minizip.patch
new file mode 100644
index 0000000000000..fc851e3637d79
--- /dev/null
+++ b/academic/gwyddion/gwyddion-2.46-no-minizip.patch
@@ -0,0 +1,12 @@
+Index: modules/file/jpkscan.c
+===================================================================
+--- modules/file/jpkscan.c (revision 19092)
++++ modules/file/jpkscan.c (working copy)
+@@ -52,6 +52,7 @@
+
+ #include "config.h"
+ #include <string.h>
++#include <stdlib.h>
+ #include <libgwyddion/gwymacros.h>
+ #include <libgwyddion/gwymath.h>
+ #include <libgwyddion/gwyutils.h>
diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild
index 9127ba917d01f..04397682e1928 100644
--- a/academic/gwyddion/gwyddion.SlackBuild
+++ b/academic/gwyddion/gwyddion.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=gwyddion
VERSION=${VERSION:-2.46}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# patch for 2.46 version atoi problem
+patch -p0 < $CWD/gwyddion-2.46-no-minizip.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \