patch for building with gcc4 from Robert Marmorstein via bug #128200

Package-Manager: portage-2.1.1

5 files changed, 425 insertions, 24 deletions

diff --git a/media-libs/sdl-gui/ChangeLog b/media-libs/sdl-gui/ChangeLog
index aa389b68d4e1..ee386aa2bd16 100644
--- a/media-libs/sdl-gui/ChangeLog
+++ b/media-libs/sdl-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-gui
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gui/ChangeLog,v 1.5 2006/03/07 12:53:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gui/ChangeLog,v 1.6 2006/09/10 22:39:15 mr_bones_ Exp $
+
+  10 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/sdl-gui-0.10.3-gcc4.patch, sdl-gui-0.10.3.ebuild:
+  patch for building with gcc4 from Robert Marmorstein via bug #128200
 
   07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml:
   Add maintainer-needed metadata.
diff --git a/media-libs/sdl-gui/Manifest b/media-libs/sdl-gui/Manifest
index f38f3fb2bd13..39a11b6f6ab6 100644
--- a/media-libs/sdl-gui/Manifest
+++ b/media-libs/sdl-gui/Manifest
@@ -1,22 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f8427426eafd78273bbfb5bf5d9c3a87 ChangeLog 590
-RMD160 944db07c9294e49bbcba9ffa75655f124785cf59 ChangeLog 590
-SHA256 c12106c4668381b325f4556196e213745bca81c321797078767f0ce7d60c7765 ChangeLog 590
-MD5 f78fa14f0c22fb6c421f6e82d14075d7 files/digest-sdl-gui-0.10.3 66
-RMD160 e6ad6368912a10c657d195dbfaf4f9ff745a2af2 files/digest-sdl-gui-0.10.3 66
-SHA256 b62801cebd032ecca928502480d3313c7e185a0d3286eb1b05168d415a8b6531 files/digest-sdl-gui-0.10.3 66
+AUX sdl-gui-0.10.3-gcc4.patch 11491 RMD160 094e220c9e9571dee52d506b0c736ee8b22ec5db SHA1 8b9463f6c446fc6355070a79a5d79211d24f0d0f SHA256 c51002d2a6ffbec71dcdf6d8b099d43658d79ad2caa53ae5134c59c7acf87d51
+MD5 41006cb3f54250ea3f96fece5d3e9acd files/sdl-gui-0.10.3-gcc4.patch 11491
+RMD160 094e220c9e9571dee52d506b0c736ee8b22ec5db files/sdl-gui-0.10.3-gcc4.patch 11491
+SHA256 c51002d2a6ffbec71dcdf6d8b099d43658d79ad2caa53ae5134c59c7acf87d51 files/sdl-gui-0.10.3-gcc4.patch 11491
+DIST SDL_gui-0.10.3.tar.gz 680369 RMD160 1b89c9402117876a7aabf1b49ababfac6d1cea29 SHA1 96d67651217cc1bd1afa46f5b18e02b888181958 SHA256 a3a4ccbc51a04244d7df50620c4a91efb6153a3ec15a32c648fa25745ddea15c
+EBUILD sdl-gui-0.10.3.ebuild 784 RMD160 47208020bbadbcaea03e82c09012b6fef3469649 SHA1 b6a0152db397b39d9423e1b3d6de7d36a0be76af SHA256 19455270e25ff067778c2c1795b3b1d86539b0b54bab5b33c3ca65afa696416a
+MD5 71cf319e63844d5d77ea0102b112470d sdl-gui-0.10.3.ebuild 784
+RMD160 47208020bbadbcaea03e82c09012b6fef3469649 sdl-gui-0.10.3.ebuild 784
+SHA256 19455270e25ff067778c2c1795b3b1d86539b0b54bab5b33c3ca65afa696416a sdl-gui-0.10.3.ebuild 784
+MISC ChangeLog 776 RMD160 fa5cb0a5885db0596668fec79cff7cfcf30bbc01 SHA1 817bfd9ac6eb59f1024c0a38f1fbcec725dade7d SHA256 c85118578a2bff2ecb370267d4024d7ee79f6f62c813943815b31e8dfa3a2953
+MD5 9dd65db45ff54b237e8e1544cbc81219 ChangeLog 776
+RMD160 fa5cb0a5885db0596668fec79cff7cfcf30bbc01 ChangeLog 776
+SHA256 c85118578a2bff2ecb370267d4024d7ee79f6f62c813943815b31e8dfa3a2953 ChangeLog 776
+MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
 SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
