Fix build with gcc-4.7 (bug 426458).

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

5 files changed, 126 insertions, 17 deletions

diff --git a/net-libs/qmf/ChangeLog b/net-libs/qmf/ChangeLog
index 6cbb94ed6716..398a0d0f92c0 100644
--- a/net-libs/qmf/ChangeLog
+++ b/net-libs/qmf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/qmf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/ChangeLog,v 1.7 2013/07/01 10:12:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/ChangeLog,v 1.8 2013/08/01 08:08:27 pesa Exp $
+
+  01 Aug 2013; Davide Pesavento <pesa@gentoo.org>
+  +files/qmf-4.0.2-include.patch, +files/qmf-4.0.2-visibility.patch,
+  qmf-4.0.2.ebuild:
+  Fix build with gcc-4.7 (bug 426458).
 
 *qmf-4.0.2 (01 Jul 2013)
 
diff --git a/net-libs/qmf/Manifest b/net-libs/qmf/Manifest
index 6902ce18f555..8be37fb7f050 100644
--- a/net-libs/qmf/Manifest
+++ b/net-libs/qmf/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qmf-4.0.2-include.patch 1194 SHA256 75671b5f53d32b8e43d939b2693b59040b4d095fb8e47135e9e96bc73b8cbab2 SHA512 1a6c2cdd6e61e05c9b624b4d7782d70ecdfe5c94e88ce8dab6341ab730148b6665d4f88cd425d9deb524c978907c863df7dae3346ac4bc0fea18596dfdb41272 WHIRLPOOL 3ea30c7a0bd928a601097ebfaf1adaae032db931ecdd72240a720fb96c9018eee197460f506fb0a68a88bafeddb9c0c0adf27f9c5d9e723bc7e91b7312f559c1
 AUX qmf-4.0.2-tests.patch 457 SHA256 c2c453898565a55e49cb35f745c86ac61d640344febf6a329f303dafcc90bfdd SHA512 862b4d667e5e61551521b41c8c0e092ad5d0833c779b6a9531a802df7cc8c32b9504974a84e5f2ffc4d416aa69819c22726dd9ae4ccec0b60890482a3e207632 WHIRLPOOL 9d8b2e0932db8d45f3bdcb369adb6bd84e0a86f7ddba6d975233cddb98f964ab224bdce41b9b880e7437cea01f138d15b0f3fde65b3307fc02cc11dcb6be1a40
+AUX qmf-4.0.2-visibility.patch 2257 SHA256 e9c813462cfd4291f33449af192f193fccaf2bb6f6dd0720849527435411a371 SHA512 332ede30e8e1fbc8c9c757b7e2e3d9de9c81ba9770732bcdea45c30e99545892c5408bde14454adc85edcd1c3d55b08fc47fe26682f4f8be6f1e35adbb89e207 WHIRLPOOL 7a36d4aa0438529a4b0b3a9b6be2a1d6953a45021973f036d9c824a98ac8fd7376a57417617af0bfb9e54dd295c17689f86cae0793e22d6a6c9558f036ab3b2e
 AUX qmf-tests.patch 591 SHA256 57a071c175d0cf76a6037d1d89c6d1d4b0507066299ec3db4a73e88c8357a13f SHA512 e12a935996996182e920240ac5a326ea57e17da7f7e19a0d629d8c4145c2b4320b84f2a974a5d4de51d9a7f1a31662465be8016ec848f7411c12274e3d061699 WHIRLPOOL a988ce20103f4f027e3a22d730b88afb35325702f751167406920a713219396746bac90ad9e1b2c45345c010818c47c4e82c55b73c2ca875f6d00a7e28424895
 DIST qmf-2.0_p201209.tar.gz 2531787 SHA256 d0a04e7a05c5fe58a6165607b34d625099cc94bd7d1253e313042d8d08af265e SHA512 8b0c6678a86c1f8a684d644895b5e9269f981291bf69af9188ddf35446ef0942acbabe816a0aca5ec2574f0365d70835bb8e1af791b6a6b7b1fe5b1800c94919 WHIRLPOOL 3fbd8edc4e634bb6a3966ae7ca77e09265bbb6a9d8ad29e3abe587b308557459affbc716d95df96a047bf9efec9f1380f1eecb75b6339fb58aa4a4a0f12e1164
 DIST qmf-4.0.2.tar.gz 2098216 SHA256 04dc987b2ce7bc8390133956e86972839c226190f410337fa66e952743559df1 SHA512 dc642f4e0f5005d1a93002cfff6d424cd0c49ce3c2369b55c18b5a8866335f2c6b309eaff81a8e3f88056aa35dbe995a10a7340d6aea3b23a0487abc38591889 WHIRLPOOL 41452cbb3af2558fc68edb39b958ec533cbe57600ddfd103cad1ff278132c4304e7fc66b2c5125e306784a86603e91265acbc6f3dd17862dd4127acc22bbe804
 EBUILD qmf-2.0_p201209-r1.ebuild 2214 SHA256 ac916d2de5fe0fc610a25833a89629660f5cd0d7b66010aefe6c373ea5392713 SHA512 5f3cb7d11b5e686843bd64d584c379fdeb4edc78064482d860a7ad88cbb3c5799d7405f7e1f527c14a40272f0564150ea09c5593a36a24a1a998179e1a7d16cc WHIRLPOOL c693a5693ffaffffa4208d6d546ff780ee93f6b60f021f892232e52a825164b3982ea4d2f07e060e66e7571b1cf29aca3e3f3cabc1012f9d525bc69c7d70ee18
