[spring/f18] Add upstream patch to use new boost TIME_UTC_ symbol

[Orion Poplawski]

commit 70b22ac36f4e4a6da08d00c76ee77150091eea2e
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu Aug 9 17:18:01 2012 -0600

    Add upstream patch to use new boost TIME_UTC_ symbol

 spring-boost.patch |   31 +++++++++++++++++++++++++++++++
 spring.spec        |   10 ++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/spring-boost.patch b/spring-boost.patch
new file mode 100644
index 0000000..b8fb123
--- /dev/null
+++ b/spring-boost.patch
@@ -0,0 +1,31 @@
+diff --git a/rts/lib/headlessStubs/sdlstub_cppbit.cpp b/rts/lib/headlessStubs/sdlstub_cppbit.cpp
+index e8e4790..0b6cf76 100644
+--- a/rts/lib/headlessStubs/sdlstub_cppbit.cpp
++++ b/rts/lib/headlessStubs/sdlstub_cppbit.cpp
+@@ -12,10 +12,16 @@
+ extern "C" {
+ #endif
+ 
++#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_
++	#define SPRING_UTCTIME boost::TIME_UTC_
++#else
++	#define SPRING_UTCTIME boost::TIME_UTC
++#endif
++
+ int stub_sdl_getSystemMilliSeconds() {
+ 
+ 	boost::xtime t;
+-	boost::xtime_get(&t, boost::TIME_UTC);
++	boost::xtime_get(&t, SPRING_UTCTIME);
+ 	const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000);   
+ 	return milliSeconds;
+ }
+@@ -23,7 +29,7 @@ int stub_sdl_getSystemMilliSeconds() {
+ void stub_sdl_sleepMilliSeconds(int milliSeconds) {
+ 
+ 	boost::xtime t;
+-	boost::xtime_get(&t, boost::TIME_UTC);
++	boost::xtime_get(&t, SPRING_UTCTIME);
+ 	t.nsec += 1000000 * milliSeconds;
+ 	boost::thread::sleep(t);
+ }
diff --git a/spring.spec b/spring.spec
index f4b597f..58fca00 100644
--- a/spring.spec
+++ b/spring.spec
@@ -6,7 +6,7 @@
 #	installer/builddata/bitmaps/README.txt.
 Name:			spring
 Version:		89.0
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Multiplayer, 3D realtime strategy combat game
 Group:			Amusements/Games
 License:		GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
@@ -17,6 +17,8 @@ Source1:		spring-README.Fedora
 
 Patch0:			spring-89-dso.patch
 Patch1:			spring-89-assimp-remove.patch
+# Upstream patch to use new boost TIME_UTC_ symbol
+Patch2:			spring-boost.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -71,6 +73,7 @@ C-API files for the pr-downloader console game / map downloader for the Spring e
 %setup -q -n %{name}_%{version}
 %patch0 -p0 -b .spring-89-dso-fix
 %patch1 -p0 -b .spring-89-assimp-remove
+%patch2 -p1 -b .boost
 
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
@@ -175,8 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 09 2012 Orion Poplawski <orion at nwra.com> - 89.0-4
+- Add upstream patch to use new boost TIME_UTC_ symbol
+
 * Wed Aug 01 2012 Adam Jackson <ajax at redhat.com> - 89.0-3
-- -Rebuild for new glew
+- Rebuild for new glew
 
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 89.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild