rpm/MyGUI
SHA256
1
0
Fork 0
forked from pool/MyGUI
Code Pull Requests Activity

Accepting request 286512 from home:openSUSE_user1

Browse Source 
Update to current upstream version 3.2.2.

OBS-URL: https://build.opensuse.org/request/show/286512
OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=12
This commit is contained in:
Matthias Mailänder 2015-02-17 19:30:27 +00:00 committed by Git OBS Bridge
parent 4e53e57bae
commit 93dbaba57a
6 changed files with 107 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
MyGUI-gcc47-visibility.patch
View File

@ -1,20 +1,18 @@
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 -Naur MyGUI_3.2.2.orig/MyGUIEngine/include/MyGUI_Singleton.h MyGUI_3.2.2/MyGUIEngine/include/MyGUI_Singleton.h
--- MyGUI_3.2.2.orig/MyGUIEngine/include/MyGUI_Singleton.h
+++ MyGUI_3.2.2/MyGUIEngine/include/MyGUI_Singleton.h
@@ -52,8 +52,14 @@
}
private:
+#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC || MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
static T* msInstance;
static const char* mClassTypeName;
+#else
+ static MYGUI_EXPORT T* msInstance;
+
+ static MYGUI_EXPORT const char* mClassTypeName;
+#endif
};
} // namespace MyGUI

89
MyGUI-lib_suffix.patch
View File

