[supertuxkart] fix irrlicht patch

[Tom Callaway]

commit 3633a11c8d3d737d9f87084a48406e32a75cabca
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Nov 15 11:30:46 2012 -0500

    fix irrlicht patch

 supertuxkart-0.7.3-irrlicht.patch |   33 +++++++++++++++++++++++++++++----
 supertuxkart.spec                 |    2 +-
 2 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/supertuxkart-0.7.3-irrlicht.patch b/supertuxkart-0.7.3-irrlicht.patch
index 4079e1a..d3c4393 100644
--- a/supertuxkart-0.7.3-irrlicht.patch
+++ b/supertuxkart-0.7.3-irrlicht.patch
@@ -1,6 +1,7 @@
---- src/graphics/material.cpp~	2011-11-01 19:04:10.000000000 -0500
-+++ src/graphics/material.cpp	2012-11-15 09:24:03.645285857 -0600
-@@ -512,7 +512,7 @@
+diff -up supertuxkart-0.7.3/src/graphics/material.cpp.irrlicht supertuxkart-0.7.3/src/graphics/material.cpp
+--- supertuxkart-0.7.3/src/graphics/material.cpp.irrlicht	2011-11-01 20:04:10.000000000 -0400
++++ supertuxkart-0.7.3/src/graphics/material.cpp	2012-11-15 11:20:45.894743287 -0500
+@@ -512,7 +512,7 @@ void  Material::setMaterialProperties(vi
          // customizable EMT_ONETEXTURE_BLEND instead
          m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
          m->MaterialTypeParam = 
@@ -9,7 +10,7 @@
                                   video::EBF_ONE_MINUS_SRC_ALPHA,
                                   video::EMFN_MODULATE_1X, 
                                   video::EAS_TEXTURE | video::EAS_VERTEX_COLOR);
-@@ -539,7 +539,7 @@
+@@ -539,7 +539,7 @@ void  Material::setMaterialProperties(vi
          // account, which messes up fading in/out effects. So we use the 
          // more customizable EMT_ONETEXTURE_BLEND instead
          m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
@@ -18,3 +19,27 @@
                                                      video::EBF_ONE,
                                                      video::EMFN_MODULATE_1X,
                                                      video::EAS_TEXTURE | 
+diff -up supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp.irrlicht supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp
+--- supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp.irrlicht	2012-11-15 11:22:09.678824039 -0500
++++ supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp	2012-11-15 11:22:17.458831344 -0500
+@@ -115,7 +115,7 @@ void CGUIEditBox::setOverrideColor(video
+ }
+ 
+ 
+-video::SColor const& CGUIEditBox::getOverrideColor() const
++video::SColor CGUIEditBox::getOverrideColor() const
+ {
+ 	return OverrideColor;
+ }
+diff -up supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h.irrlicht supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h
+--- supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h.irrlicht	2011-11-01 20:04:12.000000000 -0400
++++ supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h	2012-11-15 11:20:45.894743287 -0500
+@@ -36,7 +36,7 @@ using namespace gui;
+ 		virtual void setOverrideColor(video::SColor color);
+ 
+ 		//! Gets the override color
+-		virtual video::SColor const & getOverrideColor() const;
++		virtual video::SColor getOverrideColor() const;
+ 
+ 		//! Sets if the text should use the overide color or the
+ 		//! color in the gui skin.
diff --git a/supertuxkart.spec b/supertuxkart.spec
index 34be4d5..8af34e8 100644
--- a/supertuxkart.spec
+++ b/supertuxkart.spec
@@ -41,7 +41,7 @@ This package contains the data files for SuperTuxKart.
 %setup -q
 %patch0 -p0 -z .fhs
 %patch1 -p0 -z .desktop
-%patch2 -p0 -z .irrlicht
+%patch2 -p1 -z .irrlicht
 # some cleanups
 chmod -x AUTHORS COPYING ChangeLog README TODO
 chmod -x `find -name "*.cpp" -o -name "*.hpp"`