aboutsummaryrefslogtreecommitdiff
path: root/academic/gwyddion
diff options
context:
space:
mode:
authorDaniil Bratashov <dn2010@gmail.com>2011-05-16 14:39:09 -0300
committerRobby Workman <rworkman@slackbuilds.org>2011-05-17 09:56:19 -0500
commit2be4492162bcb841adb21f8991f45755a561191f (patch)
tree5cd49617fa2e7dd08bde45806e816a2eecdc1abe /academic/gwyddion
parent50bbb646adcfed7455d7ae33e2d3001013388784 (diff)
academic/gwyddion: Updated for version 2.24.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
Diffstat (limited to 'academic/gwyddion')
-rw-r--r--academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch22
-rw-r--r--academic/gwyddion/gwyddion.SlackBuild12
-rw-r--r--academic/gwyddion/gwyddion.info9
3 files changed, 35 insertions, 8 deletions
diff --git a/academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch b/academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch
new file mode 100644
index 0000000000000..49654813cc23a
--- /dev/null
+++ b/academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch
@@ -0,0 +1,22 @@
+Index: modules/tools/maskedit.c
+===================================================================
+--- modules/tools/maskedit.c (revision 12328)
++++ modules/tools/maskedit.c (revision 12329)
+@@ -159,7 +159,7 @@
+ N_("Mask editor tool, allows to interactively add or remove parts "
+ "of mask."),
+ "Yeti <yeti@gwyddion.net>",
+- "3.1",
++ "3.2",
+ "David Nečas (Yeti) & Petr Klapetek",
+ "2004",
+ };
+@@ -1524,8 +1524,6 @@
+ if (tool->in_setup || tool->args.style != MASK_EDIT_STYLE_DRAWING)
+ return;
+
+- g_assert_not_reached();
+-
+ if (tool->args.tool == MASK_TOOL_PAINT_DRAW)
+ fillvalue = 1.0;
+ else if (tool->args.tool == MASK_TOOL_PAINT_ERASE)
diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild
index b15093999f7e2..64425e80f031f 100644
--- a/academic/gwyddion/gwyddion.SlackBuild
+++ b/academic/gwyddion/gwyddion.SlackBuild
@@ -5,7 +5,7 @@
# Written by Daniil Bratashov <dn2010@gmail.com>
PRGNAM=gwyddion
-VERSION=${VERSION:-2.22}
+VERSION=${VERSION:-2.24}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,9 +40,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
@@ -52,6 +52,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+#patch for 2.24 crash in mask edit tool
+patch -p0 < $CWD/gwyddion-2.24-maskedit-drawing-crash.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -63,7 +66,7 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
-make
+make V=1
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -80,3 +83,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/academic/gwyddion/gwyddion.info b/academic/gwyddion/gwyddion.info
index d6a0e15c43cb7..a989fe0ff2874 100644
--- a/academic/gwyddion/gwyddion.info
+++ b/academic/gwyddion/gwyddion.info
@@ -1,10 +1,11 @@
PRGNAM="gwyddion"
-VERSION="2.22"
+VERSION="2.24"
HOMEPAGE="http://gwyddion.net"
-DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.22.tar.bz2"
-MD5SUM="c616c9faf2c7bead214b953807b01161"
+DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.24.tar.bz2"
+MD5SUM="6dd8b45a821f320e175575a83097dcca"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Daniil Bratashov"
EMAIL="dn2010@gmail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
+