[adobe-source-libraries] Handling boost bug 6940

[leamas]

commit 279addb8be61b41e98b03765b01dbf364d447dd7
Author: Alec Leamas <alec at tests.notat.diaspora.com>
Date:   Fri Aug 3 14:18:12 2012 +0200

    Handling boost bug 6940

 adobe-source-libraries.spec |    7 ++++-
 asl-time-utc.patch          |   57 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
---
diff --git a/adobe-source-libraries.spec b/adobe-source-libraries.spec
index 6f7daf5..1802b9b 100644
--- a/adobe-source-libraries.spec
+++ b/adobe-source-libraries.spec
@@ -18,6 +18,8 @@ Patch0:         asl-gcc.patch
 Patch1:         asl-fedora-build-options.patch
 # https://svn.boost.org/trac/boost/ticket/4647
 Patch2:         asl-no-concept-check1043.patch
+# https://svn.boost.org/trac/boost/ticket/6940
+Patch3:         asl-time-utc.patch
 
 BuildRequires:  boost-build
 BuildRequires:  boost-devel
@@ -57,6 +59,7 @@ API and other documentation for Adobe Source Libraries (ASL).
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 find . \( -name *.hpp -o -name *.jpg \) -executable -exec chmod 644 {} \;
 iconv -f iso8859-1 -t utf-8 release_notes.txt > release_notes.txt.conv && \
@@ -131,8 +134,8 @@ ln -sf $sofile ${sofile%%.*.*.*}
 
 
 %changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.43-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Aug  3 2012  Alec Leamas <leamas at nowhere.net>           1.0.43-12
+- Handling boost bug 6940
 
 * Thu Apr  5 2012  Alec Leamas <leamas at nowhere.net>           1.0.43-11
 - Fixing hard-coded version in .pc file
diff --git a/asl-time-utc.patch b/asl-time-utc.patch
new file mode 100644
index 0000000..ee758be
--- /dev/null
+++ b/asl-time-utc.patch
@@ -0,0 +1,57 @@
+diff --git a/adobe/timer.hpp b/adobe/timer.hpp
+index 8622e66..c0ef46d 100644
+--- a/adobe/timer.hpp
++++ b/adobe/timer.hpp
+@@ -182,7 +182,7 @@ public:
+ #if ADOBE_PLATFORM_WIN
+         (void)::QueryPerformanceCounter(&epoch_m);
+ #elif defined(BOOST_HAS_THREADS)
+-        boost::xtime_get(&epoch_m, boost::TIME_UTC);
++        boost::xtime_get(&epoch_m, boost::TIME_UTC_);
+ #elif defined(BOOST_HAS_GETTIMEOFDAY)
+         gettimeofday(&epoch_m, static_cast<struct timezone*>(0));
+ #endif
+@@ -206,7 +206,7 @@ public:
+         (void)::QueryPerformanceCounter(&split_m);
+         return (split_m.QuadPart - epoch_m.QuadPart) / static_cast<double>(frequency_m.QuadPart) * double(1e3);
+ #elif defined(BOOST_HAS_THREADS)
+-        boost::xtime_get(&split_m, boost::TIME_UTC);
++        boost::xtime_get(&split_m, boost::TIME_UTC_);
+         return ((split_m.sec - epoch_m.sec) * double(1e3) + (split_m.nsec - epoch_m.nsec) / double(1e6));
+ #elif defined(BOOST_HAS_GETTIMEOFDAY)
+         gettimeofday(&split_m, static_cast<struct timezone*>(0));
+diff --git a/documentation/html/timer_8hpp_source.html b/documentation/html/timer_8hpp_source.html
+index d5fc808..79a7f62 100644
+--- a/documentation/html/timer_8hpp_source.html
++++ b/documentation/html/timer_8hpp_source.html
+@@ -200,7 +200,7 @@
+ <a name="l00182"></a>00182 <span class="preprocessor">#if ADOBE_PLATFORM_WIN</span>
+ <a name="l00183"></a>00183 <span class="preprocessor"></span>        (void)::QueryPerformanceCounter(&amp;epoch_m);
+ <a name="l00184"></a>00184 <span class="preprocessor">#elif defined(BOOST_HAS_THREADS)</span>
+-<a name="l00185"></a>00185 <span class="preprocessor"></span>        boost::xtime_get(&amp;epoch_m, boost::TIME_UTC);
++<a name="l00185"></a>00185 <span class="preprocessor"></span>        boost::xtime_get(&amp;epoch_m, boost::TIME_UTC_);
+ <a name="l00186"></a>00186 <span class="preprocessor">#elif defined(BOOST_HAS_GETTIMEOFDAY)</span>
+ <a name="l00187"></a>00187 <span class="preprocessor"></span>        gettimeofday(&amp;epoch_m, static_cast&lt;struct timezone*&gt;(0));
+ <a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
+@@ -215,7 +215,7 @@
+ <a name="l00206"></a>00206 <span class="preprocessor"></span>        (void)::QueryPerformanceCounter(&amp;split_m);
+ <a name="l00207"></a>00207         <span class="keywordflow">return</span> (split_m.QuadPart - epoch_m.QuadPart) / <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(frequency_m.QuadPart) * <span class="keywordtype">double</span>(1e3);
+ <a name="l00208"></a>00208 <span class="preprocessor">#elif defined(BOOST_HAS_THREADS)</span>
+-<a name="l00209"></a>00209 <span class="preprocessor"></span>        boost::xtime_get(&amp;split_m, boost::TIME_UTC);
++<a name="l00209"></a>00209 <span class="preprocessor"></span>        boost::xtime_get(&amp;split_m, boost::TIME_UTC_);
+ <a name="l00210"></a>00210         <span class="keywordflow">return</span> ((split_m.sec - epoch_m.sec) * <span class="keywordtype">double</span>(1e3) + (split_m.nsec - epoch_m.nsec) / <span class="keywordtype">double</span>(1e6));
+ <a name="l00211"></a>00211 <span class="preprocessor">#elif defined(BOOST_HAS_GETTIMEOFDAY)</span>
+ <a name="l00212"></a>00212 <span class="preprocessor"></span>        gettimeofday(&amp;split_m, static_cast&lt;struct timezone*&gt;(0));
+diff --git a/source/zuid_sys_dep.cpp b/source/zuid_sys_dep.cpp
+index 8930dd7..bd54770 100644
+--- a/source/zuid_sys_dep.cpp
++++ b/source/zuid_sys_dep.cpp
+@@ -128,7 +128,7 @@ adobe::md5_t::digest_t get_generic_random_info()
+ #endif
+         {
+ #if defined(BOOST_HAS_THREADS)
+-            boost::xtime_get(&time_m, boost::TIME_UTC);
++            boost::xtime_get(&time_m, boost::TIME_UTC_);
+ #endif
+ #if defined(BOOST_HAS_UNISTD_H)
+             gethostname(hostname_m, 256);