1 |
yngwin 13/03/02 15:26:01 |
2 |
|
3 |
Added: moc-workaround-for-BOOST_JOIN.patch |
4 |
set-pkg-config-locations-directly-to-install-dir.patch |
5 |
fix-call-to-QMetaObject-metaCall-from-updateProperty.patch |
6 |
CVE-2013-0254.patch |
7 |
blacklist-mis-issued-Turktrust-certs.patch |
8 |
moc-workaround-for-boost-1.48.patch |
9 |
Log: |
10 |
Move to new dev-qt category |
11 |
|
12 |
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x2B2474AD43CE296E!) |
13 |
|
14 |
Revision Changes Path |
15 |
1.1 dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch |
16 |
|
17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch?rev=1.1&view=markup |
18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch?rev=1.1&content-type=text/plain |
19 |
|
20 |
Index: moc-workaround-for-BOOST_JOIN.patch |
21 |
=================================================================== |
22 |
diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp |
23 |
--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600 |
24 |
+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600 |
25 |
@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv) |
26 |
Moc moc; |
27 |
pp.macros["Q_MOC_RUN"]; |
28 |
pp.macros["__cplusplus"]; |
29 |
+ |
30 |
+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829 |
31 |
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; |
32 |
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; |
33 |
+ |
34 |
QByteArray filename; |
35 |
QByteArray output; |
36 |
FILE *in = 0; |
37 |
|
38 |
|
39 |
|
40 |
1.1 dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: set-pkg-config-locations-directly-to-install-dir.patch |
46 |
=================================================================== |
47 |
From 87fa0250081cffb6e413fec7957f5ac4add6cdd1 Mon Sep 17 00:00:00 2001 |
48 |
From: Oswald Buddenhagen <oswald.buddenhagen@×××××.com> |
49 |
Date: Tue, 8 Jan 2013 16:34:26 +0100 |
50 |
Subject: [PATCH] set pkg-config *_location directly to install dir |
51 |
|
52 |
qmake tries to replace all occurrences of the install prefix with a |
53 |
literal ${prefix}. of course this would mess up build paths which happen |
54 |
to live under the prefix (this is untypical, but still), which would |
55 |
break the sed magic in the subsequent install step. as qmake itself has |
56 |
no use for the .pc files, it's ok to target them directly for the |
57 |
install dir. we do the same with the include and lib dirs already. |
58 |
|
59 |
qt5 is already doing the right thing. |
60 |
|
61 |
Task-number: QTBUG-28807 |
62 |
Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5 |
63 |
Reviewed-by: Davide Pesavento <davidepesa@×××××.com> |
64 |
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@×××××.com> |
65 |
|
66 |
diff --git a/src/qbase.pri b/src/qbase.pri |
67 |
index 991c888..feec9d6 100644 |
68 |
--- a/src/qbase.pri |
69 |
+++ b/src/qbase.pri |
70 |
@@ -166,23 +166,25 @@ DEFINES *= QT_USE_QSTRINGBUILDER |
71 |
|
72 |
TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |
73 |
|
74 |
-qtPrepareTool(QMAKE_LUPDATE, lupdate) |
75 |
-qtPrepareTool(QMAKE_LRELEASE, lrelease) |
76 |
- |
77 |
+QMAKE_MOC_PC = $$[QT_INSTALL_BINS]/moc |
78 |
moc_dir.name = moc_location |
79 |
-moc_dir.variable = QMAKE_MOC |
80 |
+moc_dir.variable = QMAKE_MOC_PC |
81 |
|
82 |
+QMAKE_UIC_PC = $$[QT_INSTALL_BINS]/uic |
83 |
uic_dir.name = uic_location |
84 |
-uic_dir.variable = QMAKE_UIC |
85 |
+uic_dir.variable = QMAKE_UIC_PC |
86 |
|
87 |
+QMAKE_RCC_PC = $$[QT_INSTALL_BINS]/rcc |
88 |
rcc_dir.name = rcc_location |
89 |
-rcc_dir.variable = QMAKE_RCC |
90 |
+rcc_dir.variable = QMAKE_RCC_PC |
91 |
|
92 |
+QMAKE_LUPDATE_PC = $$[QT_INSTALL_BINS]/lupdate |
93 |
lupdate_dir.name = lupdate_location |
94 |
-lupdate_dir.variable = QMAKE_LUPDATE |
95 |
+lupdate_dir.variable = QMAKE_LUPDATE_PC |
96 |
|
97 |
+QMAKE_LRELEASE_PC = $$[QT_INSTALL_BINS]/lrelease |
98 |
lrelease_dir.name = lrelease_location |
99 |
-lrelease_dir.variable = QMAKE_LRELEASE |
100 |
+lrelease_dir.variable = QMAKE_LRELEASE_PC |
101 |
|
102 |
QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir |
103 |
|
104 |
-- |
105 |
1.8.1.1 |
106 |
|
107 |
|
108 |
|
109 |
|
110 |
1.1 dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch |
111 |
|
112 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch?rev=1.1&view=markup |
113 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch?rev=1.1&content-type=text/plain |
114 |
|
115 |
Index: fix-call-to-QMetaObject-metaCall-from-updateProperty.patch |
116 |
=================================================================== |
117 |
From 03e96961b0f4fc2c290271c6e50a11aa334a40ff Mon Sep 17 00:00:00 2001 |
118 |
From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@××××××××.org> |
119 |
Date: Sun, 3 Feb 2013 23:07:07 -0500 |
120 |
Subject: [PATCH] Fix call to QMetaObject::metaCall from updateProperty |
121 |
|
122 |
Create an array of arguments in the same way |
123 |
QMetaObject::write does |
124 |
|
125 |
Task-number: QTBUG-29082 |
126 |
Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305 |
127 |
--- |
128 |
src/corelib/animation/qpropertyanimation.cpp | 7 +++++-- |
129 |
1 file changed, 5 insertions(+), 2 deletions(-) |
130 |
|
131 |
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp |
132 |
index dcf779a..9869d7e 100644 |
133 |
--- a/src/corelib/animation/qpropertyanimation.cpp |
134 |
+++ b/src/corelib/animation/qpropertyanimation.cpp |
135 |
@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) |
136 |
|
137 |
if (newValue.userType() == propertyType) { |
138 |
//no conversion is needed, we directly call the QMetaObject::metacall |
139 |
- void *data = const_cast<void*>(newValue.constData()); |
140 |
- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); |
141 |
+ //check QMetaProperty::write for an explanation of these |
142 |
+ int status = -1; |
143 |
+ int flags = 0; |
144 |
+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags }; |
145 |
+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); |
146 |
} else { |
147 |
targetValue->setProperty(propertyName.constData(), newValue); |
148 |
} |
149 |
-- |
150 |
1.8.1.2 |
151 |
|
152 |
|
153 |
|
154 |
|
155 |
1.1 dev-qt/qtcore/files/CVE-2013-0254.patch |
156 |
|
157 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/CVE-2013-0254.patch?rev=1.1&view=markup |
158 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/CVE-2013-0254.patch?rev=1.1&content-type=text/plain |
159 |
|
160 |
Index: CVE-2013-0254.patch |
161 |
=================================================================== |
162 |
From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 |
163 |
From: Thiago Macieira <thiago.macieira@×××××.com> |
164 |
Date: Sat, 22 Dec 2012 08:32:12 -0800 |
165 |
Subject: [PATCH] Change all shmget calls to user-only memory |
166 |
|
167 |
Drop the read and write permissions for group and other users in the |
168 |
system. |
169 |
|
170 |
Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 |
171 |
(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) |
172 |
Reviewed-by: Richard J. Moore <rich@×××.org> |
173 |
--- |
174 |
src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- |
175 |
src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- |
176 |
|
177 |
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp |
178 |
index 20d76e3..4cf3acf 100644 |
179 |
--- a/src/corelib/kernel/qsharedmemory_unix.cpp |
180 |
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp |
181 |
@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) |
182 |
} |
183 |
|
184 |
// create |
185 |
- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { |
186 |
+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { |
187 |
QString function = QLatin1String("QSharedMemory::create"); |
188 |
switch (errno) { |
189 |
case EINVAL: |
190 |
@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) |
191 |
{ |
192 |
#ifndef QT_POSIX_IPC |
193 |
// grab the shared memory segment id |
194 |
- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); |
195 |
+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); |
196 |
if (-1 == id) { |
197 |
setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); |
198 |
return false; |
199 |
@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() |
200 |
size = 0; |
201 |
|
202 |
// Get the number of current attachments |
203 |
- int id = shmget(unix_key, 0, 0444); |
204 |
+ int id = shmget(unix_key, 0, 0400); |
205 |
cleanHandle(); |
206 |
|
207 |
struct shmid_ds shmid_ds; |
208 |
diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp |
209 |
index fad9acc..e77456b 100644 |
210 |
--- a/src/corelib/kernel/qsystemsemaphore_unix.cpp |
211 |
+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp |
212 |
@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) |
213 |
} |
214 |
|
215 |
// Get semaphore |
216 |
- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); |
217 |
+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); |
218 |
if (-1 == semaphore) { |
219 |
if (errno == EEXIST) |
220 |
- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); |
221 |
+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); |
222 |
if (-1 == semaphore) { |
223 |
setErrorString(QLatin1String("QSystemSemaphore::handle")); |
224 |
cleanHandle(); |
225 |
-- |
226 |
1.7.1 |
227 |
|
228 |
|
229 |
|
230 |
|
231 |
1.1 dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch |
232 |
|
233 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch?rev=1.1&view=markup |
234 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch?rev=1.1&content-type=text/plain |
235 |
|
236 |
Index: blacklist-mis-issued-Turktrust-certs.patch |
237 |
=================================================================== |
238 |
From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001 |
239 |
From: Peter Hartmann <phartmann@×××.com> |
240 |
Date: Fri, 4 Jan 2013 11:06:14 +0100 |
241 |
Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust |
242 |
certificates |
243 |
|
244 |
Those certificates have erroneously set the CA attribute to true, |
245 |
meaning everybody in possesion of their keys can issue certificates on |
246 |
their own. |
247 |
|
248 |
backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase |
249 |
|
250 |
Task-number: QTBUG-28937 |
251 |
Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 |
252 |
Reviewed-by: Richard J. Moore <rich@×××.org> |
253 |
--- |
254 |
src/network/ssl/qsslcertificate.cpp | 3 +++ |
255 |
...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++ |
256 |
.../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++++ |
257 |
3 files changed, 58 insertions(+) |
258 |
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem |
259 |
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem |
260 |
|
261 |
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp |
262 |
index 038187f..37799d1 100644 |
263 |
--- a/src/network/ssl/qsslcertificate.cpp |
264 |
+++ b/src/network/ssl/qsslcertificate.cpp |
265 |
@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { |
266 |
|
267 |
"120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust |
268 |
"1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust |
269 |
+ |
270 |
+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate |
271 |
+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate |
272 |
0 |
273 |
}; |
274 |
|
275 |
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem |
276 |
new file mode 100644 |
277 |
index 0000000..33f2ef4 |
278 |
--- /dev/null |
279 |
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem |
280 |
@@ -0,0 +1,24 @@ |
281 |
+-----BEGIN CERTIFICATE----- |
282 |
+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD |
283 |
+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl |
284 |
+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 |
285 |
+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo |
286 |
+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow |
287 |
+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr |
288 |
+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz |
289 |
+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA |
290 |
+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB |
291 |
+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5 |
292 |
+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R |
293 |
+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa |
294 |
+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r |
295 |
+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF |
296 |
+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw |
297 |
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K |
298 |
+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l |
299 |
+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA |
300 |
+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8 |
301 |
+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp |
302 |
+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC |
303 |
+pWfGWA== |
304 |
+-----END CERTIFICATE----- |
305 |
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem |
306 |
new file mode 100644 |
307 |
index 0000000..e9d048f |
308 |
--- /dev/null |
309 |
+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem |
310 |
@@ -0,0 +1,31 @@ |
311 |
+-----BEGIN CERTIFICATE----- |
312 |
+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD |
313 |
+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl |
314 |
+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 |
315 |
+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo |
316 |
+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow |
317 |
+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB |
318 |
+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE |
319 |
+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA |
320 |
+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V |
321 |
+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF |
322 |
+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO |
323 |
+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q |
324 |
+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N |
325 |
+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS |
326 |
+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G |
327 |
+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF |
328 |
+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF |
329 |
+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t |
330 |
+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd |
331 |
+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy |
332 |
+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz |
333 |
+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy |
334 |
+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn |
335 |
+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV |
336 |
+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj |
337 |
+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU |
338 |
+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1 |
339 |
+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I |
340 |
+hQ== |
341 |
+-----END CERTIFICATE----- |
342 |
-- |
343 |
1.8.1 |
344 |
|
345 |
|
346 |
|
347 |
|
348 |
1.1 dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch |
349 |
|
350 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch?rev=1.1&view=markup |
351 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch?rev=1.1&content-type=text/plain |
352 |
|
353 |
Index: moc-workaround-for-boost-1.48.patch |
354 |
=================================================================== |
355 |
diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp |
356 |
--- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200 |
357 |
+++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200 |
358 |
@@ -187,6 +187,7 @@ |
359 |
Moc moc; |
360 |
pp.macros["Q_MOC_RUN"]; |
361 |
pp.macros["__cplusplus"]; |
362 |
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551 |
363 |
QByteArray filename; |
364 |
QByteArray output; |
365 |
FILE *in = 0; |