-MD5 b9692aebcca80dff3d9bb6e2d6e6006a sdl-gui-0.10.3.ebuild 687
-RMD160 b0561e19138158e3297c9d9ddd90832ff5ff4b8f sdl-gui-0.10.3.ebuild 687
-SHA256 208024711d23941fc5e06e343d3ab1b65e11d9cbabbd71138ace76eac4e01b6c sdl-gui-0.10.3.ebuild 687
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDYI5AiZjviIA2XgRAvKEAJ4v81UWKjvBTFyOrXExhH1YBgJfPQCeIjVP
-mSeN+AzbhU5sA3glxvcpuOk=
-=PYEY
------END PGP SIGNATURE-----
+MD5 1ef2e24c7d386e3d0fbbcbb89e69dc8e files/digest-sdl-gui-0.10.3 244
+RMD160 c9964cb0f40dc1c63c40e73936dad0f2e15182e9 files/digest-sdl-gui-0.10.3 244
+SHA256 495cb3612147f65bc39a164ffed3aebfab4027100aa31a3823cb8be5efafb5ac files/digest-sdl-gui-0.10.3 244
diff --git a/media-libs/sdl-gui/files/digest-sdl-gui-0.10.3 b/media-libs/sdl-gui/files/digest-sdl-gui-0.10.3
index 69112af5437e..2ce05cc5eb48 100644
--- a/media-libs/sdl-gui/files/digest-sdl-gui-0.10.3
+++ b/media-libs/sdl-gui/files/digest-sdl-gui-0.10.3
@@ -1 +1,3 @@
 MD5 3a59241ce6b25b59fc951eaf4ca6a278 SDL_gui-0.10.3.tar.gz 680369
