diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-qt/qtcore | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r-- | dev-qt/qtcore/Manifest | 4 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.14.2.ebuild | 2 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.15.0.ebuild | 100 |
3 files changed, 104 insertions, 2 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 30f23c3905d9..ff2b20534dc5 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -2,6 +2,8 @@ AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b7023272241 AUX qtcore-5.14.2-QLibrary-deadlock.patch 3966 BLAKE2B 79d589005de16dbbe87affa6ce2f9a499fe19f9f6687f85c9ce0d60f95706c22c6261dfab1e414cb6c6ca3f3f8d4ee1f33ad2a01f5ebee8356534d5330629822 SHA512 22d4994cb35869e8eadf158ba8a3f1ec3ca62291c93bfe8f94d6e8a89739bfc4cfc59dfb399be955ba6b00897288224c392d54fcbe24f8246d0f649c2ab22a6a DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 +DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a EBUILD qtcore-5.14.1-r1.ebuild 1711 BLAKE2B 00fa1e8969c3109494a67376892c7331ca0f5a33a806165bc1950f7d66d1a9e094863950427249be89bf0b65a5502c523c0c72c6db3a72080600349e4bd69d7f SHA512 04615c1b40db89986f207cdd61180f84012cbd2d551d0541c7812b5670c0b58a2d0f5337f7ee685ef2dd37ae70db5482fa9a477a7d8f7cd88808fbd989ec7fec -EBUILD qtcore-5.14.2.ebuild 2246 BLAKE2B 4b6eb940437879e5d45305011cc7b7d654dc0e87aa7827f9efacee5e738f350a05421966c3755f979b2e2e85b27398954e1c6df3564094dd71ed1909192aa6c5 SHA512 12ccdff3bd9f6b8f2ecbcc9e3667f426200162c267f34308be28496bbf4c227688c54cbe832552646c08bc9c8bf26e22c1b07e53377a09054f725150ea133819 +EBUILD qtcore-5.14.2.ebuild 2243 BLAKE2B b838e336360de4e4911c8c33e325d35cabffa4800e13b3f7f73c5b669ff6b5304b4ac2dc3269ffeb2b804b54567fbf0c1e446d1411ebe0c8235d186f042b81f7 SHA512 b57c1a0c83ebe8c81ecf989b0d2baa44573d867fd5294569f95f44453165526d7ab6d2e46ad195ece8736c4c31388e6a134c303e61c6921ca2571aea1b332f45 +EBUILD qtcore-5.15.0.ebuild 2212 BLAKE2B 4fc9ec710f5d896f867b88ae7ba170740e856c3564acb396030d9ba297660a9bfaef770620d4dd9b2715c7a2252ad8796672a4bf99abfef7a56cd5e017dada9a SHA512 41d63181195ceb2e211c5179473cd0fedf1287b5713b7741afdf8be5a127b14e5e57057e064b693ff9c35047c4118e5d1b77282a68cb67cb11dc6fe0852d1d7d MISC metadata.xml 662 BLAKE2B daf4dcfc7380ac0a25155b5a04125b4a4038ba7fd84fe8e98a9782a9cd7f886c608a21edc9b81a3af791eb22faa4a1bf1cd63f6a2f60a5b0f19d681b59313403 SHA512 571811795b3cd171751b1571ac9e601d5a0d78e56c6257546965496e94bf6a26eee6ad04972e5d01e4fbc92a248d325912f4e0bdd13e5adf3928892bb93b1d12 diff --git a/dev-qt/qtcore/qtcore-5.14.2.ebuild b/dev-qt/qtcore/qtcore-5.14.2.ebuild index beb1fea7928f..9dce909c9bd7 100644 --- a/dev-qt/qtcore/qtcore-5.14.2.ebuild +++ b/dev-qt/qtcore/qtcore-5.14.2.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Cross-platform application development framework" SLOT=5/$(ver_cut 1-3) 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 old-kernel systemd" diff --git a/dev-qt/qtcore/qtcore-5.15.0.ebuild b/dev-qt/qtcore/qtcore-5.15.0.ebuild new file mode 100644 index 000000000000..449fddfc065d --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +QT5_MODULE="qtbase" +inherit linux-info qt5-build + +DESCRIPTION="Cross-platform application development framework" +SLOT=5/$(ver_cut 1-3) + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +IUSE="icu old-kernel 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} + !<dev-qt/qtcore-4.8.7-r4:4 +" + +QT5_TARGET_SUBDIRS=( + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/corelib + src/tools/qlalr + doc +) + +QT5_GENTOO_PRIVATE_CONFIG=( + !:network + !:sql + !:testlib + !:xml +) + +PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306 + +pkg_pretend() { + use kernel_linux || return + get_running_version + if kernel_is -lt 4 11 && ! use old-kernel; then + ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" + fi +} + +src_prepare() { + # don't add -O3 to CXXFLAGS, bug 549140 + sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die + + # fix missing qt_version_tag symbol w/ LTO, bug 674382 + sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die + + qt5-build_src_prepare +} + +src_configure() { + local myconf=( + $(qt_use icu) + $(qt_use !icu iconv) + $(qt_use systemd journald) + ) + use old-kernel && myconf+=( + -no-feature-renameat2 # needs Linux 3.16, bug 669994 + -no-feature-getentropy # needs Linux 3.17, bug 669994 + -no-feature-statx # needs Linux 4.11, bug 672856 + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + local flags=( + DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG + OPENGL OPENSSL SSL WIDGETS + ) + + for flag in ${flags[@]}; do + cat >> "${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 +} |