[mygui] Very basic changes for 3.2.1
Bruno Wolff III
bruno at fedoraproject.org
Wed Dec 31 03:39:24 UTC 2014
commit 1f8235bf34040074029a1c76f8fa99f4f1acea7b
Author: Bruno Wolff III <bruno at wolff.to>
Date: Tue Dec 30 16:59:14 2014 -0600
Very basic changes for 3.2.1
This is just basic stuff to get the build process started
for the changes between 3.2.0 and 3.2.1.
.gitignore | 1 +
mygui-libCommon-fixup.patch | 9 ++--
mygui.spec | 26 +++++++-----
mygui_multilib_cflags.patch | 93 +++++++++++++++++++++++-------------------
sources | 2 +-
5 files changed, 73 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c44b84d..6c62643 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
mygui-2.3.0-2332svn.tar.bz2
/MyGUI_3.0.1_source.zip
/MyGUI_3.2.0.zip
+/mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz
diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch
index 55d6149..8d7dd82 100644
--- a/mygui-libCommon-fixup.patch
+++ b/mygui-libCommon-fixup.patch
@@ -1,11 +1,10 @@
-diff -up MyGUI_3.2.0/Common/CMakeLists.txt.fixup MyGUI_3.2.0/Common/CMakeLists.txt
---- MyGUI_3.2.0/Common/CMakeLists.txt.fixup 2013-04-25 14:47:11.128845465 -0400
-+++ MyGUI_3.2.0/Common/CMakeLists.txt 2013-04-25 14:47:16.497845545 -0400
-@@ -82,6 +82,7 @@ elseif(MYGUI_SAMPLES_INPUT EQUAL 3)
+--- Common/CMakeLists.txt.orig 2014-12-30 15:54:04.262556059 -0600
++++ Common/CMakeLists.txt 2014-12-30 15:54:58.750481194 -0600
+@@ -89,6 +89,7 @@
endif()
add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR})
if(MYGUI_RENDERSYSTEM EQUAL 1)
- add_dependencies(${PROJECTNAME} MyGUI.DirectXPlatform)
+ add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform)
diff --git a/mygui.spec b/mygui.spec
index 42f896c..1b70617 100644
--- a/mygui.spec
+++ b/mygui.spec
@@ -1,12 +1,14 @@
Name: mygui
-Version: 3.2.0
-Release: 11%{?dist}
+Version: 3.2.1
+%global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+Release: 1%{?dist}
Summary: Fast, simple and flexible GUI library for Ogre
Group: Development/Libraries
# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
-License: LGPLv3+
+License: MIT
URL: http://mygui.info/
-Source0: http://downloads.sourceforge.net/my-gui/MyGUI_%{version}.zip
+Source0: https://github.com/MyGUI/mygui/archive/%{commit}/mygui-%{commit}.tar.gz
# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples
Source1: MyGUI-Demos
# Another helper for the tools
@@ -18,7 +20,7 @@ Source4: mygui-layouteditor.desktop
# Fix multilib and flags with cmake
Patch0: mygui_multilib_cflags.patch
# Fixup libCommon
-Patch1: mygui-libCommon-fixup.patch
+Patch1: mygui-libCommon-fixup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freetype-devel, desktop-file-utils
@@ -79,11 +81,9 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}.
%prep
-%setup -n MyGUI_%{version}
+%setup -qn %{name}-%{commit}
%patch0 -p0 -b .multilib
-%patch1 -p1 -b .fixup
-# Fix eol
-sed -i 's/\r//' COPYING.LESSER
+%patch1 -p0 -b .fixup
# Fix non-UTF8 files
for file in Tools/LayoutEditor/Readme.txt ; do
dos2unix -n $file timestamp && \
@@ -206,7 +206,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc COPYING.LESSER
+%doc COPYING.MIT
%{_libdir}/*.so.*
%{_libdir}/MYGUI
%dir %{_datadir}/MyGUI/Media
@@ -246,6 +246,12 @@ rm -rf %{buildroot}
%changelog
+* Tue Dec 30 2014 Bruno Wolff III <bruno at wolff.to> - 3.2.1-1
+- License changed from LGPLv3 to MIT
+- Source location changed from sourceforge to github
+- Change log: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.1
+- Adjust patches for changes to cmake files
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch
index 0ad8773..e9df86b 100644
--- a/mygui_multilib_cflags.patch
+++ b/mygui_multilib_cflags.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.multilib 2012-12-04 13:45:07.742668108 -0600
-+++ CMakeLists.txt 2012-12-04 14:14:21.062506043 -0600
+--- CMakeLists.txt.orig 2014-08-19 14:49:43.000000000 -0500
++++ CMakeLists.txt 2014-12-30 13:30:19.146348141 -0600
@@ -85,8 +85,8 @@
set(MYGUI_LIBRARIES MyGUIEngine)
@@ -11,40 +11,32 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
if (WIN32 OR APPLE)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-@@ -178,13 +178,13 @@
-
- # Set compiler specific build flags
- if (CMAKE_COMPILER_IS_GNUCXX)
-- add_definitions(-msse)
-+# add_definitions(-msse)
- if (NOT MYGUI_HIGH_LEVEL_WARNINGS)
- add_definitions(-w)
+@@ -181,7 +181,7 @@
else ()
- if (MYGUI_RENDERSYSTEM EQUAL 2)
+ if (MYGUI_RENDERSYSTEM EQUAL 3)
# to avoid warnings from OGRE
-- add_definitions(-isystem ${OGRE_INCLUDE_DIR})
-+# add_definitions(-isystem ${OGRE_INCLUDE_DIR})
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}")
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}")
endif ()
if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3)
# to avoid warnings from OIS
-@@ -195,11 +195,11 @@
+@@ -192,11 +192,11 @@
endif ()
# very interesting option, but way too many warnings
#add_definitions(-Weffc++)
-- add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
-- add_definitions(-pedantic)
-+# add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
-+# add_definitions(-pedantic)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter")
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
# MyGUI_UString.h ignored from warnings because of this
-- add_definitions(-Wshadow)
-+# add_definitions(-Wshadow)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
endif ()
endif ()
---- CMake/Utils/MyGUIConfigTargets.cmake.multilib 2012-12-04 13:45:07.745668489 -0600
-+++ CMake/Utils/MyGUIConfigTargets.cmake 2012-12-04 14:19:27.623468365 -0600
-@@ -57,14 +57,14 @@
+--- CMake/Utils/MyGUIConfigTargets.cmake.orig 2014-12-30 13:33:38.747716449 -0600
++++ CMake/Utils/MyGUIConfigTargets.cmake 2014-12-30 13:42:54.115300813 -0600
+@@ -61,26 +61,26 @@
function(mygui_install_target TARGETNAME SUFFIX)
install(TARGETS ${TARGETNAME}
RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
@@ -63,31 +55,48 @@
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo
)
install(TARGETS ${TARGETNAME}
-@@ -326,4 +326,4 @@
+ RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
+- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
+- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
+ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel
+ )
+ install(TARGETS ${TARGETNAME}
+ RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug
+- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
+- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
+ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug
+ )
+ endfunction(mygui_install_target)
+@@ -423,12 +423,12 @@
+ if (MYGUI_INSTALL_PDB)
+ # install debug pdb files
+ if (MYGUI_STATIC)
+- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb
+- DESTINATION lib${MYGUI_LIB_DEBUG_PATH}
++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb
++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}
+ CONFIGURATIONS Debug
+ )
+- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb
+- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH}
++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb
++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}
+ CONFIGURATIONS RelWithDebInfo
+ )
+ else ()
+@@ -455,4 +455,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)
---- CMake/Templates/MYGUI.pc.in.multilib 2012-12-04 14:58:50.668799275 -0600
-+++ CMake/Templates/MYGUI.pc.in 2012-12-04 15:02:40.398996802 -0600
-@@ -1,11 +1,11 @@
- prefix=@MYGUI_PREFIX_PATH@
- exec_prefix=${prefix}
--libdir=${prefix}/lib
-+libdir=${prefix}/lib at LIB_SUFFIX@
- includedir=${prefix}/include
-
- Name: MyGUI
- Description: Fast, flexible and simple GUI
- Version: @MYGUI_VERSION@
- URL: http://mygui.info
--Libs: -L${libdir} -lMyGUIEngine at MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
-+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
- Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
---- CMake/ConfigureBuild.cmake.orig 2012-12-11 04:44:39.998238526 -0600
-+++ CMake/ConfigureBuild.cmake 2012-12-11 04:45:26.291122114 -0600
+--- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600
++++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600
@@ -47,7 +47,7 @@
else ()
configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
diff --git a/sources b/sources
index d0b5cdd..f8ffa33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c20486a0db82f497d8b7c5300613b61 MyGUI_3.2.0.zip
+7b9da3d1234aece171faa904b3856ec1 mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz
More information about the scm-commits
mailing list