Add patch to fix build with dev-libs/boost-1.57, bug #550016. Thanks to David Kredba <nheghathivhistha@gmail.com> and Heiko Becker <heirecka@exherbo.org>.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 60 insertions, 19 deletions

diff --git a/media-libs/qt-gstreamer/ChangeLog b/media-libs/qt-gstreamer/ChangeLog
index 7955a06030b9..c7cfcc755820 100644
--- a/media-libs/qt-gstreamer/ChangeLog
+++ b/media-libs/qt-gstreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/qt-gstreamer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/ChangeLog,v 1.23 2015/03/09 11:09:27 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/ChangeLog,v 1.24 2015/05/30 11:39:48 johu Exp $
+
+  30 May 2015; Johannes Huber <johu@gentoo.org>
+  +files/qt-gstreamer-1.2.0-boost157.patch, qt-gstreamer-1.2.0-r1.ebuild:
+  Add patch to fix build with dev-libs/boost-1.57, bug #550016. Thanks to David
+  Kredba <nheghathivhistha@gmail.com> and Heiko Becker <heirecka@exherbo.org>.
 
   09 Mar 2015; Michael Palimaka <kensington@gentoo.org>
   qt-gstreamer-1.2.0-r1.ebuild:
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index c1231efbc627..2e137373216e 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qt-gstreamer-1.2.0-boost157.patch 1108 SHA256 7747695d10587059c4dca6331bc063bf849150a7fe0c779eebe3ac93cb0aae8d SHA512 5581d429b48209fecae7d471c155651d03b84b02fe57083132a1d64806abcdb323fc5dd5d339fce9f571f65812d2f19c9545820c326cb10c3cd5d08d406be525 WHIRLPOOL 673d4f71cd0159d49e765ea83b3126430093517906c49bcefea9a05308c52d11f82dcae614b733efb85250b754909e9aea5355ea30fef5d9db72347a5c25672b
 DIST qt-gstreamer-1.2.0.tar.xz 313632 SHA256 9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4 SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 WHIRLPOOL 2e8c5d70a384ee472dac265179c471369d64fb2deabe239c13cd4eb437358c97c316a486ae4292e8bdb3c823b521b656b665292392f0bb91d1c233869fb09789
-EBUILD qt-gstreamer-1.2.0-r1.ebuild 1663 SHA256 958616b56d4cfb8b6ed116a1306c2edcdecfa7766747a7c9a4d963bdc6034b73 SHA512 e84429ca415689541b90582c2ac094587e099726afee4515480c99dd79b3b836599e981a42f63c321fedaf34c24d3ca38f84b1c05847d99e749550b694b12897 WHIRLPOOL a1310d8e880480bd5028b124d18147d745c366a7d132d7b0f0c7f11b6a391ada1238899d7d0218873cf5073933d16405f4aa68bf8c767deb7166bd85ae31e22d
+EBUILD qt-gstreamer-1.2.0-r1.ebuild 1704 SHA256 226807e24bea44121454d8c1fe842649b0c8c95519718fbbd3fea8a7ce04cf88 SHA512 f028ccb504a4ea01648ccbdd1a7205b7bf0db05e8dc6a5968ed497e1850f8e1392a6183ad3bd36c6253687b62f6d92a203502059daeab62f3521d9e2fe38ab37 WHIRLPOOL 3ff25e7013bbf537cbd924185f3757090d0e874dcc6f185aa1b55c3d7697964b01fadfc179ab6a7cfe3424807f0310c7e2c751507f1694bd5bb6a0d301ca8352
 EBUILD qt-gstreamer-1.2.0.ebuild 1226 SHA256 4c48acef72dcbad7c0a4083c052e1408f31c1924c5892413948a097271c4d759 SHA512 9d2d99f0df660e389e100112cfe0a57103b06118a11969e51e6b80f90e040cfabc14a09ddb33bc5ca21c83b288faa2e79286e823665bdecc747178484e796554 WHIRLPOOL a77561b76858d40d40a358171cc71a556266c6c5661690d804838c96ad764ae59b2891643c9741550f4583491fdaaf7362112fd0382521f16d591c7d87e3f991
