diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
commit | f78108598211053d41752a83e0345441bb9014ae (patch) | |
tree | dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /dev-qt/qtcore | |
parent | dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff) |
gentoo resync : 11.02.2018
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r-- | dev-qt/qtcore/Manifest | 5 | ||||
-rw-r--r-- | dev-qt/qtcore/files/qtcore-5.9.3-avx.patch | 69 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.9.3.ebuild | 68 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.9.4-r1.ebuild (renamed from dev-qt/qtcore/qtcore-5.9.4.ebuild) | 4 |
4 files changed, 3 insertions, 143 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 2e29b8680993..c5034524dc88 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -6,13 +6,10 @@ AUX qtcore-5.6.2-plugins.patch 3264 BLAKE2B 232cbd215d8c93475c08f614c74ce0227d23 AUX qtcore-5.7.1-qipm.patch 5915 BLAKE2B 7b1c6550d39f55b91462e8139e8a0d662b28b6fe2648a860fc8c72d4b0cbbdfd117ceb8c15c63a87a46958a316692a6127afbaf95314b257c15d09a1310df21f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d AUX qtcore-5.7.1-qsfpm-1.patch 8922 BLAKE2B 8f5003cbd4bce102219856c310eb79a84752c2405a155eab33e6988958e5c79f69f04fbcda481c54eb19283f90f3a7873fd3d1a816ad73e7f2d0bdfe2a3115f4 SHA512 3854fffa1181cebe4683c54d5e774301a8710bf784dcc18367d04d193a7ce76fc6f634096b6986af41c3f5e4432b702873181a8900fd18e7617ea472d23d6d92 AUX qtcore-5.7.1-qsfpm-2.patch 7812 BLAKE2B d2cafac754d28cb7a13a15cf75dcb323a5de84400ce1b586ddd7c129c4b32db133f5828c4407144d3d10d3a01bb885819339836792639103be25e59408a88e13 SHA512 38b141aa7d30011d71ed9044c69f79b56698320600a64ed3cc37e8dd9d22bb9ec2f33f8348d074552a5046c2855e948e325d5421384cb4c66c0bbd566500174d -AUX qtcore-5.9.3-avx.patch 2740 BLAKE2B 9af6d58583e9bb49217b76e54c139b7c13dd7ddfbab2a7c88bbcc46b5ade4a52fb1790722476d68a785aa4d7a24707049d14be86e056900599b40e30489f7b11 SHA512 44ee123b4634c1b613cf5fef82f01ae35fb8b55679355e10032f52d55d72529d00283c94514515d311590cf09cd33a59335d2d35d4e821e3deaacf3390a58eb4 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f -DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd EBUILD qtcore-4.8.7-r3.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875 EBUILD qtcore-5.7.1-r3.ebuild 896 BLAKE2B 5d6c21f0a1de4db39fb89d34c2112fbb4f88130f884d5dc2b9bb8b4d4ceec7d265c68a210689b3ca7ac48c726954846e6512bacc0e4707fa51cdd7a3a8c12791 SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158 -EBUILD qtcore-5.9.3.ebuild 1431 BLAKE2B 31e75dd8b0faab83f94e367b53562d49ae5f54d674420d025f5538978263924dcb3316175c8148556e49e9ab0f2869f99d9c5b33da66c153e4a6a89d70e0c762 SHA512 df1750e83202647e21abae00b5e01eaf206d8c3a98005fa81f7ea48db1d91a8451a48de6b2085990ed944d87c944620efc3ed982ca85fe5c4c2828a1300fd541 -EBUILD qtcore-5.9.4.ebuild 1456 BLAKE2B 683bf2694e07d7b2001d2fd54c75f8b02e7dcddb8c0039afcfbcc1e24b0a10926a4e3d6996972cc483110705cee145fa31b21514775d78fa5417faf69323dd3b SHA512 f36f179bb03923aa32b5d42f6ce3e9bbe62372bc43ca300c1d9d5eb1c143d1a395ce7595fcd245dcddbce57d683bc846af21eb0badf6f75c1cd1d146ea484c8b +EBUILD qtcore-5.9.4-r1.ebuild 1464 BLAKE2B dbf7cf4f18ba4fdd005d0a86f74aab67f3cb4d711a715a0fb8098b85f4694ee898b7c030b8d199b6cdc9cd9a251483456b8c3ed92b1c0f1609839dbe741fc7c9 SHA512 27aff99d26259f42bf9abb266c101559d679c123ee18b459fb45526a56af4a48b2964ea6d98b796c9fd0cdf46ffefd616f3a81e988fe6d5b9cbabf3679cb9011 MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch deleted file mode 100644 index be18433be209..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch +++ /dev/null @@ -1,69 +0,0 @@ -From d813c66bfcfac1837814ec4d174d0389172f0d4c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Tue, 25 Apr 2017 12:02:09 -0300 -Subject: Fix the build when AVX2 is enabled but __F16C__ isn't defined - -If -mavx2 is used, __AVX2__ is defined, which enables the F16C code -after commit 280e321e52fd4e86545f3f0d4bd4e047786a897e, but that was -wrong since we aren't allowed to use the F16C intrinsics with either -Clang or GCC (we can only do that with GCC 4.9 and Clang 4.8, and only -with an __attribute__ decoration). - -With ICC and MSVC, we are allowed to use the intrinsics, but the -#include was missing. - -[ChangeLog][QtCore] Fixed a compilation issue with qfloat16 if AVX2 -support is enabled in the compiler. Since all processors that support -AVX2 also support F16C, for GCC and Clang it is recommended to either -add -mf16c to your build or to use the corresponding -march= switch. - -Task-number: QTBUG-64529 -Change-Id: I84e363d735b443cb9beefffd14b8ac1fd4baa978 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - src/corelib/global/qfloat16.h | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index 89a62a93db..a0aa9496b4 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,7 +44,16 @@ - #include <QtCore/qmetatype.h> - #include <string.h> - --#if defined __F16C__ -+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) -+// All processors that support AVX2 do support F16C too. That doesn't mean -+// we're allowed to use the intrinsics directly, so we'll do it only for -+// the Intel and Microsoft's compilers. -+# if defined(Q_CC_INTEL) || defined(Q_CC_MSVC) -+# define __F16C__ 1 -+# endif -+#endif -+ -+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) - #include <immintrin.h> - #endif - -@@ -116,7 +125,7 @@ QT_WARNING_DISABLE_CLANG("-Wc99-extensions") - QT_WARNING_DISABLE_GCC("-Wold-style-cast") - inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW - { --#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__)) -+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) - __m128 packsingle = _mm_set_ss(f); - __m128i packhalf = _mm_cvtps_ph(packsingle, 0); - b16 = _mm_extract_epi16(packhalf, 0); -@@ -134,7 +143,7 @@ QT_WARNING_POP - - inline qfloat16::operator float() const Q_DECL_NOTHROW - { --#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__)) -+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) - __m128i packhalf = _mm_cvtsi32_si128(b16); - __m128 packsingle = _mm_cvtph_ps(packhalf); - return _mm_cvtss_f32(packsingle); --- -cgit v1.1-6-g87c4 - diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild deleted file mode 100644 index 5442d7c47bf9..000000000000 --- a/dev-qt/qtcore/qtcore-5.9.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 ~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}" - -PATCHES=( "${FILESDIR}/${P}-avx.patch" ) - -QT5_TARGET_SUBDIRS=( - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/qfloat16-tables - src/corelib - src/tools/qlalr - doc -) - -src_configure() { - local myconf=( - $(qt_use icu) - $(qt_use !icu iconv) - $(qt_use systemd journald) - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - local flags=( - ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE - HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM - OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR - XFIXES XKB XRANDR XRENDER XSYNC ZLIB - ) - - 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 -} diff --git a/dev-qt/qtcore/qtcore-5.9.4.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild index 54eb30f5d38f..368fe44dbac8 100644 --- a/dev-qt/qtcore/qtcore-5.9.4.ebuild +++ b/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild @@ -56,8 +56,8 @@ src_install() { local flags=( ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM - OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR - XFIXES XKB XRANDR XRENDER XSYNC ZLIB + OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS + XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB ) for flag in ${flags[@]}; do |