diff options
| -rw-r--r-- | academic/gwyddion/gwyddion-2.30-color-button-debris-crash.patch | 37 | ||||
| -rw-r--r-- | academic/gwyddion/gwyddion.SlackBuild | 7 | ||||
| -rw-r--r-- | academic/gwyddion/gwyddion.info | 6 | ||||
| -rw-r--r-- | academic/gwyddion/slack-desc | 10 |
4 files changed, 10 insertions, 50 deletions
diff --git a/academic/gwyddion/gwyddion-2.30-color-button-debris-crash.patch b/academic/gwyddion/gwyddion-2.30-color-button-debris-crash.patch deleted file mode 100644 index e6ceedf919..0000000000 --- a/academic/gwyddion/gwyddion-2.30-color-button-debris-crash.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: modules/file/pixmap.c -=================================================================== ---- modules/file/pixmap.c (revision 13902) -+++ modules/file/pixmap.c (revision 13903) -@@ -2933,8 +2933,6 @@ - gwy_rgba_to_gdk_color(&controls->args->inset_color, &gdkcolor); - - dialog = gtk_color_selection_dialog_new(_("Change Inset Color")); -- if (gtk_major_version == 2 && gtk_minor_version < 10) -- - selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel; - gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector), - &gdkcolor); -Index: libgwydgets/gwygraphareadialog.c -=================================================================== ---- libgwydgets/gwygraphareadialog.c (revision 13902) -+++ libgwydgets/gwygraphareadialog.c (revision 13903) -@@ -383,7 +383,6 @@ - dialog->color_dialog = selector; - dialog->old_color = cmodel->color; - -- if (gtk_major_version == 2 && gtk_minor_version < 10) - colorsel = GTK_COLOR_SELECTION_DIALOG(selector)->colorsel; - g_signal_connect(selector, "response", - G_CALLBACK(colorsel_response_cb), dialog); -Index: libgwydgets/gwydgetutils.c -=================================================================== ---- libgwydgets/gwydgetutils.c (revision 13902) -+++ libgwydgets/gwydgetutils.c (revision 13903) -@@ -561,7 +561,6 @@ - dialog = gtk_color_selection_dialog_new(dialog_title - ? dialog_title - : _("Change Mask Color")); -- if (gtk_major_version == 2 && gtk_minor_version < 10) - selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel; - gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector), - &gdkcolor); diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild index 1b9766342a..9feae44bf8 100644 --- a/academic/gwyddion/gwyddion.SlackBuild +++ b/academic/gwyddion/gwyddion.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gwyddion -# Copyright 2012 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 @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gwyddion -VERSION=${VERSION:-2.30} +VERSION=${VERSION:-2.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,9 +69,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Color selector crash in mask color (2.30 only) -patch -p0 < $CWD/gwyddion-2.30-color-button-debris-crash.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/academic/gwyddion/gwyddion.info b/academic/gwyddion/gwyddion.info index 6f6b4d31af..992c2ea8c8 100644 --- a/academic/gwyddion/gwyddion.info +++ b/academic/gwyddion/gwyddion.info @@ -1,8 +1,8 @@ PRGNAM="gwyddion" -VERSION="2.30" +VERSION="2.31" HOMEPAGE="http://gwyddion.net" -DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.30.tar.xz" -MD5SUM="69c4eff68481b998bbcd1aadd2d96112" +DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.31.tar.xz" +MD5SUM="ef2fd93d20478c9b709fe5f8818845f8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkglext" diff --git a/academic/gwyddion/slack-desc b/academic/gwyddion/slack-desc index 0c99965a00..35f03c741b 100644 --- a/academic/gwyddion/slack-desc +++ b/academic/gwyddion/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| gwyddion: gwyddion (scanning probe microscopy data analyzer) |