Fix build with GCC 4.5 wrt bug 322211. Thanks to Diego for reporting. Apply fedora patch to fix random SIGSEGV

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 83 insertions, 10 deletions

diff --git a/sci-mathematics/drgeo/ChangeLog b/sci-mathematics/drgeo/ChangeLog
index 2be0dc3e57dd..642e1a67c924 100644
--- a/sci-mathematics/drgeo/ChangeLog
+++ b/sci-mathematics/drgeo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/drgeo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.18 2009/09/20 12:52:43 betelgeuse Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.19 2010/07/10 15:00:26 xarthisius Exp $
+
+  10 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> drgeo-1.1.0.ebuild,
+  +files/drgeo-1.1.0-gcc45.patch:
+  Fix build with GCC 4.5 wrt bug 322211. Thanks to Diego for reporting.
+  Apply fedora patch to fix random SIGSEGV
 
   20 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> drgeo-1.1.0.ebuild:
   Migrate to EAPI 2 in order to nuke built_with_use.
diff --git a/sci-mathematics/drgeo/Manifest b/sci-mathematics/drgeo/Manifest
index 203d701c48e6..df7fc1f91201 100644
--- a/sci-mathematics/drgeo/Manifest
+++ b/sci-mathematics/drgeo/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX drgeo-1.1.0-gcc45.patch 1099 RMD160 be2a3288516d1866c93afeaeb73245085902e2a0 SHA1 2c8d4352a6423b7072390e01eddc374479554ae7 SHA256 971c5a4e4341f70125cb969caea9ff01c242f82ce29ae83a0b2437740befcfb8
 DIST drgeo-1.1.0.tar.gz 1608361 RMD160 94859c622cf9a48f6134d7e348e6f5e94a43ed6c SHA1 7b988233fbcaac8002bd20e4e61c37240a739c29 SHA256 8c93bb637c11ca1647f90e0d97ea03d5938efddc36c2d73b40f15ff8df672216
 DIST drgeo-doc-1.5.tar.gz 2730242 RMD160 4a39bd3faac08728f2221bd1a69320bf53cc7bf6 SHA1 5a504e4b80e97c51851772a00c83db226120d19e SHA256 a6453dc630a40dd1c84ed90a7b7ff4fa3806e4e3ce01d149b59df29318255cb2
-EBUILD drgeo-1.1.0.ebuild 1311 RMD160 6f1e43e74aecb873427d662439f466f5dac5d982 SHA1 aeedb698adc1b55a794cfad763706186792c0307 SHA256 e6b0bd8812dbafca12625965070164e1620fc91605b09d93a48aec9c7bb1433c
-MISC ChangeLog 3078 RMD160 bd3bce9df48699fc9f4d82e3be13f6713f90a95e SHA1 f64ce4caf927b290663aece303a6ec2a80b9c508 SHA256 739373049852b913768920b5ab0787e8144abf83c36809547fda4948b3bcc4a2
+EBUILD drgeo-1.1.0.ebuild 1369 RMD160 43425fcd1b671c295fb5e2027ab8e4eb49642e0d SHA1 c94d2517075d13fb4d22f61036a00538e413e47b SHA256 8e32f2d58fd64d45a76ffa55debb489f51b90707db42b7493893c29a015fd4f6
+MISC ChangeLog 3302 RMD160 911e6bcb1ba79552dd55a61faf1e084cc9a50797 SHA1 144f76be235aa6c70a48f210857a59ade94feb0c SHA256 05a00e1f32c5ccb81af1781894ef234031c83a3193e87ff795bedf0de14f4a65
 MISC metadata.xml 673 RMD160 4ad9daa1f86377880c375b7ef7e1cc8d72bbb7e2 SHA1 53fde03dbf26a40be1c350468eb09cfcf8ae9e84 SHA256 fdd51ca764c12140e3bfa1a0022038026d192e8fd0c8c99f1ec0c59536d19615
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkq2JaEACgkQcxLzpIGCsLQO5gCfaLQlIP8f7clO5mua0S1OE8XC
-0UoAnje5QxI/8JX8cflfLpLvdJCSFZUD
-=Wwns
+iJwEAQECAAYFAkw4ixQACgkQIiMqcbOVdxTC/AP+LfR3uy2lS91YESyh0+mL9bV2
+NO8dLItTuiI45pCYfYhP8jr6SMtQQ95NIUFXS6gM1rBQfL0yarraH9HGGwCEW/f9
+o4b2xrzwyuVNJHAGmobBh6olJd2nkuvLPlxMXCj5w1zTYHMHRHzLYcNlWgCQTGrY
+yYqftt+EeTN+yB8lr7Y=
+=MMZx
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
index e2aa560c273f..3e9e30b532b8 100644
--- a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
+++ b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.6 2009/09/20 12:52:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.7 2010/07/10 15:00:26 xarthisius Exp $
 
 EAPI="2"
 
@@ -31,6 +31,10 @@ RDEPEND=">=x11-libs/gtk+-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc45.patch
+}
+
 src_configure() {
 	default
 	# Can't make the documentation as it depends on Hyperlatex which isn't
diff --git a/sci-mathematics/drgeo/files/drgeo-1.1.0-gcc45.patch b/sci-mathematics/drgeo/files/drgeo-1.1.0-gcc45.patch
new file mode 100644
index 000000000000..1d8e93e06fea
--- /dev/null
+++ b/sci-mathematics/drgeo/files/drgeo-1.1.0-gcc45.patch
@@ -0,0 +1,61 @@
+Fix build with GCC 4.5, fix random SIGSEGV
+
+http://bugs.gentoo.org/show_bug.cgi?id=322211
+https://bugzilla.redhat.com/show_bug.cgi?id=454045
+
+--- geo/drgeo_figure.h
++++ geo/drgeo_figure.h
+@@ -322,4 +322,11 @@
+   gboolean showGrid;
+ };
+ 
++struct
++{
++  drgeoPoint mouse;
++  drgeoFigure *figure;
++}
++drgeoDialogData;
++
+ #endif
+--- geo/drgeo_figure.cc
++++ geo/drgeo_figure.cc
+@@ -48,13 +48,6 @@
+ #include "drgeo_dialog.h"
+ #include "traite.h"
+ 
+-extern struct
+-{
+-  drgeoPoint mouse;
+-  drgeoFigure *figure;
+-}
+-drgeoDialogData;
+-
+ typedef struct drgeoSearchValue
+ {
+   gpointer value;
+@@ -1309,7 +1302,7 @@
+ gint
+ drgeoFigure::preferedUndoLevel ()
+ {
+-  atoi (drgeoConfigGet (":undoLevel"));
++  return atoi (drgeoConfigGet (":undoLevel"));
+ }
+ 
+ void
+--- geo/drgeo_dialog.cc
++++ geo/drgeo_dialog.cc
+@@ -38,14 +38,6 @@
+ // Used in the style dialod callback, I know it's ugly, but so easy
+ static drgeoFigure *selected_figure;
+ 
+-struct
+-{
+-  drgeoPoint mouse;
+-  drgeoFigure *figure;
+-}
+-drgeoDialogData;
+-
+-
+ static void drgeo_edit_dialog_cb (GtkWidget * dialog,
+ 				  gint button, gpointer entry);
+