From c6dee1bb0e98c0caf31712b57999698b67338c89 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: May 16 2016 16:12:40 +0000 Subject: Rebuilt for linker errors in boost (#1331983) --- diff --git a/adobe-source-libraries.spec b/adobe-source-libraries.spec index 8a40841..743954d 100644 --- a/adobe-source-libraries.spec +++ b/adobe-source-libraries.spec @@ -2,7 +2,7 @@ Name: adobe-source-libraries Version: 1.0.43 -Release: 31%{?dist} +Release: 32%{?dist} Summary: General purpose C++ libraries Group: System Environment/Libraries @@ -25,6 +25,7 @@ Patch3: asl-time-utc.patch Patch4: asl-boost-1.50.patch Patch6: asl-boost-1.57.patch Patch7: asl-boost-1.60.patch +Patch8: asl-gcc6.patch BuildRequires: boost-build BuildRequires: boost-devel @@ -68,6 +69,7 @@ API and other documentation for Adobe Source Libraries (ASL). %patch4 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -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 && \ @@ -143,6 +145,10 @@ ln -sf $sofile ${sofile%%.*.*.*} %changelog +* Mon May 16 2016 Jonathan Wakely - 1.0.43-32 +- Rebuilt for linker errors in boost (#1331983) +- Patched for C++14 support in GCC 6 + * Wed Feb 03 2016 Fedora Release Engineering - 1.0.43-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/asl-gcc6.patch b/asl-gcc6.patch new file mode 100644 index 0000000..f5a56dd --- /dev/null +++ b/asl-gcc6.patch @@ -0,0 +1,14 @@ +--- source_release/adobe/cmath.hpp.orig 2016-05-16 16:43:02.179719529 +0100 ++++ source_release/adobe/cmath.hpp 2016-05-16 16:51:32.576909454 +0100 +@@ -39,7 +39,11 @@ + #elif __GNUC__ >= 4 + + // GNUC has C99 extensions in math.h but not in until C++11. ++#if __cplusplus >= 20103L ++#define ADOBE_HAS_C99_STD_MATH_H ++#else + #define ADOBE_HAS_C99_MATH_H ++#endif + #include + + #endif