From 26af8032cb942174e50f2bb686609daf9e7e8e4d Mon Sep 17 00:00:00 2001
From: Daniil Bratashov <dn2010@gmail.com>
Date: Thu, 23 Jun 2011 21:34:35 -0400
Subject: academic/gwyddion: Updated for version 2.25.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 .../gwyddion-2.24-maskedit-drawing-crash.patch     | 22 ----------------------
 academic/gwyddion/gwyddion.SlackBuild              | 11 ++++-------
 academic/gwyddion/gwyddion.info                    |  9 ++++-----
 3 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch

(limited to 'academic/gwyddion')

diff --git a/academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch b/academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch
deleted file mode 100644
index 49654813cc..0000000000
--- a/academic/gwyddion/gwyddion-2.24-maskedit-drawing-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 64425e80f0..1e34cecbae 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.24}
+VERSION=${VERSION:-2.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -44,7 +44,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 
-cd $PRGNAM-$VERSION 
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -52,9 +52,6 @@ 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 \
@@ -69,7 +66,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make V=1
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/academic/gwyddion/gwyddion.info b/academic/gwyddion/gwyddion.info
index a989fe0ff2..eb1f02372f 100644
--- a/academic/gwyddion/gwyddion.info
+++ b/academic/gwyddion/gwyddion.info
@@ -1,11 +1,10 @@
 PRGNAM="gwyddion"
-VERSION="2.24"
+VERSION="2.25"
 HOMEPAGE="http://gwyddion.net"
-DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.24.tar.bz2"
-MD5SUM="6dd8b45a821f320e175575a83097dcca"
+DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.25.tar.bz2"
+MD5SUM="bc75c5aba6f07dd1e8239ec8e1d09e05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Daniil Bratashov"
 EMAIL="dn2010@gmail.com"
-APPROVED="Niels Horn"
-
+APPROVED="dsomero"
-- 
cgit v1.2.3-65-gdbad