diff options
author | Michael Palimaka <kensington@gentoo.org> | 2018-02-07 00:03:57 +1100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2018-02-07 00:04:26 +1100 |
commit | d58c718ef54c9b9a73897b05eef6f1ef01e4f3b4 (patch) | |
tree | 921e12fa71c89c486155b8a709c044cae6b0959f /dev-qt/qtcore | |
parent | dev-qt/qt-docs: version bump 5.9.4_p201801220610 (diff) | |
download | gentoo-d58c718ef54c9b9a73897b05eef6f1ef01e4f3b4.tar.gz gentoo-d58c718ef54c9b9a73897b05eef6f1ef01e4f3b4.tar.bz2 gentoo-d58c718ef54c9b9a73897b05eef6f1ef01e4f3b4.zip |
dev-qt: remove 5.9.3
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r-- | dev-qt/qtcore/Manifest | 1 | ||||
-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 |
3 files changed, 0 insertions, 138 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index d3ab2453f37e..9e73529dec94 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,4 +1,3 @@ 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 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 -} |