@ -1,6 +1,6 @@
diff -Naur MyGUI_3.2.0.orig/CMake/ConfigureBuild.cmake MyGUI_3.2.0/CMake/ConfigureBuild.cmake
--- MyGUI_3.2.0.orig/CMake/ConfigureBuild.cmake 2012-02-22 22:27:34.000000000 +0100
+++ MyGUI_3.2.0/CMake/ConfigureBuild.cmake 2012-02-26 16:03:12.000000000 +0100
diff -Naur MyGUI_3.2.2.orig/CMake/ConfigureBuild.cmake MyGUI_3.2.2/CMake/ConfigureBuild.cmake
--- MyGUI_3.2.2.orig/CMake/ConfigureBuild.cmake
+++ MyGUI_3.2.2/CMake/ConfigureBuild.cmake
@@ -47,7 +47,7 @@
else ()
configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
@ -10,49 +10,42 @@ diff -Naur MyGUI_3.2.0.orig/CMake/ConfigureBuild.cmake MyGUI_3.2.0/CMake/Configu
# configure additional packages
diff -Naur MyGUI_3.2.0.orig/CMake/Utils/MyGUIConfigTargets.cmake MyGUI_3.2.0/CMake/Utils/MyGUIConfigTargets.cmake
--- MyGUI_3.2.0.orig/CMake/Utils/MyGUIConfigTargets.cmake 2012-02-22 22:27:34.000000000 +0100
+++ MyGUI_3.2.0/CMake/Utils/MyGUIConfigTargets.cmake 2012-02-26 16:05:06.000000000 +0100
@@ -57,8 +57,8 @@
function(mygui_install_target TARGETNAME SUFFIX)
install(TARGETS ${TARGETNAME}
RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
)
install(TARGETS ${TARGETNAME}
@@ -84,8 +84,8 @@
# setup common target settings
function(mygui_config_common TARGETNAME)
set_target_properties(${TARGETNAME} PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
- LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+ ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+ LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
)
mygui_create_vcproj_userfile(${TARGETNAME})
@@ -326,4 +326,4 @@
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
endif ()
-endfunction(mygui_config_sample)
\ No newline at end of file
+endfunction(mygui_config_sample)
diff -Naur MyGUI_3.2.0.orig/CMakeLists.txt MyGUI_3.2.0/CMakeLists.txt
--- MyGUI_3.2.0.orig/CMakeLists.txt 2012-02-22 22:28:40.000000000 +0100
+++ MyGUI_3.2.0/CMakeLists.txt 2012-02-26 16:05:47.000000000 +0100
diff -Naur MyGUI_3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake MyGUI_3.2.2/CMake/Utils/MyGUIConfigTargets.cmake
--- MyGUI_3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake
+++ MyGUI_3.2.2/CMake/Utils/MyGUIConfigTargets.cmake
@@ -61,8 +61,8 @@
function(mygui_install_target TARGETNAME SUFFIX)
install(TARGETS ${TARGETNAME}
RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
)
install(TARGETS ${TARGETNAME}
@@ -88,8 +88,8 @@
# setup common target settings
function(mygui_config_common TARGETNAME)
set_target_properties(${TARGETNAME} PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
- LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+ ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+ LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
)
mygui_create_vcproj_userfile(${TARGETNAME})
diff -Naur MyGUI_3.2.2.orig/CMakeLists.txt MyGUI_3.2.2/CMakeLists.txt
--- MyGUI_3.2.2.orig/CMakeLists.txt
+++ MyGUI_3.2.2/CMakeLists.txt
@@ -85,8 +85,8 @@
set(MYGUI_LIBRARIES MyGUIEngine)
# Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
if (WIN32 OR APPLE)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(MYGUI_LIBRARIES MyGUIEngine)
# Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
if (WIN32 OR APPLE)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

30
MyGUI.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Tue Feb 17 11:47:58 UTC 2015 - devel.suse@gmail.com
- Update to upstream MyGUI 3.2.2:
-- Core --
* Fixed eventChangeMouseFocus and eventChangeKeyFocus not being triggered in certain cases.
-- Widgets --
* ComboBox: Fixed mouse events incorrectly going to the widget below the ComboBox when clicking on an item.
* ScrollBar: Added button repeat support, ScrollBar buttons will trigger repeatedly so long as the mouse is held down.
-- Platforms --
* OpenGLPlatform: Added option to use system GLEW library.
* OgrePlatform: Improved performance of OgreDataManager::isDataExist.
* OgrePlatform: Fixed build failure regarding boost libraries used by Ogre not being found.
-- Resources --
* ResourceManualFont: Added API to create a ResourceManualFont in code rather than from XML.
-- Tools --
* Fixed broken file dialog directory listing on Linux and make sure files are sorted.
- Updated MyGUI-gcc47-visibility.patch
- Updated MyGUI-lib_suffix.patch
-------------------------------------------------------------------
Wed Jan 21 03:46:02 UTC 2015 - devel.suse@gmail.com
- Build MyGUI 3.2.1
-------------------------------------------------------------------
Sun Mar 23 17:09:00 UTC 2014 - seife+obs@b1-systems.com

30
MyGUI.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package MyGUI
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
#
# All modifications and additions to the file contributed by third parties
@ -19,7 +19,7 @@
%define capname MYGUI
%define _major 3.2
%define _minor 0
%define _minor 2
%define _sover 3
Name: MyGUI
@ -28,8 +28,8 @@ Release: 0
Summary: A GUI library for Ogre Rendering Engine
License: LGPL-3.0
Group: Development/Tools/GUI Builders
Url: http://my-gui.sourceforge.net/
Source: %{name}_%{version}.zip
Url: http://mygui.info/
Source: https://github.com/MyGUI/mygui/archive/MyGUI%{version}.tar.gz
Source1: %{name}.png
# PATCH-FIX-UPSTREAM MyGUI-lib_suffix.patch
Patch0: %{name}-lib_suffix.patch
@ -131,13 +131,13 @@ next targets: GUI have to be fast, flexible and simple in using.
Development documentation for package MyGUI.
%prep
%setup -q -n %{name}_%{version}
%setup -q -n mygui-%{name}%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
dos2unix *.txt COPYING.LESSER
chmod 644 *.txt COPYING.LESSER
dos2unix *.txt COPYING.MIT
chmod 644 *.txt COPYING.MIT
%build
install -dm 755 build
@ -274,10 +274,10 @@ rm Docs/html/installdox || true
%files
%defattr(-,root,root)
%doc *.txt COPYING.LESSER
%doc *.txt COPYING.MIT
%{_bindir}/%{name}.sh
%{_bindir}/FontViewer
%{_bindir}/ImageSetViewer
%{_bindir}/FontEditor
%{_bindir}/ImageEditor
%{_bindir}/LayoutEditor
%{_bindir}/SkinEditor
%dir %{_datadir}/%{capname}
@ -289,13 +289,12 @@ rm Docs/html/installdox || true
%dir %{_datadir}/%{capname}/Media/Tools
%dir %{_datadir}/%{capname}/Media/Tools/LayoutEditor
%dir %{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates
%{_datadir}/%{capname}/Media/Tools/FontViewer
%{_datadir}/%{capname}/Media/Tools/ImageSetViewer
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/A*
%{_datadir}/%{capname}/Media/Tools/FontEditor
%{_datadir}/%{capname}/Media/Tools/ImageEditor
%{_datadir}/%{capname}/Media/Tools/EditorFramework
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/B*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeGeneratorWindow.layout
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutCPP.xml
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/Colour*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/E*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/I*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/M*
@ -316,7 +315,8 @@ rm Docs/html/installdox || true
%{_libdir}/libMyGUIEngine.so
%{_libdir}/libMyGUI.OgrePlatform.a
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libPlugin_StrangeButton.so
%{_libdir}/Plugin_StrangeButton.so
%{_libdir}/libEditorFramework.so
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.cpp
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.h

3
MyGUI3.2.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a28d7ec8a47993cb68deb48b36331e28f12dd92580b709eaef21d599b67a78f
size 22081236

3
MyGUI_3.2.0.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0043798344dfc2f5126d9f9063f7c62d43557a34e40c202c98e13e1c40e50858
size 14364055