diff options
| author | Daniil Bratashov <dn2010@gmail.com> | 2016-11-04 19:42:30 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-11-04 19:43:11 +0700 |
| commit | 60671019569dce950389657bce42d025519edd83 (patch) | |
| tree | a2481b7c984d2c0f5a7a546563943ce69205a1d9 | |
| parent | eb10d74a9b54d52fc781a93859d0302c91cfa9b7 (diff) | |
| download | slackbuilds-60671019569dce950389657bce42d025519edd83.tar.gz | |
academic/gwyddion: Add more patches.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | academic/gwyddion/gwyddion-2.46-jpkscan-no-minizip.patch (renamed from academic/gwyddion/gwyddion-2.46-no-minizip.patch) | 6 | ||||
| -rw-r--r-- | academic/gwyddion/gwyddion-2.46-selection-set-data.patch | 12 | ||||
| -rw-r--r-- | academic/gwyddion/gwyddion.SlackBuild | 7 |
3 files changed, 18 insertions, 7 deletions
diff --git a/academic/gwyddion/gwyddion-2.46-no-minizip.patch b/academic/gwyddion/gwyddion-2.46-jpkscan-no-minizip.patch index fc851e3637..fde5e373de 100644 --- a/academic/gwyddion/gwyddion-2.46-no-minizip.patch +++ b/academic/gwyddion/gwyddion-2.46-jpkscan-no-minizip.patch @@ -1,7 +1,5 @@ -Index: modules/file/jpkscan.c -=================================================================== ---- modules/file/jpkscan.c (revision 19092) -+++ modules/file/jpkscan.c (working copy) +--- gwyddion-2.46/modules/file/jpkscan.c ++++ gwyddion/modules/file/jpkscan.c @@ -52,6 +52,7 @@ #include "config.h" diff --git a/academic/gwyddion/gwyddion-2.46-selection-set-data.patch b/academic/gwyddion/gwyddion-2.46-selection-set-data.patch new file mode 100644 index 0000000000..1799ad5727 --- /dev/null +++ b/academic/gwyddion/gwyddion-2.46-selection-set-data.patch @@ -0,0 +1,12 @@ +--- 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); diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild index 04397682e1..841442a94c 100644 --- a/academic/gwyddion/gwyddion.SlackBuild +++ b/academic/gwyddion/gwyddion.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gwyddion VERSION=${VERSION:-2.46} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,8 +69,9 @@ 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 {} \; -# patch for 2.46 version atoi problem -patch -p0 < $CWD/gwyddion-2.46-no-minizip.patch +# 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" \ |