From 31247bd30a27af5a2fce8898dc75bfc20767d3603b039f62c6a88618444ae46c Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Tue, 8 May 2012 09:13:37 +0000 Subject: [PATCH] Accepting request 116642 from home:worldcitizen:branches:games Created a gcc 4.7 patch, visibility is much more strict in gcc 4.7 OBS-URL: https://build.opensuse.org/request/show/116642 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=10 --- MyGUI-gcc47-visibility.patch | 20 ++++++++++++++++++++ MyGUI.changes | 5 +++++ MyGUI.spec | 8 ++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 MyGUI-gcc47-visibility.patch diff --git a/MyGUI-gcc47-visibility.patch b/MyGUI-gcc47-visibility.patch new file mode 100644 index 0000000..7ab0877 --- /dev/null +++ b/MyGUI-gcc47-visibility.patch @@ -0,0 +1,20 @@ +diff -Naur MyGUI_3.2.0.orig/MyGUIEngine/include/MyGUI_Singleton.h MyGUI_3.2.0/MyGUIEngine/include/MyGUI_Singleton.h +--- MyGUI_3.2.0.orig/MyGUIEngine/include/MyGUI_Singleton.h 2012-02-22 22:27:42.000000000 +0100 ++++ MyGUI_3.2.0/MyGUIEngine/include/MyGUI_Singleton.h 2012-05-07 13:15:46.000000000 +0200 +@@ -67,10 +67,15 @@ + } + + private: ++#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC || MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE + static T* msInstance; + +- protected: + static const char* mClassTypeName; ++#else ++ static MYGUI_EXPORT T* msInstance; ++ ++ static MYGUI_EXPORT const char* mClassTypeName; ++#endif + }; + + } // namespace MyGUI diff --git a/MyGUI.changes b/MyGUI.changes index 74a8fdd..a1228a1 100644 --- a/MyGUI.changes +++ b/MyGUI.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 7 11:28:09 UTC 2012 - joop.boonen@opensuse.org + +- Created a gcc 4.7 patch, visibility is much more strict in gcc 4.7 + ------------------------------------------------------------------- Sun Feb 26 14:48:40 UTC 2012 - joop.boonen@opensuse.org diff --git a/MyGUI.spec b/MyGUI.spec index bec45cc..03bb934 100644 --- a/MyGUI.spec +++ b/MyGUI.spec @@ -24,13 +24,16 @@ Name: MyGUI Version: %{_major}.%{_minor} Release: 0 -License: LGPL-3.0 Summary: A GUI library for Ogre Rendering Engine -Url: http://my-gui.sourceforge.net/ +License: LGPL-3.0 Group: Development/Tools/GUI Builders +Url: http://my-gui.sourceforge.net/ Source: %{name}_%{version}.zip Source1: %{name}.png +# PATCH-FIX-UPSTREAM MyGUI-lib_suffix.patch Patch0: %{name}-lib_suffix.patch +# PATCH-FIX-UPSTREAM MyGUI-gcc47-visibility.patch +Patch1: %{name}-gcc47-visibility.patch BuildRequires: Cg BuildRequires: Cg-devel BuildRequires: cmake @@ -127,6 +130,7 @@ Development documentation for package MyGUI. %prep %setup -q -n %{name}_%{version} %patch0 -p1 +%patch1 -p1 dos2unix *.txt COPYING.LESSER chmod 644 *.txt COPYING.LESSER