-EBUILD qmf-4.0.2.ebuild 2497 SHA256 a16ba13fe4a8202d9a982fad8e21e8e5cc86353b8f0c932630190e65a99dde78 SHA512 a9844a345df0e3e4e5e0bbac60ddbcc9f7bfd51b6765864c7d23c9b58ac42f8921ee6245952cd9ce2ddac12266763a798f3a9cf8e4de2127a3c067c6600a4149 WHIRLPOOL c80e6d299fd6894576e8bccb1927811ce0ee442f447e82a38331243ecaab068241eb9959bbb2ba23286fc65756237a3fd62a0a45354c7c2be780614a38437dcd
-MISC ChangeLog 1475 SHA256 64f3fd8deb5c5d0760153f7a7b738b61a66003a8ebb8a526aaafcfad46769d6c SHA512 dd5f582bc085c72c827edf05a911fc63d39f8c3294481666289446c474b3bd8ea813a66210838834a1b2326e6ec9af16cc20de74c9d196f3ee50d5f3811908c6 WHIRLPOOL d5ae6d774b9956405241439cb75e5ec94f5d0aecfb96c3b79496876653e777987a203ab07283eaf559b9c541e15fe7b4e90e15617718cc0d9a80ceb31fc75e76
+EBUILD qmf-4.0.2.ebuild 2568 SHA256 1afa3416788486d211cc33d15b32d810bba75973ff31de657e8a85fbbe145867 SHA512 9433031f06be295a0262649766871a9dcb6b6d413ada22ccce35ea4d3617a037784488641466d5690b20b3b7bcb9178e0f303bfbb83bb3f66381caf4d5ca33c3 WHIRLPOOL f6b5d4a3cba4e7b83f13846078da9a588e02b6fbb64b9f4508c0771b907c20533fb35cfed2710b0d5069fa381f905933d30ba14e13101c41f74efd91a35bc34e
+MISC ChangeLog 1654 SHA256 3bee2b6cbf020e557b87f211d6a37b13ce91228730210848f16e793aa980c764 SHA512 08a7be0da05bef3801964762e45d396f0916ea1b19e2e72b0ce9cae00c768067569de4f5507b09a8bdb6945fe38424cd3b7ed60a29175cca85575413581a55d9 WHIRLPOOL bda81b736dd241f1eee95424024fad4866b3b9eb87efc3a04531cd29046cf79f541ce108a29c78cfe302f7f297e2e50d7e2ea14cd6d057a585dc15cc7711cbf2
 MISC metadata.xml 245 SHA256 b768e8d906de53d73eb189a1aef619cf77693af566a9dfda91705bd7dd7c117c SHA512 6084a1fdcd72a4b1c84776ac880de837d17c7b14f2554ae26832d4fc7287ad8ae9651e55bc72de2a23d21fa4e1bd0ca8e98d4c5cd3ba274b35cc3d8a3a6a372b WHIRLPOOL f9587cab5f31a0340ad7da99b058e1e8c46d2476c47d4b47fc327b2f61fd06a3a5924e1e9d9b48de866a9b560d4703d475530ade11bf6562437f76f910b56a2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR0VYmAAoJENXLsxwXqFxyMrwP/2rTmLV1/f9l31UiiKg0w4Et
