[mygui] Update patch for source changes

Bruno Wolff III bruno at fedoraproject.org
Mon Jan 3 08:55:14 UTC 2011


commit fc09fd5d2f3646dee2478414b26aed9007469eb2
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Jan 3 02:54:44 2011 -0600

    Update patch for source changes

 mygui.spec                  |    2 +-
 mygui_missing_headers.patch |   47 +++++++-----------------------------------
 2 files changed, 9 insertions(+), 40 deletions(-)
---
diff --git a/mygui.spec b/mygui.spec
index 0ca954a..4d32a5f 100644
--- a/mygui.spec
+++ b/mygui.spec
@@ -85,7 +85,7 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}.
 %prep
 %setup -q -n MyGUI3.0
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 # Fix eol 
 sed -i 's/\r//' COPYING.LESSER
 # Fix non-UTF8 files
diff --git a/mygui_missing_headers.patch b/mygui_missing_headers.patch
index ae8f8c3..f66da47 100644
--- a/mygui_missing_headers.patch
+++ b/mygui_missing_headers.patch
@@ -1,6 +1,6 @@
---- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-09-30 01:35:13.000000000 +0200
-+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-11-27 17:19:29.488111573 +0100
-@@ -29,7 +29,7 @@
+--- Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h.orig	2011-01-03 02:46:05.000000000 -0600
++++ Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2011-01-03 02:46:51.000000000 -0600
+@@ -14,7 +14,7 @@
  #include "MyGUI_OgreRenderManager.h"
  #include "MyGUI_OgreDataManager.h"
  #include "MyGUI_OgreDiagnostic.h"
@@ -9,9 +9,9 @@
  
  namespace MyGUI
  {
---- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-09-30 02:10:57.000000000 +0200
-+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-11-27 17:08:52.381859930 +0100
-@@ -27,6 +27,7 @@
+--- Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h.orig	2011-01-03 02:47:54.000000000 -0600
++++ Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2011-01-03 02:48:20.000000000 -0600
+@@ -13,6 +13,7 @@
  #include "MyGUI_RenderFormat.h"
  #include "MyGUI_IVertexBuffer.h"
  #include "MyGUI_RenderManager.h"
@@ -19,8 +19,8 @@
  
  #include <Ogre.h>
  
---- A/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-09-24 01:54:35.000000000 +0200
-+++ B/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-11-27 17:41:13.102861792 +0100
+--- MyGUIEngine/include/MyGUI_IRenderTarget.h.orig	2011-01-03 02:48:43.000000000 -0600
++++ MyGUIEngine/include/MyGUI_IRenderTarget.h	2011-01-03 02:49:21.000000000 -0600
 @@ -23,6 +23,7 @@
  #ifndef __MYGUI_I_RENDER_TARGET_H__
  #define __MYGUI_I_RENDER_TARGET_H__
@@ -29,34 +29,3 @@
  #include "MyGUI_Prerequest.h"
  #include "MyGUI_RenderTargetInfo.h"
  
---- A/MyGUIEngine/include/MyGUI_ITexture.h	2009-09-24 01:54:35.000000000 +0200
-+++ B/MyGUIEngine/include/MyGUI_ITexture.h	2009-11-27 17:41:48.046874847 +0100
-@@ -26,6 +26,7 @@
- #include "MyGUI_Prerequest.h"
- #include "MyGUI_IRenderTarget.h"
- #include "MyGUI_RenderFormat.h"
-+#include <string>
- 
- namespace MyGUI
- {
---- A/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-09-28 03:19:58.000000000 +0200
-+++ B/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-11-27 17:02:14.622875175 +0100
-@@ -23,6 +23,8 @@
- #ifndef __MYGUI_RENDER_FORMAT_H__
- #define __MYGUI_RENDER_FORMAT_H__
- 
-+#include "MyGUI_Macros.h"
-+
- namespace MyGUI
- {
- 
---- A/MyGUIEngine/include/MyGUI_VertexData.h	2009-06-04 04:34:12.000000000 +0200
-+++ B/MyGUIEngine/include/MyGUI_VertexData.h	2009-11-27 17:08:23.382859907 +0100
-@@ -24,6 +24,7 @@
- #define __MYGUI_VERTEX_DATA_H__
- 
- #include "MyGUI_Prerequest.h"
-+#include "MyGUI_Types.h"
- 
- namespace MyGUI
- {


More information about the scm-commits mailing list