academic/gwyddion: Allow build without libminizip.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
2016-10-20 21:45:36 +07:00 · 2016-10-20 21:45:36 +07:00 · 2e92d45fb9
parent 7bcc6d2c09
commit 2e92d45fb9
2 changed files with 16 additions and 1 deletions
--- a/academic/gwyddion/gwyddion-2.46-no-minizip.patch
+++ 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>
--- 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 \