academic/gwyddion: Updated for version 2.47.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Daniil Bratashov 2016-11-20 06:50:59 +07:00 committed by Willy Sudiarto Raharjo
parent 493ecdad24
commit c66c896ae1
No known key found for this signature in database
GPG key ID: 887B8374D7333381
4 changed files with 5 additions and 31 deletions

View file

@ -1,10 +0,0 @@
--- gwyddion-2.46/modules/file/jpkscan.c
+++ gwyddion/modules/file/jpkscan.c
@@ -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>

View file

@ -1,12 +0,0 @@
--- gwyddion-2.46/libdraw/gwyselection.c
+++ gwyddion/libdraw/gwyselection.c
@@ -638,7 +638,8 @@
if (nselected) {
g_return_if_fail(data);
- memcpy((gdouble*)selection->objects->data, data, nselected*object_size);
+ gwy_assign((gdouble*)selection->objects->data, data,
+ nselected*object_size);
}
selection->n = nselected;
g_signal_emit(selection, selection_signals[CHANGED], 0, -1);

View file

@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gwyddion
VERSION=${VERSION:-2.46}
BUILD=${BUILD:-3}
VERSION=${VERSION:-2.47}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -69,10 +69,6 @@ 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 {} \;
# official post-release patches for problems in version 2.46
patch -p1 < $CWD/gwyddion-2.46-jpkscan-no-minizip.patch
patch -p1 < $CWD/gwyddion-2.46-selection-set-data.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \

View file

@ -1,8 +1,8 @@
PRGNAM="gwyddion"
VERSION="2.46"
VERSION="2.47"
HOMEPAGE="http://gwyddion.net"
DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.46.tar.xz"
MD5SUM="190954548cb3415dc0ff274ca8b385ee"
DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.47.tar.xz"
MD5SUM="d8dc45ef3525f20c45fe65aeb9a679a6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gtkglext"