-MISC ChangeLog 3214 SHA256 f00000c0ed8af1c35be6c454c1efa240d70203d6369ddb40f5d9314e21ea4193 SHA512 8cd62a769e9ad5dcbc52de975be4b5958c1c081cd8ef94a55282d2ae1d35d80373fea2f35d3092eebaeba8b7486b9132f1c24b345c6ec8498a04b33a06ddb0e3 WHIRLPOOL 5f3cca2063200c6c58f50865056f4c0268bf87b87a41b2ba750ead2a91e6432dabbc3de95763db62dff6fbdf047aeca26059add9b9c245deb95f6890216a0116
+MISC ChangeLog 3490 SHA256 cfb610b85da467400925c1a4466129cb43a704adb2165f9817e938fec88b5826 SHA512 47478cf3ea87c564ca153f873d4b2cc1d236d56aad9de927067a202f3b3ac585f602b74fceeabb4a2d9eccbe975b0cb18908c1a5badbba8324d7823a3f7c4720 WHIRLPOOL 3a8672611e41ccb90d76cc4d5ff85bc7ff5df0b1c72cf56dfd3fa049690f9dbefc3c702ace921a4550f31c264539371dff7f9d57f8395aea6c3084064de54ed8
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJU/X9nRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7AfFD/9SGQ9iDzliWXVdDTNPhLr7/pWLQ6xkSk7cRvJJ8KuD85y/TQKQbI6+a1xb
-bXsIxQW1udYCx07uSeZesXj/BES4/b3n3qbMsnwJDxdOurRPPCFf5QnIU4Tm4gBP
-CLs6nnfQJDVJdS9BysQrQc6JmusuzEr/FYBamK/TeFp6F8gLwUMQpGpI//sQN1ce
-AxyLB4jEMt55305nCVzFgKhsrdHYSg7rUi9YKk1C6dGPTkyH2rxjnqQzjvf0YuHq
-+M6cf79t12mI0OtGYKUAX19uwk2TKncm0Uk4n9PNVLqCyEthkNDOAwcNWMU4zdNX
-L5J7xUdSq4vKAmrtvpW+TBH6KpzSQlrOyxNQNWGBbGWXeUwts9RYJe5S2sU7CJS2
-Oa6Zbjosi0V+MbP9Dx6oNj7w/fUXvVuYYZP0Z0GyDlV2SD1SxzuSw8/eUHGa/FuZ
-YXzpQJ+fhsryaqBxixJXCS1ZoY10vK9+f0x62SHN+8nXSPqK4dRPDIja7kXNyQ7q
-6KWbhmJtVMJwCPV23zZOHPknQhd4NouFUBfBl4kqwO7Swy1UE0tEtXidnvLe9/Kr
-iwSd0t/4zEDFUJ52+IeTp2Ta1BT53LbtU7VlgZGkkvCA1yCEC/L0vwyKC90kT9jY
-z6MwEuXMu5Kde8AVdsWrHev7d8NiKyZSxG33SlBzylBeN0sydA==
-=N+O5
+iQIcBAEBCAAGBQJVaaGIAAoJEGVpnaTzz9K9B+AQAL6fTgbJiMnxeg8HzFA/mc2f
+J4Cmb/+emi4t+tkDvoBUgG/rMTkvBvjvw6CJGKuAZdm1/Yc739DTp1tqgszs/lvK
+pOG+TnuxoMDRcyzZBIylofrG8OTSnQkOS3BQXynJUHmdZDnvyU89G6Gq8MCG0ODF
+ikfcdtzELnPLTZXTUsuVxOG0mUKe/dIVyoRN3VFtIN6txzk5bZfJewh7rIauxN47
+lAfyyO945gOAf/kn/Jw3A/QUPyJPOC5eetTvpq//au8KTNA6eQ/PMJ8UgyHQhcE2
+HR3by9zvovNa/3vL6gFhkyVJRVwhf2mHqO1qbn+0H1ozd+DZ+wkhPk1X9zAdihaw
+A68WH1/Q+YQISxLkFnTBmdVBqxuW2C+fvCA62GfI7FjC9U+0+KTT7zBbtiwJ66yh
+PPsPktOoTsI/45yIu4HEOPIaY9M7lqPs3MIAfoR2Knws5q4N2c+dGOfpp/vVOC4i
+q23CiVsNpj1qe4oeP48v0xvVxOfFooX4PDMnrp4GXiaCCL6nYEcdOS7PjoIK56g7
+e1DaVQT1EVXCPgOXzcotUcS2Q+bX3uMeBgkGNPQbN05pJNAJXc5csdIu5Li9EjKv
+7IuE/qUgEXQhN9VZB2/wQ1e96CgFQRX90UHr8vZ8o5um0AePsOnlwd+5+HVxe7Wo
+6W+uTKnxkQ+LxBW2TR4h
+=NdEd
 -----END PGP SIGNATURE-----
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
new file mode 100644
index 000000000000..a795420e3bcc
--- /dev/null
+++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
@@ -0,0 +1,34 @@
+From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 7 Nov 2014 00:11:02 +0100
+Subject: [PATCH] Workaround build failures with boost>=1.57 and moc
+
+Otherwise I get the following error message:
+'usr/include/boost/type_traits/detail/has_binary_operator.hp:50:
+Parse error at "BOOST_JOIN"'. See
+https://bugreports.qt-project.org/browse/QTBUG-22829 for details.
+
+The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+doesn't seem to work here.
+---
+ src/QGlib/connect.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp
+index 9ff6fde..58a3367 100644
+--- a/src/QGlib/connect.cpp
++++ b/src/QGlib/connect.cpp
+@@ -21,8 +21,10 @@
+ #include <QtCore/QHash>
+ #include <QtCore/QMutex>
+ #include <boost/multi_index_container.hpp>
++#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+ #include <boost/multi_index/sequenced_index.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+ #include <boost/multi_index/member.hpp>
+ 
+ namespace QGlib {
+-- 
+2.1.3
+
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
index e9d060f6c9fd..f81247a04b28 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild,v 1.2 2015/03/09 11:09:27 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild,v 1.3 2015/05/30 11:39:48 johu Exp $
 
 EAPI=5
 
@@ -53,6 +53,8 @@ DEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost157.patch" )
+
 # bug 497880
 RESTRICT="test"