diff options
| author | Daniil Bratashov <dn2010@gmail.com> | 2014-10-01 09:04:51 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-10-03 10:16:54 +0700 |
| commit | 39615f9c1cd9e9211dd32fe4d28ea9130d32440d (patch) | |
| tree | 6905fc7d597530053e8f0f6dd7f22706a2bed267 | |
| parent | cbe9d548b9cfa751e7b4fd2b6f0d6f28e2a3e732 (diff) | |
| download | slackbuilds-39615f9c1cd9e9211dd32fe4d28ea9130d32440d.tar.gz | |
academic/gwyddion: Fix crash on save.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | academic/gwyddion/gwyddion-2.38-stat-tool-save-crash.patch | 13 | ||||
| -rw-r--r-- | academic/gwyddion/gwyddion.SlackBuild | 8 |
2 files changed, 18 insertions, 3 deletions
diff --git a/academic/gwyddion/gwyddion-2.38-stat-tool-save-crash.patch b/academic/gwyddion/gwyddion-2.38-stat-tool-save-crash.patch new file mode 100644 index 0000000000..470ad5a50c --- /dev/null +++ b/academic/gwyddion/gwyddion-2.38-stat-tool-save-crash.patch @@ -0,0 +1,13 @@ +Index: modules/tools/stats.c +=================================================================== +--- modules/tools/stats.c (revision 16602) ++++ modules/tools/stats.c (working copy) +@@ -1096,7 +1096,7 @@ + area = report_data->same_units ? fmt_val(area) : g_strdup(_("N.A.")); + projarea = fmt_val(projarea); + +- vf = gwy_si_unit_get_format_with_digits(siunitarea, ++ vf = gwy_si_unit_get_format_with_digits(siunitvar, + GWY_SI_UNIT_FORMAT_PLAIN, + report_data->results.var, 3, vf); + var = fmt_val(var); diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild index b6e2d0d7f1..e282a5768c 100644 --- a/academic/gwyddion/gwyddion.SlackBuild +++ b/academic/gwyddion/gwyddion.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gwyddion -# Copyright 2012-2014 Daniil Bratashov <dn2010@gmail.com> +# Copyright 2012 Daniil Bratashov <dn2010@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=gwyddion VERSION=${VERSION:-2.38} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -67,7 +67,9 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch --verbose -p0 < $CWD/gwyddion-2.38-stat-tool-save-crash.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |