sci-visualization/gwyddion: Backport patches which upstream declares important, #453158

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 170 insertions, 13 deletions

diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index 1bd0b44d0ce0..373d97a09f3a 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/gwyddion
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.44 2012/12/06 10:11:45 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.45 2013/01/23 10:21:53 jlec Exp $
+
+*gwyddion-2.30-r1 (23 Jan 2013)
+
+  23 Jan 2013; Justin Lecher <jlec@gentoo.org> +gwyddion-2.30-r1.ebuild,
+  +files/gwyddion-2.30-BGRA.patch,
+  +files/gwyddion-2.30-color-button-debris-crash.patch, metadata.xml:
+  Backport patches which upstream declares important, #453158
 
   06 Dec 2012; Justin Lecher <jlec@gentoo.org> -gwyddion-2.25.ebuild:
   Drop old
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index c13a37268fc8..f383404515b3 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gwyddion-2.25-libpng15.patch 158 SHA256 e039b79411177aeb4be582888503536984fc08d81f8d1d135298c3605b32e2ad SHA512 4d9646b63c4b0d20b7a080dbc7d5d053b721ddc9d708ba206f547d3ba98d9d6a09b1021a21466f5a50a4a250bb30cb13fe68835c00f2c356c307d4ceade636fc WHIRLPOOL 9de6d963ddb686b4910a1e1ffd2290f5eead2b13ee26e4fb36dcee600a89e7ac64343319f3865f48d80e6f3be3aa7917178c1257c31f6b954cd4a80d04b92cb7
+AUX gwyddion-2.30-BGRA.patch 471 SHA256 a96e82f1eb22f2c098fd5bf8fb517d038512e362ef4bec74849ff4bcd654a701 SHA512 64e50df0de885f74aece4e9b9e51dba928a8f9edc3ece766507d8ede101b674e1183d40e970a8c3e19ffd2e3d33a8aaa4f0b542246024886e4f2e610912aa698 WHIRLPOOL 7ab5a726b369fa9d128603837fdbd284e0544bd4fb1b5077b110b91588002b86e259da3145e6f4f05ab77f1518668d12421a773e968e1d924e56b0b9ed09e089
+AUX gwyddion-2.30-color-button-debris-crash.patch 1805 SHA256 b017da6d374f8b35760104010f6828e3195fb2ec59da9c294f81ca96a572866c SHA512 6990b2bfe218af0d4529158010c25901d59739deef10f2077a95d246d508c4f2f6ed03fa57e7d19f83b5bb1755d4c207f5f2b898f768ecafe9c1ee335d91e16f WHIRLPOOL ca3f709bc0234e1a8a014047c80a6d28a1219928e1c7cae039bce40d4f6eb24f78a9d921624a65cc8425806c8d73ff37cc1e60b146262326793a70ab6761224c
 DIST gwyddion-2.29.tar.xz 2808868 SHA256 d7dd3b5bfb254cf158cfed80ebd2495fb1142f8189594c7d6f8f6a9944e5c64b SHA512 2b88ea1a872e8b9a228248d2ba94d96000d46a1a483202ed830198829ff21de21f6d13a1ec833ad0b93a12e112415798963c48b9b8cfca05e9e3fe8c2bb28f2b WHIRLPOOL 025d1552df7871515db8a6d1157dcb1562d16db14007f5adc762f8a5b504d53cc1732400d9f4b32d5ff2ea06726e24b6513f13b2f9c7f058f0f602027560da66
 DIST gwyddion-2.30.tar.xz 2771208 SHA256 3778e56ec5f2d2333297c9aa2b850a1cb2b29b9e71421657223c44f30e05b140 SHA512 b311e086115446eb7d43cbcc2eee244ba145445f3742eb615efd02da4d95e68fc8d8d026ccb5869cd9c54b02978e27a9081aedc20afdb339c6636ee883e43734 WHIRLPOOL c696693f960006458a0af743057579d2516b15a97dff68dc780802c5800c5b14df1012059de83221f7bd0805e9ebbc44425144669f2ce78f32ee6f75a3669f0e
 EBUILD gwyddion-2.29.ebuild 1947 SHA256 49abc89d267e719efbed54ef7d2cde26df64919d78662671eb4a2c2bf6bbfb85 SHA512 247fb9b41b847e36c36d4b5bf07f1f5b41f1bffe5d58d396efb1ea24553809bb01f51387ab62804a1517beddc038670b09e838f8c616ec0a028cdc3bb333b60d WHIRLPOOL 3bce8bb89fa841faae87daa453e114a3868f19a4b7d9d8575b42b77f7dff8154e23ab3e3f348f0aed4f8bf10f7958f77d57b3331838d071a8a2460de5fd3e27a
