Boost updated to 1.58.0 in rawhide and f23

[Jonathan Wakely]

On 23/07/15 14:33 +0200, David Tardon wrote:
>Hi,
>
>On Thu, Jul 23, 2015 at 02:27:33PM +0200, David Tardon wrote:
>> Hi,
>>
>> On Sat, Jul 18, 2015 at 12:46:51PM +0100, Jonathan Wakely wrote:
>> > Any problems rebuilding either open a bug or feel free to email me or
>> > ping me on IRC (my freenode nick is 'redi') and I'll be happy to help.
>>
>> This is a work-in-progress list of FTBFS packages:
>>
>> * Build failures:
>>
>> - Rawhide only
>>
>> pion-net

The attached patch is needed to fix pion-net's %check step, due to a
breaking change in Boost.Variant in 1.58.0, documented at
http://www.boost.org/users/history/version_1_58_0.html and
http://www.boost.org/doc/libs/1_58_0/doc/html/boost/get_idp295310448.html

Also I noticed that the URL in the pion-net.spec file no longer works,
I guess the project was hosted at Google Code which is gone now. The
new home seems to be https://github.com/splunk/pion although that
doesn't have any releases before 5.0.1 (Fedora uses 4.0.9).


-------------- next part --------------
commit 935dcf35040883dadf9e8d583946d30ce644ef49
Author: Jonathan Wakely <jwakely at redhat.com>
Date:   Mon Jul 27 16:47:43 2015 +0100

    Add patch to work with strict_get from Boost.Variant 1.58.0.

diff --git a/pion-net-boost-variant.patch b/pion-net-boost-variant.patch
new file mode 100644
index 0000000..6638244
--- /dev/null
+++ b/pion-net-boost-variant.patch
@@ -0,0 +1,24 @@
+Adapt to breaking change in Boost.Variant where boost::get<> is strict.
+
+Author: Jonathan Wakely <jwakely at redhat.com>
+
+--- a/common/tests/PionBlobTests.cpp~	2015-07-27 16:41:47.604056525 +0100
++++ b/common/tests/PionBlobTests.cpp	2015-07-27 16:45:59.882935301 +0100
+@@ -114,7 +114,7 @@
+ 	BOOST_CHECK(b1 == goodbye_str);
+ 	
+ 	boost::variant<int,BlobType> valueA(b1);
+-	BOOST_CHECK_EQUAL(goodbye_str, boost::get<BlobType&>(valueA).get());
++	BOOST_CHECK_EQUAL(goodbye_str, boost::get<BlobType>(valueA).get());
+ 	BOOST_CHECK(! b1.unique());
+ 	BOOST_CHECK_EQUAL(b1.use_count(), 2);
+ 
+@@ -123,7 +123,7 @@
+ 	BOOST_CHECK_EQUAL(b1.use_count(), 1);
+ 	
+ 	boost::variant<int,BlobType> valueB(p2);
+-	BOOST_CHECK_EQUAL(goodbye_str, boost::get<BlobType&>(valueB).get());
++	BOOST_CHECK_EQUAL(goodbye_str, boost::get<BlobType>(valueB).get());
+ 	
+ }
+ 
diff --git a/pion-net.spec b/pion-net.spec
index 33e92fa..c13813e 100644
--- a/pion-net.spec
+++ b/pion-net.spec
@@ -2,7 +2,7 @@
 
 Name:		pion-net
 Version:	4.0.9
-Release:	19%{?dist}
+Release:	20%{?dist}
 Summary:	C++ library for building lightweight HTTP interfaces
 
 License:	Boost
@@ -19,6 +19,7 @@ Patch3:		pion-net-boost-linking.patch
 Patch4:		pion-net-log4cpp-headers.patch
 Patch5:		pion-net-boost-compatibility.patch
 Patch6:		pion-net-boost-time-utc.patch
+Patch7:		pion-net-boost-variant.patch
 
 %description
 Pion Network Library is a C++ framework for building lightweight HTTP
@@ -114,6 +115,9 @@ make check
 
 
 %changelog
+* Mon Jul 27 2015 Jonathan Wakely <jwakely at redhat.com> 4.0.9-20
+- Add patch to work with strict_get from Boost.Variant 1.58.0.
+
 * Wed Jul 22 2015 David Tardon <dtardon at redhat.com> - 4.0.9-19
 - rebuild for Boost 1.58