From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- dev-qt/qtcore/Manifest | 15 ++-- .../files/qtcore-5.12.3-CVE-2019-18281.patch | 98 ++++++++++++++++++++++ .../qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch | 28 +++++++ .../qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch | 54 ++++++++++++ dev-qt/qtcore/qtcore-5.12.3-r1.ebuild | 86 +++++++++++++++++++ dev-qt/qtcore/qtcore-5.12.3-r2.ebuild | 90 ++++++++++++++++++++ dev-qt/qtcore/qtcore-5.12.3.ebuild | 84 ------------------- dev-qt/qtcore/qtcore-5.12.5-r1.ebuild | 84 ------------------- dev-qt/qtcore/qtcore-5.13.2-r1.ebuild | 2 +- dev-qt/qtcore/qtcore-5.13.2-r2.ebuild | 89 ++++++++++++++++++++ dev-qt/qtcore/qtcore-5.14.0.ebuild | 83 ------------------ dev-qt/qtcore/qtcore-5.14.1.ebuild | 83 ++++++++++++++++++ 12 files changed, 538 insertions(+), 258 deletions(-) create mode 100644 dev-qt/qtcore/files/qtcore-5.12.3-CVE-2019-18281.patch create mode 100644 dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch create mode 100644 dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch create mode 100644 dev-qt/qtcore/qtcore-5.12.3-r1.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.12.3-r2.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.12.3.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.12.5-r1.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.13.2-r2.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.14.0.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.14.1.ebuild (limited to 'dev-qt/qtcore') diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 4954030cc2b8..4168be0accad 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,9 +1,12 @@ +AUX qtcore-5.12.3-CVE-2019-18281.patch 4122 BLAKE2B 057663881e9427edc80a9fbfc97e0f026dff0722e23452d06f16f0ab9ad69af7470ea10dbbd4d076f248edab435a60a0fcc8282a38f963e316b3b262b5029628 SHA512 60b72443dab594e24167abf2dae6f46eb171a7cfbb0e114386ebdbbd8d14b935f33fe6bc086c50f4c8f94e942f88c4bb06dee6656644c619ea5fd23898303944 +AUX qtcore-5.12.3-CVE-2020-0569.patch 1103 BLAKE2B e19236089dde2c6e15ef3f4c53e8cbcf8e68b09d0f61570adbb5e62a449c647e1d51c185735d2086ca336513d51eaf43d3c414eebaf9849cbe9ca3bba33a675c SHA512 721a16079acba96e784713b092543dc187b1c041889da745228b625ae727b602279ff882054929320cabc4228f47233e50fd63fcc75f543d8266f8fb0a043809 +AUX qtcore-5.12.3-CVE-2020-0570.patch 2539 BLAKE2B 87282e51d64cf94cbc33eea6da901bef2135f0b25237dccb72c5f5f107f3270e5286fba15ba413d4e04d3cfa109934c97fea32f8295b727d38f047ffc85b28c7 SHA512 ed05b2efffc96dbd263dfb2714f45190b7bb61a17ff7395ec3d136c6fae2b460eb40a751df615d15394a7b22a989b3163cd1441b164554613aaac4de90cb873b DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 -DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 -DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6 -EBUILD qtcore-5.12.3.ebuild 1660 BLAKE2B 2636bd6d58bbd6b3e218b39b237b7925e1eba1f5c8964cf36c83ca90b181b98fbe78611e86d7dc593d37b5da7182e44029441e86a4a7edc23af3f974f68539f3 SHA512 790d2237fc246bed49806736c644e5a9133dc73d6362c2404ffd573eee8bdc86689b0f3bb66a8fc90b5b41a058363de5cd80498043d4d3e6f6d8b3a142276f66 -EBUILD qtcore-5.12.5-r1.ebuild 1661 BLAKE2B d9d21273719298b9d8e65e91fc154dc2fe242b911ba653d56ef238d0d78d854b36a2f06fe6e68c0c4bb46fcab55282d49797d8b8b08906dc9271c401394f355f SHA512 ae28792e4a07593043abddd66463753a153978ea14adef891daa259aabfab61f235bf2c4691cf9905652272bf6d0ef6001b9235f5ce26b6c8cc04fc4793e0272 -EBUILD qtcore-5.13.2-r1.ebuild 1660 BLAKE2B 2cdb8039ce075e7f807ca72ca2f1062753ed4ce2c409b5a008d57231b9d2117cfee882ad72fbdb1c52cd9a293967937d4a80e4c19c505dbd34575ca7a5c4ba67 SHA512 27b027ff8180afd303af22e3c8ae47b1b04eec7a610b0c461a93557b1c12d14398a7ecbc0b60af41c030de95a29935d78b8a19db0b7568dbc464c3e337e8e7d0 -EBUILD qtcore-5.14.0.ebuild 1637 BLAKE2B 919663b48008e74822bef5ef4dc0793ccf4a76c700c5cdb7c9488113e71bea6fa91c2f4baac4b64dfeb309d3d37e39b981f640b2f76d6b8d73ce9d14655205fe SHA512 88cd0489adf2eeb2e3ef687d2279db0189daa9382032db43b352fd27e6456037f0c9afb719df3730a8910028ac9f0711061a0cd1b576fe1ce67be520b5b86cb9 +DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b +EBUILD qtcore-5.12.3-r1.ebuild 1678 BLAKE2B 375ac9b155170c9242ace84099345be98776adca28892ded36063fef64ae6f82872f680555dd041d476b6adc526a16b3173f024d83c4e312321d0035f20e984d SHA512 c899510233208b1b8b5b0b3c642688afb13635286e828849d325727c16a39de7acb4c4320a296c157262f081db348c5e9f7e603db0699bf58afd532d610775ec +EBUILD qtcore-5.12.3-r2.ebuild 1761 BLAKE2B 75e97cad0b984ab2f5298f76ff4b7a6fed6867a26537db5cda078d5274a825549a29088beab4369532e528a2f6c7922829e797cd1fb311e844e429439f5d75d8 SHA512 b6cf9c5b7bb5588734f9ab0dae25359d83186a8de980d5281cc39534e930368780d0e329a867b7ae5c8d6ba284b87778d5ca70efe86c4eb7fcb4bf43ac9302f1 +EBUILD qtcore-5.13.2-r1.ebuild 1659 BLAKE2B 48c8eaa36be4c1084d12b501e9e50397097eae45c62475a69d103686bb787f114e393135ecfcaa9a7475fe91412edd40bd84f6ed6312233e9a5cdde1f401f6f7 SHA512 59360b4a7671d52b0448e06db5a8935643626b5e03bfcae25f8071fa533feedc03ced5a7912f3a7b17616d51c2d5a53d4461c291ce6953b4d6f88453dee38a77 +EBUILD qtcore-5.13.2-r2.ebuild 1771 BLAKE2B 4f969411c17dc25e0a81114354d626827df01fc5100c9e56ce4a8721c04e8c93c2de88f1f8affce20b06772d13bd07a70cd38a1cd25c3bce0c0a04262302973f SHA512 6fadf34d160ebc55bd0a6cbdfa4aa7e174e86216a1a014f138859db088766aea78c955c9505ab5352d1df8f1065b216a41db2b2df3c04431cae6a32b7a459c26 +EBUILD qtcore-5.14.1.ebuild 1637 BLAKE2B 0869d9c3dd593453eff5b758664bc736233300df9cd5a161126516bb32100eb36f299a975f2ed49174daea89097971cf942e5a4bf6d7c7723d52209c749536e5 SHA512 e9f88439742e969a6b0505c39960711b1cb01a44239098a48a7b358d8a99ba787aa5e79987d8cc3f092559582155057cb5e7dffe63c9d1803f91208b81fc20ea MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666 diff --git a/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2019-18281.patch b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2019-18281.patch new file mode 100644 index 000000000000..055794b51964 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2019-18281.patch @@ -0,0 +1,98 @@ +From 1232205e32464d90e871f39eb1e14fcf9b78a163 Mon Sep 17 00:00:00 2001 +From: Rainer Keller +Date: Tue, 27 Aug 2019 14:44:48 +0200 +Subject: [PATCH] Fix crash when text contains too many directional chars + +In case a text to be layouted contains more than 128 directional characters +it causes the application to crash + +The function initScriptAnalysisAndIsolatePairs() collects information of +RTL/LTR chaaracters into vector "isolatePairs". The size of the vector is +capped to 128. Later the function generateDirectionalRuns() iterates +the text again and tries to access items from the previously capped vector +above the upper bound. + +Task-number: QTBUG-77819 +Change-Id: Ibb7bf12c12b1db22f43ff46236518da3fdeed26a +Reviewed-by: Simon Hausmann +--- + src/gui/text/qtextengine.cpp | 15 +++++++-------- + tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 17 +++++++++++++++++ + 2 files changed, 24 insertions(+), 8 deletions(-) + +diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp +index 2da13289bfd..a7834587b1e 100644 +--- a/src/gui/text/qtextengine.cpp ++++ b/src/gui/text/qtextengine.cpp +@@ -399,6 +399,7 @@ struct QBidiAlgorithm { + analysis[i].bidiDirection = (level & 1) ? QChar::DirR : QChar::DirL; + runHasContent = true; + lastRunWithContent = -1; ++ ++isolatePairPosition; + } + int runBeforeIsolate = runs.size(); + ushort newLevel = isRtl ? ((stack.top().level + 1) | 1) : ((stack.top().level + 2) & ~1); +@@ -440,21 +441,19 @@ struct QBidiAlgorithm { + doEmbed(true, true, false); + break; + case QChar::DirLRI: +- Q_ASSERT(isolatePairs.at(isolatePairPosition).start == i); + doEmbed(false, false, true); +- ++isolatePairPosition; + break; + case QChar::DirRLI: +- Q_ASSERT(isolatePairs.at(isolatePairPosition).start == i); + doEmbed(true, false, true); +- ++isolatePairPosition; + break; + case QChar::DirFSI: { +- const auto &pair = isolatePairs.at(isolatePairPosition); +- Q_ASSERT(pair.start == i); +- bool isRtl = QStringView(text + pair.start + 1, pair.end - pair.start - 1).isRightToLeft(); ++ bool isRtl = false; ++ if (isolatePairPosition < isolatePairs.size()) { ++ const auto &pair = isolatePairs.at(isolatePairPosition); ++ Q_ASSERT(pair.start == i); ++ isRtl = QStringView(text + pair.start + 1, pair.end - pair.start - 1).isRightToLeft(); ++ } + doEmbed(isRtl, false, true); +- ++isolatePairPosition; + break; + } + +diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +index 9c477589f93..f0a32c2ed40 100644 +--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp ++++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +@@ -138,6 +138,7 @@ private slots: + void noModificationOfInputString(); + void superscriptCrash_qtbug53911(); + void showLineAndParagraphSeparatorsCrash(); ++ void tooManyDirectionalCharctersCrash_qtbug77819(); + + private: + QFont testFont; +@@ -2309,5 +2310,21 @@ void tst_QTextLayout::nbspWithFormat() + QCOMPARE(layout.lineAt(1).textLength(), s2.length() + 1 + s3.length()); + } + ++void tst_QTextLayout::tooManyDirectionalCharctersCrash_qtbug77819() ++{ ++ QString data; ++ data += QString::fromUtf8("\xe2\x81\xa8"); // U+2068 FSI character ++ data += QString::fromUtf8("\xe2\x81\xa7"); // U+2067 RLI character ++ ++ // duplicating the text ++ for (int i = 0; i < 10; i++) ++ data += data; ++ ++ // Nothing to test. It must not crash in beginLayout(). ++ QTextLayout tl(data); ++ tl.beginLayout(); ++ tl.endLayout(); ++} ++ + QTEST_MAIN(tst_QTextLayout) + #include "tst_qtextlayout.moc" +-- +2.16.3 diff --git a/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch new file mode 100644 index 000000000000..b0e5b564e2d8 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch @@ -0,0 +1,28 @@ +From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001 +From: Olivier Goffart +Date: Fri, 8 Nov 2019 11:30:40 +0100 +Subject: Do not load plugin from the $PWD + +I see no reason why this would make sense to look for plugins in the current +directory. And when there are plugins there, it may actually be wrong + +Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 +Reviewed-by: Thiago Macieira +--- + src/corelib/plugin/qpluginloader.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp +index cadff4f32b..c2443dbdda 100644 +--- a/src/corelib/plugin/qpluginloader.cpp ++++ b/src/corelib/plugin/qpluginloader.cpp +@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName) + paths.append(fileName.left(slash)); // don't include the '/' + } else { + paths = QCoreApplication::libraryPaths(); +- paths.prepend(QStringLiteral(".")); // search in current dir first + } + + for (const QString &path : qAsConst(paths)) { +-- +cgit v1.2.1 diff --git a/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch new file mode 100644 index 000000000000..1f6b2dfafecc --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch @@ -0,0 +1,54 @@ +From e6f1fde24f77f63fb16b2df239f82a89d2bf05dd Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Fri, 10 Jan 2020 09:26:27 -0800 +Subject: QLibrary/Unix: do not attempt to load a library relative to $PWD + +I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to +find libraries in a haswell/ subdir of the main path, but we only need +to do that transformation if the library is contains at least one +directory seprator. That is, if the user asks to load "lib/foo", then we +should try "lib/haswell/foo" (often, the path prefix will be absolute). + +When the library name the user requested has no directory separators, we +let dlopen() do the transformation for us. Testing on Linux confirms +glibc does so: + +$ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor + 1972475: find library=libXcursor.so.1 [0]; searching + 1972475: trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1 + 1972475: trying file=/usr/lib64/haswell/libXcursor.so.1 + 1972475: trying file=/usr/lib64/libXcursor.so.1 + 1972475: calling init: /usr/lib64/libXcursor.so.1 + 1972475: calling fini: /usr/lib64/libXcursor.so.1 [0] + +Fixes: QTBUG-81272 +Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb +Reviewed-by: Thiago Macieira +--- + src/corelib/plugin/qlibrary_unix.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp +index f0de1010d7..135b82cd37 100644 +--- a/src/corelib/plugin/qlibrary_unix.cpp ++++ b/src/corelib/plugin/qlibrary_unix.cpp +@@ -1,7 +1,7 @@ + /**************************************************************************** + ** + ** Copyright (C) 2016 The Qt Company Ltd. +-** Copyright (C) 2018 Intel Corporation ++** Copyright (C) 2020 Intel Corporation + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtCore module of the Qt Toolkit. +@@ -218,6 +218,8 @@ bool QLibraryPrivate::load_sys() + for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) { + if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix))) + continue; ++ if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/'))) ++ continue; + if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix))) + continue; + if (loadHints & QLibrary::LoadArchiveMemberHint) { +-- +cgit v1.2.1 diff --git a/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild new file mode 100644 index 000000000000..8fa01e2779f6 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="arm x86" +fi + +IUSE="icu systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild new file mode 100644 index 000000000000..a4e53c829627 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~arm ~x86" +fi + +IUSE="icu systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.12.3.ebuild b/dev-qt/qtcore/qtcore-5.12.3.ebuild deleted file mode 100644 index 1e82ae5ef2e8..000000000000 --- a/dev-qt/qtcore/qtcore-5.12.3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="icu systemd" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND} - !> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} diff --git a/dev-qt/qtcore/qtcore-5.12.5-r1.ebuild b/dev-qt/qtcore/qtcore-5.12.5-r1.ebuild deleted file mode 100644 index 23e235ffcda9..000000000000 --- a/dev-qt/qtcore/qtcore-5.12.5-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86" -fi - -IUSE="icu systemd" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND} - !> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} diff --git a/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild b/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild index e2a2eab67b0a..72100dc64690 100644 --- a/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild +++ b/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Cross-platform application development framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86" fi IUSE="icu systemd" diff --git a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild new file mode 100644 index 000000000000..b2930ae17ffe --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86" +fi + +IUSE="icu systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.14.0.ebuild b/dev-qt/qtcore/qtcore-5.14.0.ebuild deleted file mode 100644 index e6a7a12469ca..000000000000 --- a/dev-qt/qtcore/qtcore-5.14.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -fi - -IUSE="icu systemd" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND} - !> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} diff --git a/dev-qt/qtcore/qtcore-5.14.1.ebuild b/dev-qt/qtcore/qtcore-5.14.1.ebuild new file mode 100644 index 000000000000..63378ff04bcb --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.14.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +IUSE="icu systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} -- cgit v1.2.3