-KB/KC9BNCYb6uekBtOi3wKJ1/sSbU0HoPf044zAVGSjX2BltQVd8wZoSeY0SjMTR
-qGRCLalB6Tcf1Lv3lmR471i8FnneKSE7wwiZgN2nQ85ONEyzWMK8y8szTaAIUWsq
-VI8YKdVG/+v85+2njY8qDeIZZZyF+rgOtHEbyx/FojixazzKyf9eaLSzzCYGhpfT
-0lqVQIgLAL4zmTouVG/sQ5t1Vr87j0c714ijW11BCVkCydfuCYezxLB1GkiNAmKL
-Ip4DjrfdLgfdRzIT+Wv2FZidI4WZ3buQrdkhg7iCzU0kCXBtzYYi80uvzHnlNX9R
-pUBJqNip6QZam3KO9HPVioBkQN24+7itlXhBN4BrKk10lyj9VizwomnvR0WoGXBE
-r91nTE9W7ekdNps49ApMvNCvdL1tXi+XkwGw2e9wW1uSGzGmd6dQx/1xvnusREG3
-P0B2zLZ5S1varzlwdkVwvr7dpVwAmVqIeoGK6gV6AfpowuAY2+tOIs23uw9ahQ5f
-5BVhMCYPICWkj0mcalVqlbVc2p4jbyywpZCT9RTWk2fKQMz/bTpBBBBimB4Hc/+t
-kmEdCl4DIkpcukAgYewNDKJuGZt+UhcNReTnadly9zYa1EfbqP63YslUGWXIp89H
-0FqhpxO7UXDBInXyAS6t
-=+p1E
+iQIcBAEBCAAGBQJR+hedAAoJENXLsxwXqFxyiKYP/02YkQJh54MD4h+mHA/7YC0o
+lnDBKWbDcSKbxD9JCKnwMfXCAGJdKkGDdD8VClsk6FPUMyjzv5d0gMzoTxWKILUq
+ffKq622kCRJqmbFxtRe9th7+NZrwG9U4PXz2SMEoqlLQ6jr24phfbr6ukX3x8i3q
+ixM6bhDDFR6iDYKArp8vH2c9cQZfUSnIY4Wc3vFPvGjhL++qZae1rGAsUf9bLqgd
+BPcX1ef7VxDBIHN2Rmo4ovrunfCFP5TGL2S4kPMA5+Js1k63662MtYx3nGdLL1Ui
+lgCPE8tVWrZ47blBV61uIAYzhNLM+LsFxLl168GP7BOfCkX20GEPzkFo5nNMrKvD
+VPEUNhzZ1ZtDhMqlRtsUco0y3kBts4S4u+G/xmGRayNapHb6cIh3ZtUbD29I0sFn
+N/nAKUkYxA6uSlbMW8ojOUHm4eSEbSqIEtywIHFn2GX+APZxTEtpOe8tUI+uKICC
+ZPqphT9S3hz2Vs2eyCAU84azAhF9QAlfjLmFr1mTxMFFOKZRno1mkv+K9AH0Be/p
+EOnhghbeckf7oZ6K8pN1FssDa/ArTXuNeHYGEnLTOzR9KABrfB2tmzwOmRijorD0
+TqpEReoCPG6yVkrA5rLIm5TKyXY/8fb7P2w80pdC6BDe2+TURFq5Bk8C9D774/Lf
+A+6Yc8cnbfdA2sWTZS8s
+=J5tg
 -----END PGP SIGNATURE-----
