mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-18 22:06:04 +01:00
academic/gwyddion: Updated for version 2.25.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
parent
3275c4875e
commit
26af8032cb
3 changed files with 8 additions and 34 deletions
|
@ -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)
|
|
@ -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}
|
||||
|
||||
|
@ -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 {} \;
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue