Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtcore/Manifest10
-rw-r--r--dev-qt/qtcore/files/CVE-2013-0254.patch66
-rw-r--r--dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch107
-rw-r--r--dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch35
-rw-r--r--dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch15
-rw-r--r--dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch11
-rw-r--r--dev-qt/qtcore/files/qt-ccache.patch34
-rw-r--r--dev-qt/qtcore/files/qt-cxxflags.patch22
-rw-r--r--dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch60
-rw-r--r--dev-qt/qtcore/qtcore-4.8.4-r131.ebuild185
-rw-r--r--dev-qt/qtgui/Manifest5
-rw-r--r--dev-qt/qtgui/files/CVE-2013-0254.patch143
-rw-r--r--dev-qt/qtgui/files/qt-cxxflags.patch22
-rw-r--r--dev-qt/qtgui/files/qtgui-4.7.3-cups.patch84
-rw-r--r--dev-qt/qtgui/qtgui-4.8.4-r131.ebuild234
15 files changed, 0 insertions, 1033 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
deleted file mode 100644
index 92ae0f0..0000000
--- a/dev-qt/qtcore/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX CVE-2013-0254.patch 2694 SHA256 708714e387b607e4c28182420af42f9169c632c909feef6224190053da0c869f SHA512 227ed44a8e90eb63402cd6658bff1244e3684c4f9757aa9c3cf53e60127f6324a978d82f2de25e6a718b88392d51641e9b8010d313a25a0154f871c0dcc94182 WHIRLPOOL 472b5ca7da456ae9e6c62072be6f6c1fb71c13450d8108745a7f14d5f7511e299377a7cd88f6bf5e03b906259a0a6961115e7012e998878ba306d8a67b4fc935
-AUX blacklist-mis-issued-Turktrust-certs.patch 5939 SHA256 abf2632243cd5b82dfcb2f297908c37ee79e42240a5539eb4738713470658bc8 SHA512 5f4d5be5389b3b2423a33cb09ace4514b53fb96ad0d95e2d02dca7673a9a37b879f739e0988b4bd5e90976ca83ad802ce8179da7433e6ffc3f519a151b8aeec3 WHIRLPOOL ab4a4d61654aa159e82f66d6600a932296f5ee5c0778009dd69f899866a4f1bf3d7b6cb858092f75cd00582fcf357e963e4c7cf0a363ba9bab1cb2455b4fd9c5
-AUX fix-call-to-QMetaObject-metaCall-from-updateProperty.patch 1570 SHA256 bca22cbb85b852101ba90bb03a96922f35f8bc158e5781d62dcedea6481d832b SHA512 119c44be4cc2195dd593b5a4c3986b267a12a3e415c057f36ff953c980eaff9df68171440782d5e81803961df062fe25506bef8e564b220caf10ccfb462b6839 WHIRLPOOL 0a1931d941a8bfd62835864b4042019a5d96b44f4da04f911a9f721e30a0304d0aa24ce8205edbe222e0c6b37fb544fcb1c451ad8d6402d70554d1ee04e3fd1a
-AUX moc-workaround-for-BOOST_JOIN.patch 728 SHA256 4e39ec7fe8084c42ee09d14d2fe874f6d408db447a3e078006c6f2d722e8c0b7 SHA512 9530a50fab3ef08c805b7a3b3e85ad2ea86c6c014a2e5702ca00a21e8445477699bc5280edcdce5defbc37fe43f50f7581677281ca9897fcc55ac68eefd3c81f WHIRLPOOL 302dc275378046661353cc69ac93a062d331f7932ca733b0dc1f1770604d54e698ff473477a8e082bac196134e7590573f5bb2ca895d17347dbcd471233b1d28
-AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
-AUX qt-ccache.patch 2126 SHA256 f300bf8c218060111b7b9d3abaf50802eeb0cba11b7a284e7d5f9be9c5e9eaf1 SHA512 34c66ed9810848f7ed5a21a6f106904a9731a9c32efedf9ab6bc0b8226470522c7d111297c6fdb6f6db7b8f52087745cb38ec85c0d2e6dd0f042cba3b0d79d4f WHIRLPOOL 5d358be55fcd6671c5b1793027f17859449e623fe91e39f695fddb6e4766c0a2e2f2354265796c23322dc0334fcdb8b3e03e7eec6ca3c5945999516922e88060
-AUX qt-cxxflags.patch 799 SHA256 c2daf63c38bf018b66e054b44b2d87e459d18e48d66b13d130fa58d9fc8a4f21 SHA512 4080116da656d83f44c69c4f89b7e74855341db9b556d551fdc55941ba384b766ec0d1da75d3b6d6bfc4f77c1c16416dcd8bb46fa39a012c8a24c448fb511ae3 WHIRLPOOL ae0a015bc6168645fcdb26e64b8b9a92d99da24d787d0fde511b310398f2fd2e46913dd06e106860610e9a3fac22e3278e77cea56fb794acbf02a3f6805e048d
-AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51a7bff1e97be70f1bcdc9b6bbbfbea3f7b7de5805e7320c401103cc5 SHA512 0cdc8ff580ee2b291764615dc9f05f0d8078e0baeedc8e5869f843c11db2755a2c2f2c757dca1ffccb8a3dc07cbdb9c46c1a2e9f6791edb4f1e20675c9bbd9d0 WHIRLPOOL 93da7613c1cc5004bee55dbe4decccebf1c10db2be695ddc80bc5407a097b7a18f58ec31d481d76d7f1ca71f4f7a8dbeeea5108aecea06d50f625896e1a742c6
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qtcore-4.8.4-r131.ebuild 5313 SHA256 b0b26db54b9c2a7ffc8fc03207c19918130e2f77a3b128f179a0271c9e294ef7 SHA512 114c5e5b16fc431396f4a92a2f7c0b55f799f95a7798ce57e4483e2bf1e5953a92184c404ca67ce27549cb85104c1381680d8a77133ba3512fb1143511551ead WHIRLPOOL 6656a9aa5e7a52d4393f16a0021896db034fb4f879a40e8d2e35a14d1a591de0b93b85c7cba6ede48dd7ffb51dc0269d32423f2bd64b012456d590af48efedeb
diff --git a/dev-qt/qtcore/files/CVE-2013-0254.patch b/dev-qt/qtcore/files/CVE-2013-0254.patch
deleted file mode 100644
index 48cc05f..0000000
--- a/dev-qt/qtcore/files/CVE-2013-0254.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Sat, 22 Dec 2012 08:32:12 -0800
-Subject: [PATCH] Change all shmget calls to user-only memory
-
-Drop the read and write permissions for group and other users in the
-system.
-
-Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
-(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++---
- src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++--
-
-diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
-index 20d76e3..4cf3acf 100644
---- a/src/corelib/kernel/qsharedmemory_unix.cpp
-+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
-@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size)
- }
-
- // create
-- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) {
-+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) {
- QString function = QLatin1String("QSharedMemory::create");
- switch (errno) {
- case EINVAL:
-@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
- {
- #ifndef QT_POSIX_IPC
- // grab the shared memory segment id
-- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660));
-+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600));
- if (-1 == id) {
- setErrorString(QLatin1String("QSharedMemory::attach (shmget)"));
- return false;
-@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach()
- size = 0;
-
- // Get the number of current attachments
-- int id = shmget(unix_key, 0, 0444);
-+ int id = shmget(unix_key, 0, 0400);
- cleanHandle();
-
- struct shmid_ds shmid_ds;
-diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-index fad9acc..e77456b 100644
---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp
-+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
- }
-
- // Get semaphore
-- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL);
-+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL);
- if (-1 == semaphore) {
- if (errno == EEXIST)
-- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT);
-+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT);
- if (-1 == semaphore) {
- setErrorString(QLatin1String("QSystemSemaphore::handle"));
- cleanHandle();
---
-1.7.1
-
diff --git a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch
deleted file mode 100644
index c2245cc..0000000
--- a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001
-From: Peter Hartmann <phartmann@rim.com>
-Date: Fri, 4 Jan 2013 11:06:14 +0100
-Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust
- certificates
-
-Those certificates have erroneously set the CA attribute to true,
-meaning everybody in possesion of their keys can issue certificates on
-their own.
-
-backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase
-
-Task-number: QTBUG-28937
-Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/network/ssl/qsslcertificate.cpp | 3 +++
- ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++
- .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++++
- 3 files changed, 58 insertions(+)
- create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
- create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
-
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 038187f..37799d1 100644
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = {
-
- "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust
- "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust
-+
-+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate
-+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate
- 0
- };
-
-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
-new file mode 100644
-index 0000000..33f2ef4
---- /dev/null
-+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
-@@ -0,0 +1,24 @@
-+-----BEGIN CERTIFICATE-----
-+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD
-+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl
-+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo
-+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow
-+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr
-+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz
-+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA
-+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5
-+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R
-+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa
-+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r
-+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF
-+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw
-+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K
-+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l
-+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA
-+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8
-+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp
-+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC
-+pWfGWA==
-+-----END CERTIFICATE-----
-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
-new file mode 100644
-index 0000000..e9d048f
---- /dev/null
-+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
-@@ -0,0 +1,31 @@
-+-----BEGIN CERTIFICATE-----
-+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD
-+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl
-+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo
-+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow
-+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB
-+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE
-+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V
-+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF
-+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO
-+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q
-+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N
-+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS
-+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G
-+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF
-+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF
-+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t
-+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd
-+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy
-+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz
-+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy
-+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn
-+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV
-+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj
-+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU
-+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1
-+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I
-+hQ==
-+-----END CERTIFICATE-----
---
-1.8.1
-
diff --git a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch
deleted file mode 100644
index d59ac49..0000000
--- a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 03e96961b0f4fc2c290271c6e50a11aa334a40ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org>
-Date: Sun, 3 Feb 2013 23:07:07 -0500
-Subject: [PATCH] Fix call to QMetaObject::metaCall from updateProperty
-
-Create an array of arguments in the same way
-QMetaObject::write does
-
-Task-number: QTBUG-29082
-Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305
----
- src/corelib/animation/qpropertyanimation.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
-index dcf779a..9869d7e 100644
---- a/src/corelib/animation/qpropertyanimation.cpp
-+++ b/src/corelib/animation/qpropertyanimation.cpp
-@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue)
-
- if (newValue.userType() == propertyType) {
- //no conversion is needed, we directly call the QMetaObject::metacall
-- void *data = const_cast<void*>(newValue.constData());
-- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data);
-+ //check QMetaProperty::write for an explanation of these
-+ int status = -1;
-+ int flags = 0;
-+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags };
-+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv);
- } else {
- targetValue->setProperty(propertyName.constData(), newValue);
- }
---
-1.8.1.2
-
diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
deleted file mode 100644
index fa82334..0000000
--- a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600
-+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600
-@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
- Moc moc;
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
-+
-+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
-+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+
- QByteArray filename;
- QByteArray output;
- FILE *in = 0;
diff --git a/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch b/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch
deleted file mode 100644
index 8d92ca9..0000000
--- a/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
---- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200
-@@ -187,6 +187,7 @@
- Moc moc;
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
-+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551
- QByteArray filename;
- QByteArray output;
- FILE *in = 0;
diff --git a/dev-qt/qtcore/files/qt-ccache.patch b/dev-qt/qtcore/files/qt-ccache.patch
deleted file mode 100644
index 5afee16..0000000
--- a/dev-qt/qtcore/files/qt-ccache.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/tools/moc/moc.cpp.orig 2012-04-26 21:46:08.000000000 +0200
-+++ src/tools/moc/moc.cpp 2012-08-12 12:31:12.411828701 +0200
-@@ -777,8 +777,8 @@
- fn = filename.mid(i);
- fprintf(out, "/****************************************************************************\n"
- "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn);
-- fprintf(out, "** Created: %s\n"
-- "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR);
-+ fprintf(out, "** Created\n"
-+ "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR);
- fprintf(out, "** WARNING! All changes made in this file will be lost!\n"
- "*****************************************************************************/\n\n");
-
---- src/tools/uic/uic.cpp.orig 2012-04-26 21:46:08.000000000 +0200
-+++ src/tools/uic/uic.cpp 2012-08-12 12:35:27.502830993 +0200
-@@ -139,7 +139,7 @@
- out << "/********************************************************************************\n";
- out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
- out << "**\n";
-- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
-+ out << "** Created" << "\n";
- out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
- out << "**\n";
- out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
---- src/tools/rcc/rcc.cpp.orig 2012-04-26 21:46:08.000000000 +0200
-+++ src/tools/rcc/rcc.cpp 2012-08-12 12:38:55.148832886 +0200
-@@ -732,7 +732,6 @@
- writeString("** Resource object code\n");
- writeString("**\n");
- writeString("** Created: ");
-- writeByteArray(QDateTime::currentDateTime().toString().toLatin1());
- writeString("\n** by: The Resource Compiler for Qt version ");
- writeByteArray(QT_VERSION_STR);
- writeString("\n**\n");
diff --git a/dev-qt/qtcore/files/qt-cxxflags.patch b/dev-qt/qtcore/files/qt-cxxflags.patch
deleted file mode 100644
index 2fa0ce6..0000000
--- a/dev-qt/qtcore/files/qt-cxxflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mkspecs/common/gcc-base.conf.orig 2012-04-26 21:45:52.000000000 +0200
-+++ mkspecs/common/gcc-base.conf 2012-07-23 21:14:35.495641264 +0200
-@@ -35,7 +35,7 @@
- QMAKE_CFLAGS_DEPS += -M
- QMAKE_CFLAGS_WARN_ON += -Wall -W
- QMAKE_CFLAGS_WARN_OFF += -w
--QMAKE_CFLAGS_RELEASE += -O2
-+QMAKE_CFLAGS_RELEASE += -O3
- QMAKE_CFLAGS_DEBUG += -g
- QMAKE_CFLAGS_SHLIB += -fPIC
- QMAKE_CFLAGS_STATIC_LIB += -fPIC
---- mkspecs/common/g++-base.conf.orig 2012-04-26 21:45:52.000000000 +0200
-+++ mkspecs/common/g++-base.conf 2012-07-23 21:15:40.937641856 +0200
-@@ -13,7 +13,7 @@
- QMAKE_LINK_C = $$QMAKE_CC
- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
-
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O3 -g
-
- QMAKE_CXX = g++
-
diff --git a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch
deleted file mode 100644
index 46b9c28..0000000
--- a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 87fa0250081cffb6e413fec7957f5ac4add6cdd1 Mon Sep 17 00:00:00 2001
-From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-Date: Tue, 8 Jan 2013 16:34:26 +0100
-Subject: [PATCH] set pkg-config *_location directly to install dir
-
-qmake tries to replace all occurrences of the install prefix with a
-literal ${prefix}. of course this would mess up build paths which happen
-to live under the prefix (this is untypical, but still), which would
-break the sed magic in the subsequent install step. as qmake itself has
-no use for the .pc files, it's ok to target them directly for the
-install dir. we do the same with the include and lib dirs already.
-
-qt5 is already doing the right thing.
-
-Task-number: QTBUG-28807
-Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5
-Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
-diff --git a/src/qbase.pri b/src/qbase.pri
-index 991c888..feec9d6 100644
---- a/src/qbase.pri
-+++ b/src/qbase.pri
-@@ -166,23 +166,25 @@ DEFINES *= QT_USE_QSTRINGBUILDER
-
- TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
-
--qtPrepareTool(QMAKE_LUPDATE, lupdate)
--qtPrepareTool(QMAKE_LRELEASE, lrelease)
--
-+QMAKE_MOC_PC = $$[QT_INSTALL_BINS]/moc
- moc_dir.name = moc_location
--moc_dir.variable = QMAKE_MOC
-+moc_dir.variable = QMAKE_MOC_PC
-
-+QMAKE_UIC_PC = $$[QT_INSTALL_BINS]/uic
- uic_dir.name = uic_location
--uic_dir.variable = QMAKE_UIC
-+uic_dir.variable = QMAKE_UIC_PC
-
-+QMAKE_RCC_PC = $$[QT_INSTALL_BINS]/rcc
- rcc_dir.name = rcc_location
--rcc_dir.variable = QMAKE_RCC
-+rcc_dir.variable = QMAKE_RCC_PC
-
-+QMAKE_LUPDATE_PC = $$[QT_INSTALL_BINS]/lupdate
- lupdate_dir.name = lupdate_location
--lupdate_dir.variable = QMAKE_LUPDATE
-+lupdate_dir.variable = QMAKE_LUPDATE_PC
-
-+QMAKE_LRELEASE_PC = $$[QT_INSTALL_BINS]/lrelease
- lrelease_dir.name = lrelease_location
--lrelease_dir.variable = QMAKE_LRELEASE
-+lrelease_dir.variable = QMAKE_LRELEASE_PC
-
- QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir
-
---
-1.8.1.1
-
diff --git a/dev-qt/qtcore/qtcore-4.8.4-r131.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r131.ebuild
deleted file mode 100644
index 39c8174..0000000
--- a/dev-qt/qtcore/qtcore-4.8.4-r131.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild,v 1.2 2013/03/03 03:31:54 pesa Exp $
-
-EAPI=5
-
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+glib iconv icu qt3support ssl"
-
-DEPEND="
- sys-libs/zlib
- glib? ( dev-libs/glib:2 )
- icu? ( >=dev-libs/icu-49:= )
- ssl? ( dev-libs/openssl )
- !<x11-libs/cairo-1.10.2-r2
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
- qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
-"
-
-PATCHES=(
- "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
- "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch"
- "${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch"
- "${FILESDIR}/CVE-2013-0254.patch"
- "${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch"
- "${FILESDIR}/qt-ccache.patch"
- "${FILESDIR}/qt-cxxflags.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtDeclarative
- include/QtGui
- include/QtNetwork
- include/QtScript
- include/QtXml
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1
- src/3rdparty/easing
- src/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
- qt4-build_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-
- # bug 427782
- sed -i -e "/^CPPFLAGS/s/-g//" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
- "${S}/configure" || die "sed configure setBootstrapVariable failed"
-}
-
-src_configure() {
- myconf+="
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- $(qt_use glib)
- $(qt_use iconv)
- $(qt_use icu)
- $(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs
-
- # install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
-
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" \
- "${S}"/bin/lrelease translations/*.ts \
- || die "generating translations failed"
- insinto "${QTTRANSDIR#${EPREFIX}}"
- doins translations/*.qm
-
- setqtenv
- fix_library_files
-
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
- done
-
- cat <<-EOF > "${T}"/44qt4
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}"/44qt4
-
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
- mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "failed to move qconfig.pri"
-
- # Framework hacking
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
- # TODO: do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
- else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die "sed for qconfig.h failed"
- fi
-
- QCONFIG_DEFINE="QT_ZLIB"
- install_qconfigs
-
- # remove .la files
- prune_libtool_files
-
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
- fix_includes
-}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
deleted file mode 100644
index 206d2b2..0000000
--- a/dev-qt/qtgui/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8ebff904f241cf9096df3e SHA512 957d1f3e5ca9a8585e0e5c806cd0ea731e97a3b05cf60e84aef44912cbd9b8db80961f336f91734f9759d14d4e0de39a73becb45f58ca8af831c1780e5368739 WHIRLPOOL 633cba444159eb134ec2df8a4b4fbb145aea28012b75353c9684f3d47b1c50736ea7c5adbd4fa1fbb0bf285a1e517b122bb6b5edac1313f6578465c8381d60d9
-AUX qt-cxxflags.patch 799 SHA256 c2daf63c38bf018b66e054b44b2d87e459d18e48d66b13d130fa58d9fc8a4f21 SHA512 4080116da656d83f44c69c4f89b7e74855341db9b556d551fdc55941ba384b766ec0d1da75d3b6d6bfc4f77c1c16416dcd8bb46fa39a012c8a24c448fb511ae3 WHIRLPOOL ae0a015bc6168645fcdb26e64b8b9a92d99da24d787d0fde511b310398f2fd2e46913dd06e106860610e9a3fac22e3278e77cea56fb794acbf02a3f6805e048d
-AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qtgui-4.8.4-r131.ebuild 7241 SHA256 0708e4735b10905fe4b9beee7913568fedc2a35c7181ed7d2af704928e9cb27b SHA512 d6812687110188e2cb58174e03443dcec4952258bee106cb54bf9c951a833753844876e9240c8f550926dd3ecd8371d96b976acc069361cca2d332e8acc4ea50 WHIRLPOOL 2a8595c3bbab88c9cecb59cd8832f9a15d7f9a5d98fd2c85180d1411d56dbf4eb24696f11b564a3b111f61e9a04f71b6e3d187d329a18ca1e9618a5532d5b3ac
diff --git a/dev-qt/qtgui/files/CVE-2013-0254.patch b/dev-qt/qtgui/files/CVE-2013-0254.patch
deleted file mode 100644
index fa05da3..0000000
--- a/dev-qt/qtgui/files/CVE-2013-0254.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Sat, 22 Dec 2012 08:32:12 -0800
-Subject: [PATCH] Change all shmget calls to user-only memory
-
-Drop the read and write permissions for group and other users in the
-system.
-
-Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
-(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++---
- src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++--
- src/gui/image/qnativeimage.cpp | 2 +-
- src/gui/image/qpixmap_x11.cpp | 2 +-
- src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +-
- src/plugins/platforms/xlib/qxlibwindowsurface.cpp | 2 +-
- tools/qvfb/qvfbshmem.cpp | 4 ++--
-
-diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
-index 20d76e3..4cf3acf 100644
---- a/src/corelib/kernel/qsharedmemory_unix.cpp
-+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
-@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size)
- }
-
- // create
-- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) {
-+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) {
- QString function = QLatin1String("QSharedMemory::create");
- switch (errno) {
- case EINVAL:
-@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
- {
- #ifndef QT_POSIX_IPC
- // grab the shared memory segment id
-- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660));
-+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600));
- if (-1 == id) {
- setErrorString(QLatin1String("QSharedMemory::attach (shmget)"));
- return false;
-@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach()
- size = 0;
-
- // Get the number of current attachments
-- int id = shmget(unix_key, 0, 0444);
-+ int id = shmget(unix_key, 0, 0400);
- cleanHandle();
-
- struct shmid_ds shmid_ds;
-diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-index fad9acc..e77456b 100644
---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp
-+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
- }
-
- // Get semaphore
-- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL);
-+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL);
- if (-1 == semaphore) {
- if (errno == EEXIST)
-- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT);
-+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT);
- if (-1 == semaphore) {
- setErrorString(QLatin1String("QSystemSemaphore::handle"));
- cleanHandle();
-diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
-index 9654afe..fef38c5 100644
---- a/src/gui/image/qnativeimage.cpp
-+++ b/src/gui/image/qnativeimage.cpp
-@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
-
- bool ok;
- xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height,
-- IPC_CREAT | 0777);
-+ IPC_CREAT | 0700);
- ok = xshminfo.shmid != -1;
- if (ok) {
- xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
-diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
-index 280d8bd..88c9b7b 100644
---- a/src/gui/image/qpixmap_x11.cpp
-+++ b/src/gui/image/qpixmap_x11.cpp
-@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h)
- bool ok;
- xshminfo.shmid = shmget(IPC_PRIVATE,
- xshmimg->bytes_per_line * xshmimg->height,
-- IPC_CREAT | 0777);
-+ IPC_CREAT | 0700);
- ok = xshminfo.shmid != -1;
- if (ok) {
- xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
-diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-index b6a42d8..0d56821 100644
---- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI
- 0);
-
- m_shm_info.shmid = shmget (IPC_PRIVATE,
-- m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777);
-+ m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600);
-
- m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0);
- m_shm_info.shmseg = xcb_generate_id(xcb_connection());
-diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-index bf003eb..46a2f97 100644
---- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height)
-
-
- image_info->shminfo.shmid = shmget (IPC_PRIVATE,
-- image->bytes_per_line * image->height, IPC_CREAT|0777);
-+ image->bytes_per_line * image->height, IPC_CREAT|0700);
-
- image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0);
- image_info->shminfo.readOnly = False;
-diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp
-index 7f9671f..84b6ebe 100644
---- a/tools/qvfb/qvfbshmem.cpp
-+++ b/tools/qvfb/qvfbshmem.cpp
-@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s,
- uint data_offset_value = sizeof(QVFbHeader);
-
- int dataSize = bpl * h + data_offset_value;
-- shmId = shmget(key, dataSize, IPC_CREAT | 0666);
-+ shmId = shmget(key, dataSize, IPC_CREAT | 0600);
- if (shmId != -1)
- data = (unsigned char *)shmat(shmId, 0, 0);
- else {
- struct shmid_ds shm;
- shmctl(shmId, IPC_RMID, &shm);
-- shmId = shmget(key, dataSize, IPC_CREAT | 0666);
-+ shmId = shmget(key, dataSize, IPC_CREAT | 0600);
- if (shmId == -1) {
- perror("QShMemViewProtocol::QShMemViewProtocol");
- qFatal("Cannot get shared memory 0x%08x", key);
---
-1.7.1
-
diff --git a/dev-qt/qtgui/files/qt-cxxflags.patch b/dev-qt/qtgui/files/qt-cxxflags.patch
deleted file mode 100644
index 2fa0ce6..0000000
--- a/dev-qt/qtgui/files/qt-cxxflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mkspecs/common/gcc-base.conf.orig 2012-04-26 21:45:52.000000000 +0200
-+++ mkspecs/common/gcc-base.conf 2012-07-23 21:14:35.495641264 +0200
-@@ -35,7 +35,7 @@
- QMAKE_CFLAGS_DEPS += -M
- QMAKE_CFLAGS_WARN_ON += -Wall -W
- QMAKE_CFLAGS_WARN_OFF += -w
--QMAKE_CFLAGS_RELEASE += -O2
-+QMAKE_CFLAGS_RELEASE += -O3
- QMAKE_CFLAGS_DEBUG += -g
- QMAKE_CFLAGS_SHLIB += -fPIC
- QMAKE_CFLAGS_STATIC_LIB += -fPIC
---- mkspecs/common/g++-base.conf.orig 2012-04-26 21:45:52.000000000 +0200
-+++ mkspecs/common/g++-base.conf 2012-07-23 21:15:40.937641856 +0200
-@@ -13,7 +13,7 @@
- QMAKE_LINK_C = $$QMAKE_CC
- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
-
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O3 -g
-
- QMAKE_CXX = g++
-
diff --git a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
deleted file mode 100644
index e0305e1..0000000
--- a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
- options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+ if (cups) {
-+ const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+ if (duplex) {
-+ // copy default ppd duplex to qt dialog
-+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+ options.duplexShort->setChecked(true);
-+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+ options.duplexLong->setChecked(true);
-+ else
-+ options.noDuplex->setChecked(true);
-+ }
-+
-+ if (cups->currentPPD()) {
-+ // set default color
-+ if (cups->currentPPD()->color_device)
-+ options.color->setChecked(true);
-+ else
-+ options.grayscale->setChecked(true);
-+ }
-+
-+ // set collation
-+ const ppd_option_t *collate = cups->ppdOption("Collate");
-+ if (collate)
-+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+ }
- }
- #endif
-
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
- && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
- setOutputFormat(QPrinter::PdfFormat);
- }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+ // fill in defaults from ppd file
-+ QCUPSSupport cups;
-+
-+ int printernum = -1;
-+ for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+ printernum = i;
-+ }
-+ if (printernum >= 0) {
-+ cups.setCurrentPrinter(printernum);
-+
-+ const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+ if (duplex) {
-+ // copy default ppd duplex to qt dialog
-+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+ setDuplex(DuplexShortSide);
-+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+ setDuplex(DuplexLongSide);
-+ else
-+ setDuplex(DuplexNone);
-+ }
-+
-+ if (cups.currentPPD()) {
-+ // set default color
-+ if (cups.currentPPD()->color_device)
-+ setColorMode(Color);
-+ else
-+ setColorMode(GrayScale);
-+ }
-+
-+ // set collation
-+ const ppd_option_t *collate = cups.ppdOption("Collate");
-+ if (collate)
-+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+ }
-+#endif
- }
-
- /*!
diff --git a/dev-qt/qtgui/qtgui-4.8.4-r131.ebuild b/dev-qt/qtgui/qtgui-4.8.4-r131.ebuild
deleted file mode 100644
index 370bb92..0000000
--- a/dev-qt/qtgui/qtgui-4.8.4-r131.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild,v 1.1 2013/03/02 15:27:36 yngwin Exp $
-
-EAPI=4
-
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
- gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
- app-admin/eselect-qtgraphicssystem
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sys-libs/zlib
- virtual/jpeg
- ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
- cups? ( net-print/cups )
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
- egl? ( media-libs/mesa[egl] )
- gtkstyle? (
- x11-libs/cairo[-qt4]
- x11-libs/gtk+:2[aqua=]
- )
- mng? ( >=media-libs/libmng-1.0.9 )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
- !aqua? (
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
- xv? ( x11-proto/videoproto )
- )
-"
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.7.3-cups.patch"
- "${FILESDIR}/CVE-2013-0254.patch"
- "${FILESDIR}/qt-cxxflags.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
-
- # mac version does not contain qtconfig?
- [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Add -xvideo to the list of accepted configure options
- sed -i -e 's:|-xinerama|:&-xvideo|:' configure
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(use gif || echo -no-gif)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nas nas-sound system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use dbus)
- $(qt_use egl)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)
- $(qt_use xv xvideo)"
-
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
-
- qt4-build_src_configure
-
- if use gtkstyle; then
- einfo "patching the Makefile to fix qgtkstyle compilation"
- sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
- die "sed failed"
- fi
- sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed"
-}
-
-src_install() {
- QCONFIG_ADD="
- mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
- fontconfig gif png system-png jpeg system-jpeg
- $(usev accessibility)
- $(usev cups)
- $(use mng && echo system-mng)
- $(usev nas)
- $(usev nis)
- $(use tiff && echo system-tiff)
- $(usev xinerama)
- $(use xv && echo xvideo)"
- QCONFIG_REMOVE="no-gif no-jpeg no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS)
- $(use egl && echo QT_EGL)
- QT_FONTCONFIG
- $(use gtkstyle && echo QT_STYLE_GTK)
- QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS)
- $(use tiff && echo QT_IMAGEFORMAT_TIFF)
- QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
- $(use xinerama && echo QT_XINERAMA)
- QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
- $(use xv && echo QT_XVIDEO)"
-
- qt4-build_src_install
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
- fi
- doins "${S}"/tools/designer/src/lib/shared/*
- doins "${S}"/tools/designer/src/lib/sdk/*
-
- # install private headers
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
- fi
- find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
-
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- # rerun to get links to headers right
- fix_includes
- fi
-
- # touch the available graphics systems
- dodir /usr/share/qt4/graphicssystems
- echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
- touch "${ED}"/usr/share/qt4/graphicssystems/native || die
-
- doicon tools/designer/src/designer/images/designer.png
- newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
- newicon tools/qtconfig/images/appicon.png qtconfig.png
- use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
- make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
- make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
- make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-}
-
-pkg_postinst() {
- qt4-build_pkg_postinst
-
- # raster is the default graphicssystem, set it on first install
- eselect qtgraphicssystem set raster --use-old
-
- if use gtkstyle; then
- # see bug 388551
- elog "For Qt's GTK style to work, you need to either export"
- elog "the following variable into your environment:"
- elog ' GTK2_RC_FILES="$HOME/.gtkrc-2.0"'
- elog "or alternatively install gnome-base/libgnomeui"
- fi
-}