Gentoo Archives: gentoo-commits

From: "Davide Pesavento (pesa)" <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/qmf/files: qmf-4.0.2-include.patch qmf-4.0.2-visibility.patch
Date: Thu, 01 Aug 2013 08:08:33
Message-Id: 20130801080827.29DFE2171C@flycatcher.gentoo.org
1 pesa 13/08/01 08:08:27
2
3 Added: qmf-4.0.2-include.patch qmf-4.0.2-visibility.patch
4 Log:
5 Fix build with gcc-4.7 (bug 426458).
6
7 (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)
8
9 Revision Changes Path
10 1.1 net-libs/qmf/files/qmf-4.0.2-include.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/qmf/files/qmf-4.0.2-include.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/qmf/files/qmf-4.0.2-include.patch?rev=1.1&content-type=text/plain
14
15 Index: qmf-4.0.2-include.patch
16 ===================================================================
17 From f3ef1f7f6eb9e456465924c63ade2a036079c85f Mon Sep 17 00:00:00 2001
18 From: Davide Pesavento <davidepesa@×××××.com>
19 Date: Sun, 28 Jul 2013 21:27:16 -0700
20 Subject: [PATCH] Add missing include.
21
22 Fixes the following compilation errors with gcc 4.7 and later.
23
24 messageserver.cpp: In static member function 'static void MessageServer::hupSignalHandler(int)':
25 messageserver.cpp:501:5: error: '::write' has not been declared
26 messageserver.cpp: In member function 'void MessageServer::handleSigHup()':
27 messageserver.cpp:508:5: error: '::read' has not been declared
28
29 Change-Id: I6fbcf2cba884f5e285c0259e020c60f4a44173b4
30 Reviewed-by: Valerio Valerio <valerio.valerio@×××××××××××.com>
31 Reviewed-by: Robin Burchell <robin+qt@××××××××.net>
32 ---
33 src/tools/messageserver/messageserver.cpp | 1 +
34 1 files changed, 1 insertions(+), 0 deletions(-)
35
36 diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
37 index b749f03..5fbedf9 100644
38 --- a/src/tools/messageserver/messageserver.cpp
39 +++ b/src/tools/messageserver/messageserver.cpp
40 @@ -61,6 +61,7 @@ extern "C" {
41 }
42
43 #if defined(Q_OS_UNIX)
44 +#include <unistd.h>
45 int MessageServer::sighupFd[2];
46 #endif
47
48 --
49 1.7.1
50
51
52
53
54 1.1 net-libs/qmf/files/qmf-4.0.2-visibility.patch
55
56 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/qmf/files/qmf-4.0.2-visibility.patch?rev=1.1&view=markup
57 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/qmf/files/qmf-4.0.2-visibility.patch?rev=1.1&content-type=text/plain
58
59 Index: qmf-4.0.2-visibility.patch
60 ===================================================================
61 From a84920f307cd4c5661f09dc41e562ff949d6779c Mon Sep 17 00:00:00 2001
62 From: Davide Pesavento <davidepesa@×××××.com>
63 Date: Sun, 28 Jul 2013 23:40:16 -0700
64 Subject: [PATCH] libqmfclient: export a few private classes used by messageserver.
65
66 Since version 4.7.0, gcc constraints the ELF visibility of template
67 instantiations to the visibility of its template arguments (see
68 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35688).
69
70 Therefore all explicit instantiations of QPrivatelyImplemented<> in
71 qmailinstantiations.cpp are now hidden, because the template arguments
72 are private classes that have hidden visibility.
73
74 This commit restores pre-gcc-4.7 behavior by exporting the symbols
75 required to build messageserver successfully.
76
77 Change-Id: I7c0ae91a56cac390f1e73418af486578da665a94
78 Reviewed-by: Thiago Macieira <thiago.macieira@×××××.com>
79 Reviewed-by: Robin Burchell <robin+qt@××××××××.net>
80 ---
81 src/libraries/qmfclient/qmailmessage_p.h | 8 ++++----
82 1 files changed, 4 insertions(+), 4 deletions(-)
83
84 diff --git a/src/libraries/qmfclient/qmailmessage_p.h b/src/libraries/qmfclient/qmailmessage_p.h
85 index 256c6b4..8a93432 100644
86 --- a/src/libraries/qmfclient/qmailmessage_p.h
87 +++ b/src/libraries/qmfclient/qmailmessage_p.h
88 @@ -59,7 +59,7 @@
89
90 // These classes are implemented via qmailmessage.cpp and qmailinstantiations.cpp
91
92 -class QMailMessageHeaderFieldPrivate : public QPrivateImplementationBase
93 +class QMF_EXPORT QMailMessageHeaderFieldPrivate : public QPrivateImplementationBase
94 {
95 public:
96 QMailMessageHeaderFieldPrivate();
97 @@ -127,7 +127,7 @@ private:
98 };
99
100
101 -class QMailMessageBodyPrivate : public QPrivateImplementationBase
102 +class QMF_EXPORT QMailMessageBodyPrivate : public QPrivateImplementationBase
103 {
104 public:
105 QMailMessageBodyPrivate();
106 @@ -169,7 +169,7 @@ private:
107 };
108
109
110 -class QMailMessagePartContainerPrivate : public QPrivateImplementationBase
111 +class QMF_EXPORT QMailMessagePartContainerPrivate : public QPrivateImplementationBase
112 {
113 public:
114 template<typename Derived>
115 @@ -356,7 +356,7 @@ private:
116 };
117
118
119 -class QMailMessageMetaDataPrivate : public QPrivateImplementationBase
120 +class QMF_EXPORT QMailMessageMetaDataPrivate : public QPrivateImplementationBase
121 {
122 public:
123 QMailMessageMetaDataPrivate();
124 --
125 1.7.1