[swift: 1/2] fixed boost::TIME_UTC macro expansion

Jan Kaluža jkaluza at fedoraproject.org
Mon Jul 23 08:58:01 UTC 2012


commit cd3fec8c0d27d5e015ee3b789f14a4535e5fb0a2
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Mon Jul 23 10:54:39 2012 +0200

    fixed boost::TIME_UTC macro expansion

 swift-timeutc.patch |   13 +++++++++++++
 swift.spec          |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/swift-timeutc.patch b/swift-timeutc.patch
new file mode 100644
index 0000000..bcca69b
--- /dev/null
+++ b/swift-timeutc.patch
@@ -0,0 +1,13 @@
+diff --git a/Swiften/Base/sleep.cpp b/Swiften/Base/sleep.cpp
+index 892a3ba..2ef275a 100644
+--- a/Swiften/Base/sleep.cpp
++++ b/Swiften/Base/sleep.cpp
+@@ -12,7 +12,7 @@ namespace Swift {
+ 
+ void sleep(unsigned int msecs) {
+ 	boost::xtime xt;
+-	boost::xtime_get(&xt, boost::TIME_UTC);
++	boost::xtime_get(&xt, TIME_UTC);
+ 	xt.nsec += msecs*1000000;
+ 	boost::thread::sleep(xt);
+ }
diff --git a/swift.spec b/swift.spec
index 191fc81..026f5f9 100644
--- a/swift.spec
+++ b/swift.spec
@@ -1,7 +1,7 @@
 Summary: XMPP client
 Name: swift
 Version: 1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Internet
 License: GPLv3
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -17,6 +17,7 @@ Patch1: swift-login-crash.patch
 Patch2: swift-vector-refs.patch
 Patch3: swift-moc-boost-join.patch
 Patch4: swift-warnings.patch
+Patch5: swift-timeutc.patch
 URL: http://swift.im/
 BuildRequires: scons
 BuildRequires: qt-devel
@@ -43,6 +44,7 @@ application.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Remove 3rd party libraries.
 find 3rdParty/Boost -delete
@@ -89,6 +91,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Mon Jul 23 2012 Jan Kaluza <jkaluza at redhat.com> - 1.0-8
+- fixed boost::TIME_UTC macro expansion
+
 * Tue Jan 10 2012 Jan Kaluza <jkaluza at redhat.com> - 1.0-7
 - fix building in rawhide
 


More information about the scm-commits mailing list