diff --git a/net-libs/qmf/files/qmf-4.0.2-include.patch b/net-libs/qmf/files/qmf-4.0.2-include.patch
new file mode 100644
index 000000000000..5d050074edfe
--- /dev/null
+++ b/net-libs/qmf/files/qmf-4.0.2-include.patch
@@ -0,0 +1,34 @@
+From f3ef1f7f6eb9e456465924c63ade2a036079c85f Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sun, 28 Jul 2013 21:27:16 -0700
+Subject: [PATCH] Add missing include.
+
+Fixes the following compilation errors with gcc 4.7 and later.
+
+messageserver.cpp: In static member function 'static void MessageServer::hupSignalHandler(int)':
+messageserver.cpp:501:5: error: '::write' has not been declared
+messageserver.cpp: In member function 'void MessageServer::handleSigHup()':
+messageserver.cpp:508:5: error: '::read' has not been declared
+
+Change-Id: I6fbcf2cba884f5e285c0259e020c60f4a44173b4
+Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
+Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
+---
+ src/tools/messageserver/messageserver.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
+index b749f03..5fbedf9 100644
+--- a/src/tools/messageserver/messageserver.cpp
++++ b/src/tools/messageserver/messageserver.cpp
+@@ -61,6 +61,7 @@ extern "C" {
+ }
+ 
+ #if defined(Q_OS_UNIX)
++#include <unistd.h>
+ int MessageServer::sighupFd[2];
+ #endif
+ 
+-- 
+1.7.1
+
diff --git a/net-libs/qmf/files/qmf-4.0.2-visibility.patch b/net-libs/qmf/files/qmf-4.0.2-visibility.patch
new file mode 100644
index 000000000000..5d9a26980bbd
--- /dev/null
+++ b/net-libs/qmf/files/qmf-4.0.2-visibility.patch
@@ -0,0 +1,66 @@
+From a84920f307cd4c5661f09dc41e562ff949d6779c Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sun, 28 Jul 2013 23:40:16 -0700
+Subject: [PATCH] libqmfclient: export a few private classes used by messageserver.
+
+Since version 4.7.0, gcc constraints the ELF visibility of template
+instantiations to the visibility of its template arguments (see
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35688).
+
+Therefore all explicit instantiations of QPrivatelyImplemented<> in
+qmailinstantiations.cpp are now hidden, because the template arguments
+are private classes that have hidden visibility.
+
+This commit restores pre-gcc-4.7 behavior by exporting the symbols
+required to build messageserver successfully.
+
+Change-Id: I7c0ae91a56cac390f1e73418af486578da665a94
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
+---
+ src/libraries/qmfclient/qmailmessage_p.h |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/libraries/qmfclient/qmailmessage_p.h b/src/libraries/qmfclient/qmailmessage_p.h
+index 256c6b4..8a93432 100644
+--- a/src/libraries/qmfclient/qmailmessage_p.h
++++ b/src/libraries/qmfclient/qmailmessage_p.h
+@@ -59,7 +59,7 @@
+ 
+ // These classes are implemented via qmailmessage.cpp and qmailinstantiations.cpp
+ 
+-class QMailMessageHeaderFieldPrivate : public QPrivateImplementationBase
++class QMF_EXPORT QMailMessageHeaderFieldPrivate : public QPrivateImplementationBase
+ {
+ public:
+     QMailMessageHeaderFieldPrivate();
+@@ -127,7 +127,7 @@ private:
+ };
+ 
+ 
+-class QMailMessageBodyPrivate : public QPrivateImplementationBase
++class QMF_EXPORT QMailMessageBodyPrivate : public QPrivateImplementationBase
+ {
+ public:
+     QMailMessageBodyPrivate();
+@@ -169,7 +169,7 @@ private:
+ };
+ 
+ 
+-class QMailMessagePartContainerPrivate : public QPrivateImplementationBase
++class QMF_EXPORT QMailMessagePartContainerPrivate : public QPrivateImplementationBase
+ {
+ public:
+     template<typename Derived>
+@@ -356,7 +356,7 @@ private:
+ };
+ 
+ 
+-class QMailMessageMetaDataPrivate : public QPrivateImplementationBase
++class QMF_EXPORT QMailMessageMetaDataPrivate : public QPrivateImplementationBase
+ {
+ public:
+     QMailMessageMetaDataPrivate();
+-- 
+1.7.1
+
diff --git a/net-libs/qmf/qmf-4.0.2.ebuild b/net-libs/qmf/qmf-4.0.2.ebuild
index 8d9ef291bf3b..cfd1ba2f8771 100644
--- a/net-libs/qmf/qmf-4.0.2.ebuild
+++ b/net-libs/qmf/qmf-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-4.0.2.ebuild,v 1.1 2013/07/01 10:12:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-4.0.2.ebuild,v 1.2 2013/08/01 08:08:27 pesa Exp $
 
 EAPI=5
 
@@ -40,6 +40,8 @@ DEPEND="${RDEPEND}
 DOCS=(CHANGES)
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-tests.patch"
+	"${FILESDIR}/${P}-include.patch"
+	"${FILESDIR}/${P}-visibility.patch"
 )
 
 src_prepare() {