+EBUILD gwyddion-2.30-r1.ebuild 2012 SHA256 09bb4b86a433b5dbcfd608fc12a48e96359780d734336965e9e7c98082690c03 SHA512 f430f3e307a8678c12adf06721876c8a3f9c7bc8fac6ab373516e437fb719e9c42d9369b18cabf6322ca500b056a2f76f5cb99a734b4c1cb3d6e517f28816da4 WHIRLPOOL bafa916aea528fabf77cef109132d483bdf082e6575e3e9f8e2cebffba4e475f8fa255b2827f53f710a407d5c92df7a1d395c15d37a973f83bb95d7a2cbd66ed
 EBUILD gwyddion-2.30.ebuild 1947 SHA256 c80b6e6e8b4d2a639f9a9b5b483e56a3cb3280b84bbce1008b93fd87cc8a65c7 SHA512 623e031bcdf70db2f28df50f70e3b0c61883e9fc291f01d5add7eddd39114c66dac28efb65ca085bf5e74d458ad872b4a0e23666123843364d609aaf4cee882c WHIRLPOOL adf446fcb0581955aba71c572f8c550194f630ff23b6fe72f38c3e3200c21b6d293910ebca0e27ced1d865611f06e737af2526c294f447d0e9e9244b275be405
-MISC ChangeLog 6606 SHA256 115c88fa61f7eff828a44b51394f596afffbe923d0151a4a558d3244b54ffbc5 SHA512 d293de76d243905dc13060b33388fe23966ac3218b16591c26027514453c5ae319ed806748c41c41a1927512a091a42c063bd0197c5b27a103eccb92010ef327 WHIRLPOOL df450b64b7bc523915406c1cb9a5eb64994b9baca5901a73322ca96b45e4a153f2eca2494c3350b1dfa846eafd1fd8d0e8ebef2922cf6b6e01b067398a9b0500
-MISC metadata.xml 608 SHA256 ac04512448ba0083d06c9d570b989edfcfec59c6d1477ebfc1e7dc35e9a6158e SHA512 6d2f442358c94f03e9ad8558af0e8471b8b3803aaae3fcf5f9fe4caa6ad3f98718fe4c5975977041e2ec4e82241e0f5e82cce58d6ada05f98ffded079a947e11 WHIRLPOOL 93942f0b54c83f8eb01127ad82cda36a93d21e0d2ade78826696514e70b523cb886abaf6b9d51789537ef99c72e7d22598402f9d0f8a46cedfac6ab5fef77221
+MISC ChangeLog 6880 SHA256 a7d8a74aaad53e9dbc35d7f3bed18ff33c6e764c1c8df61a82ec8a8205375965 SHA512 dbd403f208a20edf5c42e76fe288f942e2f3fa2a767b85016015198138912188d9e0d3ef940abc3adb61fccbc951e86803dc90262ff61911b72eeb01406ca7a8 WHIRLPOOL 35d474c9a0cd63b6f923aef494c84a6f4977d45c3d7bc882f2c0351c9f7bfa9f2bc3992a68261314ba243b8daed8cef9b6e1e23da80665643a43b659afec4e8d
+MISC metadata.xml 614 SHA256 987e2c48924636f8812052f16627d0ab1366e5428656c743d796ffe641b8bb0e SHA512 15d7aad4ea047e0af1e31a9dd5043733b31810f690c1163948dcc916102d90992180e50f7c4590cc032b47915b9bc95a8b4655375c08a6a3043a569bdc0a7654 WHIRLPOOL baeaf0dc4506ee222b0fa56cf197b1941ddf3641f32cb1cf3995c7f5650fda0ca17d69cfefa5c40e00f1acdd2f0b5a908a1619f9f9f2514aa7fbc70db2f7e76a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDAb2IACgkQgAnW8HDreRbFjQCbBqP5p1tvwweI6zeIXO4ztHJK
-TuMAn3ppo0z4UXHw9EtQoR4i3Xg/vH9t
-=MQcz
+iEYEAREKAAYFAlD/ucIACgkQgAnW8HDreRZxAACgjZ7kDZzleEcO/+yxS3mmkJF5
+xF4An05ZEAHkgY0F3UJW52TEBNN3Od8v
+=+L+c
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch b/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch
new file mode 100644
index 000000000000..c3b59122b99c
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch
@@ -0,0 +1,22 @@
+Index: libgwydgets/gwy3dview.c
+===================================================================
+--- libgwydgets/gwy3dview.c	(revision 13961)
++++ libgwydgets/gwy3dview.c	(working copy)
+@@ -48,7 +48,6 @@
+ #include <GL/glext.h>
+ #endif
+ #endif
+-#endif
+ 
+ #ifndef GL_BGRA
+ #ifdef GL_BGRA_EXT
+@@ -57,6 +56,7 @@
+ #error FIXME: GL_BGRA is not available, should work around it.
+ #endif
+ #endif
++#endif
+ 
+ #include <libgwyddion/gwymacros.h>
+ #include <libgwyddion/gwymath.h>
+
+
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch b/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch
new file mode 100644
index 000000000000..e6ceedf919e3
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch
@@ -0,0 +1,37 @@
+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/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild
new file mode 100644
index 000000000000..164d24aa2a37
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild,v 1.1 2013/01/23 10:21:53 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils fdo-mime gnome2-utils python
+
+DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
+HOMEPAGE="http://gwyddion.net/"
+SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
+
+RDEPEND="
+	media-libs/libpng:0
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libXmu
+	x11-libs/pango
+	fftw? ( sci-libs/fftw:3.0 )
+	gnome? ( gnome-base/gconf:2 )
+	kde? ( kde-base/kdelibs:4 )
+	opengl? ( virtual/opengl x11-libs/gtkglext )
+	perl? ( dev-lang/perl )
+	python? ( dev-python/pygtk:2 )
+	ruby? ( dev-ruby/narray )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+MAKEOPTS+=" V=1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.25-libpng15.patch
+	"${FILESDIR}"/${P}-BGRA.patch
+	"${FILESDIR}"/${P}-color-button-debris-crash.patch
+	)
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-rpath
+		$(use_enable doc gtk-doc)
+		$(use_enable nls)
+		$(use_enable python pygwy)
+		$(use_with perl)
+		$(use_with python)
+		$(use_with ruby)
+		$(use_with fftw fftw3)
+		$(use_with opengl gl) \
+		$(use_with sourceview gtksourceview)
+		$(use_with xml libxml2)
+		$(use_with X x)
+		$(use_with kde kde4-thumbnailer)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	use python && dodoc modules/pygwy/README.pygwy
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+	fdo-mime_desktop_database_update
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/gwyddion/metadata.xml b/sci-visualization/gwyddion/metadata.xml
index 6c5e0e08ed66..3f27823a6510 100644
--- a/sci-visualization/gwyddion/metadata.xml
+++ b/sci-visualization/gwyddion/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   Gwyddion is a modular program for SPM data analysis. Primarily it is
   supposed to be used for analysis of height fields obtained by means of
   scanning probe microscopy techniques (AFM, MFM, STM, NSOM), but
   generally it can be used for any other height field analysis or
   image analysis.
 </longdescription>
-	<use>
-		<flag name="sourceview">
+  <use>
+    <flag name="sourceview">
     Enable support for <pkg>x11-libs/gtksourceview</pkg>
   </flag>
-	</use>
+  </use>
 </pkgmetadata>