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 - 1.0.43-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild +* Thu Aug 3 2012 Alec Leamas 1.0.43-12 +- Handling boost bug 6940 * Thu Apr 5 2012 Alec Leamas 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(0)); + #endif +@@ -206,7 +206,7 @@ public: + (void)::QueryPerformanceCounter(&split_m); + return (split_m.QuadPart - epoch_m.QuadPart) / static_cast(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(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 @@ + 00182 #if ADOBE_PLATFORM_WIN + 00183 (void)::QueryPerformanceCounter(&epoch_m); + 00184 #elif defined(BOOST_HAS_THREADS) +-00185 boost::xtime_get(&epoch_m, boost::TIME_UTC); ++00185 boost::xtime_get(&epoch_m, boost::TIME_UTC_); + 00186 #elif defined(BOOST_HAS_GETTIMEOFDAY) + 00187 gettimeofday(&epoch_m, static_cast<struct timezone*>(0)); + 00188 #endif +@@ -215,7 +215,7 @@ + 00206 (void)::QueryPerformanceCounter(&split_m); + 00207 return (split_m.QuadPart - epoch_m.QuadPart) / static_cast<double>(frequency_m.QuadPart) * double(1e3); + 00208 #elif defined(BOOST_HAS_THREADS) +-00209 boost::xtime_get(&split_m, boost::TIME_UTC); ++00209 boost::xtime_get(&split_m, boost::TIME_UTC_); + 00210 return ((split_m.sec - epoch_m.sec) * double(1e3) + (split_m.nsec - epoch_m.nsec) / double(1e6)); + 00211 #elif defined(BOOST_HAS_GETTIMEOFDAY) + 00212 gettimeofday(&split_m, static_cast<struct timezone*>(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);