From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1666E139082 for ; Wed, 29 Nov 2017 06:33:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25C83E0BFA; Wed, 29 Nov 2017 06:33:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA0F0E0BFA for ; Wed, 29 Nov 2017 06:33:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B6E333D3C7 for ; Wed, 29 Nov 2017 06:33:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F475AB50 for ; Wed, 29 Nov 2017 06:33:22 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1511937155.971f92f4f40d8ddde976457ad18eb47cf608b2d4.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/ X-VCS-Repository: proj/musl X-VCS-Files: dev-qt/qtcore/Manifest dev-qt/qtcore/files/qtcore-5.9.3-avx.patch dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch dev-qt/qtcore/qtcore-4.8.7-r3.ebuild dev-qt/qtcore/qtcore-5.7.1-r3.ebuild dev-qt/qtcore/qtcore-5.9.2.ebuild dev-qt/qtcore/qtcore-5.9.3.ebuild X-VCS-Directories: dev-qt/qtcore/files/ dev-qt/qtcore/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 971f92f4f40d8ddde976457ad18eb47cf608b2d4 X-VCS-Branch: master Date: Wed, 29 Nov 2017 06:33:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6de55542-7bb8-4ddb-acd9-a50dbd5e0f97 X-Archives-Hash: f56f8816accba63019ecb077cbc73f40 commit: 971f92f4f40d8ddde976457ad18eb47cf608b2d4 Author: Aric Belsito gmail com> AuthorDate: Wed Nov 29 06:32:35 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Wed Nov 29 06:32:35 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=971f92f4 dev-qt/qtcore: version bump to 5.9.2/5.9.3 dev-qt/qtcore/Manifest | 6 +- dev-qt/qtcore/files/qtcore-5.9.3-avx.patch | 69 ++++++++++++++++++++++ dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch | 12 ++++ dev-qt/qtcore/qtcore-4.8.7-r3.ebuild | 2 +- dev-qt/qtcore/qtcore-5.7.1-r3.ebuild | 2 +- dev-qt/qtcore/qtcore-5.9.2.ebuild | 68 ++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.9.3.ebuild | 71 +++++++++++++++++++++++ 7 files changed, 226 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 529c4fa..2967a23 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,2 +1,4 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 -DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682 +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.2.tar.xz 45148744 BLAKE2B 311f9fd5bea4b59988d90fad55bbaf46cbb5a77ed705f2f14d6d65ce1cd6e8c950fbcb6b6f06aad4aa3abb58892e9665cdab0a4716ac3a7f9c651dac239f04b6 SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch new file mode 100644 index 0000000..be18433 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch @@ -0,0 +1,69 @@ +From d813c66bfcfac1837814ec4d174d0389172f0d4c Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +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 +--- + 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 + #include + +-#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 + #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/files/qtcore-5.9.3-musl-iconv.patch b/dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch new file mode 100644 index 0000000..b738f73 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch @@ -0,0 +1,12 @@ +diff -Naur qtbase-opensource-src-5.9.3.orig/src/corelib/codecs/qiconvcodec.cpp qtbase-opensource-src-5.9.3/src/corelib/codecs/qiconvcodec.cpp +--- qtbase-opensource-src-5.9.3.orig/src/corelib/codecs/qiconvcodec.cpp 2017-11-15 21:15:28.000000000 -0800 ++++ qtbase-opensource-src-5.9.3/src/corelib/codecs/qiconvcodec.cpp 2017-11-28 22:24:13.734884247 -0800 +@@ -63,7 +63,7 @@ + #elif defined(Q_OS_AIX) + # define NO_BOM + # define UTF16 "UCS-2" +-#elif defined(Q_OS_FREEBSD) ++#elif defined(Q_OS_FREEBSD) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) + # define NO_BOM + # if Q_BYTE_ORDER == Q_BIG_ENDIAN + # define UTF16 "UTF-16BE" diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild index 46a4ce6..0c956c2 100644 --- a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild @@ -7,7 +7,7 @@ inherit qt4-build-multilib DESCRIPTION="Cross-platform application development framework" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~mips ppc x86" + KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" fi IUSE="+glib iconv icu libressl qt3support ssl" diff --git a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild index c4f32fd..a12aacd 100644 --- a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild +++ b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Cross-platform application development framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~mips ppc x86" + KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" fi IUSE="icu systemd" diff --git a/dev-qt/qtcore/qtcore-5.9.2.ebuild b/dev-qt/qtcore/qtcore-5.9.2.ebuild new file mode 100644 index 0000000..bd36eff --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.9.2.ebuild @@ -0,0 +1,68 @@ +# 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}/${PN}-5.9.3-musl-iconv.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.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild new file mode 100644 index 0000000..7c0da68 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.9.3.ebuild @@ -0,0 +1,71 @@ +# 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" + "${FILESDIR}/${PN}-5.9.3-musl-iconv.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 +}