+RMD160 1b89c9402117876a7aabf1b49ababfac6d1cea29 SDL_gui-0.10.3.tar.gz 680369
+SHA256 a3a4ccbc51a04244d7df50620c4a91efb6153a3ec15a32c648fa25745ddea15c SDL_gui-0.10.3.tar.gz 680369
diff --git a/media-libs/sdl-gui/files/sdl-gui-0.10.3-gcc4.patch b/media-libs/sdl-gui/files/sdl-gui-0.10.3-gcc4.patch
new file mode 100644
index 000000000000..0155c2d28a97
--- /dev/null
+++ b/media-libs/sdl-gui/files/sdl-gui-0.10.3-gcc4.patch
@@ -0,0 +1,389 @@
+diff -Naur SDL_gui-0.10.3.old/src/AbstractButton.cc SDL_gui-0.10.3/src/AbstractButton.cc
+--- SDL_gui-0.10.3.old/src/AbstractButton.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/AbstractButton.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -75,5 +75,8 @@
+ 
+ void GUI_AbstractButton::SetClick(GUI_Callback *callback)
+ {
+-	GUI_ObjectKeep((GUI_Object **) &click, callback);
++   GUI_Object * temp;
++   temp = (GUI_Object *)click;
++	GUI_ObjectKeep(&temp, callback);
++   click = (GUI_Callback *)temp;
+ }
+diff -Naur SDL_gui-0.10.3.old/src/Button.cc SDL_gui-0.10.3/src/Button.cc
+--- SDL_gui-0.10.3.old/src/Button.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/Button.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -54,26 +54,50 @@
+ 
+ void GUI_Button::SetNormalImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &normal, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)normal;
++	if (GUI_ObjectKeep(&temp, surface)){
++      normal = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      normal = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_Button::SetHighlightImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &highlight, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)highlight;
++	if (GUI_ObjectKeep(&temp, surface)){
++      highlight = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      highlight = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_Button::SetPressedImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &pressed, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)pressed;
++	if (GUI_ObjectKeep(&temp, surface)){
++      pressed = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      pressed = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_Button::SetDisabledImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &disabled, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)disabled;
++	if (GUI_ObjectKeep(&temp, surface)){
++      disabled = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      disabled = (GUI_Surface *)temp;
+ }
+ 
+ extern "C"
+diff -Naur SDL_gui-0.10.3.old/src/Container.cc SDL_gui-0.10.3/src/Container.cc
+--- SDL_gui-0.10.3.old/src/Container.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/Container.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -165,8 +165,14 @@
+ 
+ void GUI_Container::SetBackground(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &background, surface))
++   GUI_Object* temp;
++   temp = (GUI_Object *)background;
++	if (GUI_ObjectKeep(&temp, surface)){
++      background = (GUI_Surface*)temp;
+ 		MarkChanged();
++   }
++   else
++      background = (GUI_Surface*)temp;
+ }
+ 
+ void GUI_Container::SetBackgroundColor(SDL_Color c)
+diff -Naur SDL_gui-0.10.3.old/src/Drawable.cc SDL_gui-0.10.3/src/Drawable.cc
+--- SDL_gui-0.10.3.old/src/Drawable.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/Drawable.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -229,7 +229,10 @@
+ 
+ void GUI_Drawable::SetStatusCallback(GUI_Callback *callback)
+ {
+-	GUI_ObjectKeep((GUI_Object **) &status_callback, callback);
++   GUI_Object* temp;
++   temp = (GUI_Object *)status_callback;
++	GUI_ObjectKeep(&temp, callback);
++   status_callback = (GUI_Callback *)temp;
+ }
+ 
+ int GUI_Drawable::GetFlagDelta(void)
+diff -Naur SDL_gui-0.10.3.old/src/Label.cc SDL_gui-0.10.3/src/Label.cc
+--- SDL_gui-0.10.3.old/src/Label.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/Label.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -77,8 +77,14 @@
+ 
+ void GUI_Label::SetFont(GUI_Font *afont)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &font, afont))
++   GUI_Object* temp;
++   temp = (GUI_Object *)font;
++	if (GUI_ObjectKeep(&temp, afont)){
++      font = (GUI_Font *)temp;
+ 		MarkChanged();
++   }
++   else
++      font = (GUI_Font *)temp;
+ 	// FIXME: should re-draw the text
+ }
+ 
+diff -Naur SDL_gui-0.10.3.old/src/Panel.cc SDL_gui-0.10.3/src/Panel.cc
+--- SDL_gui-0.10.3.old/src/Panel.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/Panel.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -58,11 +58,16 @@
+ 
+ void GUI_Panel::SetLayout(GUI_Layout *a_layout)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &layout, a_layout))
++   GUI_Object * temp;
++   temp = (GUI_Object *)layout;
++	if (GUI_ObjectKeep(&temp, a_layout))
+ 	{
++      layout = (GUI_Layout *)temp;
+ 		UpdateLayout();
+ 		MarkChanged();
+ 	}
++   else
++      layout = (GUI_Layout *)temp;
+ }
+ 
+ extern "C"
+diff -Naur SDL_gui-0.10.3.old/src/Picture.cc SDL_gui-0.10.3/src/Picture.cc
+--- SDL_gui-0.10.3.old/src/Picture.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/Picture.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -76,8 +76,14 @@
+ 
+ void GUI_Picture::SetImage(GUI_Surface *an_image)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &image, an_image))
++   GUI_Object *temp;
++   temp = (GUI_Object *)image;
++	if (GUI_ObjectKeep(&temp, an_image)){
++      image = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      image = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_Picture::SetCaption(GUI_Widget *a_caption)
+diff -Naur SDL_gui-0.10.3.old/src/ProgressBar.cc SDL_gui-0.10.3/src/ProgressBar.cc
+--- SDL_gui-0.10.3.old/src/ProgressBar.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/ProgressBar.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -76,14 +76,26 @@
+ 
+ void GUI_ProgressBar::SetImage1(GUI_Surface *image)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &image1, image))
++   GUI_Object * temp;
++   temp = (GUI_Object *) image1;
++	if (GUI_ObjectKeep(&temp, image)){
++      image1 = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      image1 = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_ProgressBar::SetImage2(GUI_Surface *image)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &image2, image))
++   GUI_Object * temp;
++   temp = (GUI_Object *) image2;
++	if (GUI_ObjectKeep(&temp, image)){
++      image2 = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      image2 = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_ProgressBar::SetPosition(double a_value)
+diff -Naur SDL_gui-0.10.3.old/src/Screen.cc SDL_gui-0.10.3/src/Screen.cc
+--- SDL_gui-0.10.3.old/src/Screen.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/Screen.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -154,8 +154,14 @@
+ 
+ void GUI_Screen::SetBackground(GUI_Surface *image)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &background, image))
++   GUI_Object * temp;
++   temp = (GUI_Object *)background;
++	if (GUI_ObjectKeep(&temp, image)){
++      background = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      background = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_Screen::SetBackgroundColor(SDL_Color c)
+diff -Naur SDL_gui-0.10.3.old/src/ScrollBar.cc SDL_gui-0.10.3/src/ScrollBar.cc
+--- SDL_gui-0.10.3.old/src/ScrollBar.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/ScrollBar.cc	2006-03-31 00:29:39.000000000 -0500
+@@ -159,14 +159,26 @@
+ 
+ void GUI_ScrollBar::SetKnobImage(GUI_Surface *image)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &knob, image))
++   GUI_Object* temp;
++   temp = (GUI_Object *)knob;
++	if (GUI_ObjectKeep(&temp, image)){
++      knob = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      knob = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_ScrollBar::SetBackgroundImage(GUI_Surface *image)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &background, image))
++   GUI_Object* temp;
++   temp = (GUI_Object *)background;
++	if (GUI_ObjectKeep(&temp, image)){
++      background = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      background = (GUI_Surface *)temp;
+ }
+ 
+ int GUI_ScrollBar::GetPosition(void)
+@@ -186,7 +198,10 @@
+ 
+ void GUI_ScrollBar::SetMovedCallback(GUI_Callback *callback)
+ {
+-	GUI_ObjectKeep((GUI_Object **) &moved_callback, callback);
++   GUI_Object * temp;
++   temp = (GUI_Object *)moved_callback;
++	GUI_ObjectKeep(&temp, callback);
++   moved_callback = (GUI_Callback *)temp;
+ }
+ 
+ extern "C"
+diff -Naur SDL_gui-0.10.3.old/src/TextEntry.cc SDL_gui-0.10.3/src/TextEntry.cc
+--- SDL_gui-0.10.3.old/src/TextEntry.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/TextEntry.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -164,7 +164,10 @@
+ 
+ void GUI_TextEntry::SetFont(GUI_Font *afont)
+ {
+-	GUI_ObjectKeep((GUI_Object **) &font, afont);
++   GUI_Object * temp;
++   temp = (GUI_Object *)font;
++	GUI_ObjectKeep(&temp, afont);
++   font = (GUI_Font *)temp;
+ 	/* FIXME: should re-draw the text in the new color */
+ }
+ 
+@@ -195,30 +198,54 @@
+ 
+ void GUI_TextEntry::SetNormalImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &normal_image, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)normal_image;
++	if (GUI_ObjectKeep(&temp, surface)){
++      normal_image = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      normal_image = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_TextEntry::SetHighlightImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &highlight_image, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)highlight_image;
++	if (GUI_ObjectKeep(&temp, surface)){
++      highlight_image = (GUI_Surface *)temp;
+ 		MarkChanged();
++   }
++   else
++      highlight_image = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_TextEntry::SetFocusImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &focus_image, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)focus_image;
++	if (GUI_ObjectKeep(&temp, surface)){
++      focus_image = (GUI_Surface*)temp;
+ 		MarkChanged();
++   }
++   else
++      focus_image = (GUI_Surface*)temp;
+ }
+ 
+ void GUI_TextEntry::SetFocusCallback(GUI_Callback *callback)
+ {
+-	GUI_ObjectKeep((GUI_Object **) &focus_callback, callback);
++   GUI_Object * temp;
++   temp = (GUI_Object *)focus_callback;
++	GUI_ObjectKeep(&temp, callback);
++   focus_callback = (GUI_Callback *)temp;
+ }
+ 
+ void GUI_TextEntry::SetUnfocusCallback(GUI_Callback *callback)
+ {
+-	GUI_ObjectKeep((GUI_Object **) &unfocus_callback, callback);
++   GUI_Object * temp;
++   temp = (GUI_Object *)unfocus_callback;
++	GUI_ObjectKeep(&temp, callback);
++   unfocus_callback = (GUI_Callback *)temp;
+ }
+ 
+ extern "C"
+diff -Naur SDL_gui-0.10.3.old/src/ToggleButton.cc SDL_gui-0.10.3/src/ToggleButton.cc
+--- SDL_gui-0.10.3.old/src/ToggleButton.cc	2006-03-31 00:28:54.000000000 -0500
++++ SDL_gui-0.10.3/src/ToggleButton.cc	2006-03-31 00:28:53.000000000 -0500
+@@ -62,26 +62,47 @@
+ 
+ void GUI_ToggleButton::SetOnNormalImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &on_normal, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)on_normal;
++	if (GUI_ObjectKeep(&temp, surface)){
+ 		MarkChanged();
++   }
++   else
++      on_normal = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_ToggleButton::SetOffNormalImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &off_normal, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)off_normal;
++	if (GUI_ObjectKeep(&temp, surface)){
+ 		MarkChanged();
++   }
++   else
++      off_normal = (GUI_Surface *)temp;
+ }
+ 
+ void GUI_ToggleButton::SetOnHighlightImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &on_highlight, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)on_highlight;
++	if (GUI_ObjectKeep(&temp, surface)){
+ 		MarkChanged();
++   }
++   else
++      on_highlight = (GUI_Surface *)temp;
++   
+ }
+ 
+ void GUI_ToggleButton::SetOffHighlightImage(GUI_Surface *surface)
+ {
+-	if (GUI_ObjectKeep((GUI_Object **) &off_highlight, surface))
++   GUI_Object * temp;
++   temp = (GUI_Object *)off_highlight;
++	if (GUI_ObjectKeep(&temp, surface)){
+ 		MarkChanged();
++   }
++   else
++      off_highlight = (GUI_Surface *)temp;
+ }
+ 
+ extern "C"
diff --git a/media-libs/sdl-gui/sdl-gui-0.10.3.ebuild b/media-libs/sdl-gui/sdl-gui-0.10.3.ebuild
index 33c6cd538349..fdd338e24fc6 100644
--- a/media-libs/sdl-gui/sdl-gui-0.10.3.ebuild
+++ b/media-libs/sdl-gui/sdl-gui-0.10.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gui/sdl-gui-0.10.3.ebuild,v 1.3 2004/06/24 23:21:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gui/sdl-gui-0.10.3.ebuild,v 1.4 2006/09/10 22:39:15 mr_bones_ Exp $
+
+inherit eutils
 
 MY_P="SDL_gui-${PV}"
 DESCRIPTION="Graphical User Interface library that utilizes SDL"
@@ -16,9 +18,15 @@ DEPEND=">=media-libs/libsdl-1.1.4
 	>=media-libs/sdl-image-1.0.9
 	>=media-libs/sdl-ttf-1.2.1"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README TODO
 }