From 0f9913644a9fcd9a54db903c8aa56ab6314b5ceb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 5 Feb 2018 17:18:29 +0000 Subject: Qt 5.9.4 unleashes hell, prevent upgrades --- dev-qt/designer/Manifest | 1 + dev-qt/designer/designer-5.9.3.ebuild | 40 +++++ dev-qt/linguist-tools/Manifest | 1 + dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild | 35 +++++ dev-qt/qtbluetooth/Manifest | 1 + dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild | 33 +++++ dev-qt/qtconcurrent/Manifest | 1 + dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild | 23 +++ dev-qt/qtcore/Manifest | 1 + dev-qt/qtcore/files/qtcore-5.9.3-avx.patch | 69 +++++++++ dev-qt/qtcore/qtcore-5.9.3.ebuild | 68 +++++++++ dev-qt/qtdbus/Manifest | 1 + dev-qt/qtdbus/qtdbus-5.9.3.ebuild | 38 +++++ dev-qt/qtdeclarative/Manifest | 1 + .../files/qtdeclarative-5.4.2-disable-jit.patch | 18 +++ dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild | 56 +++++++ dev-qt/qtgraphicaleffects/Manifest | 1 + .../qtgraphicaleffects-5.9.3.ebuild | 21 +++ dev-qt/qtgui/Manifest | 1 + dev-qt/qtgui/qtgui-5.9.3.ebuild | 164 +++++++++++++++++++++ dev-qt/qthelp/Manifest | 1 + dev-qt/qthelp/qthelp-5.9.3.ebuild | 30 ++++ dev-qt/qtmultimedia/Manifest | 1 + dev-qt/qtmultimedia/qtmultimedia-5.9.3.ebuild | 65 ++++++++ dev-qt/qtnetwork/Manifest | 1 + dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild | 53 +++++++ dev-qt/qtopengl/Manifest | 1 + dev-qt/qtopengl/qtopengl-5.9.3.ebuild | 34 +++++ dev-qt/qtpositioning/Manifest | 1 + dev-qt/qtpositioning/qtpositioning-5.9.3.ebuild | 37 +++++ dev-qt/qtprintsupport/Manifest | 1 + dev-qt/qtprintsupport/qtprintsupport-5.9.3.ebuild | 42 ++++++ dev-qt/qtquickcontrols/Manifest | 1 + .../qtquickcontrols/qtquickcontrols-5.9.3.ebuild | 32 ++++ dev-qt/qtquickcontrols2/Manifest | 1 + .../qtquickcontrols2/qtquickcontrols2-5.9.3.ebuild | 30 ++++ dev-qt/qtscript/Manifest | 1 + dev-qt/qtscript/qtscript-5.9.3.ebuild | 36 +++++ dev-qt/qtsensors/Manifest | 1 + dev-qt/qtsensors/qtsensors-5.9.3.ebuild | 28 ++++ dev-qt/qtsql/Manifest | 1 + dev-qt/qtsql/qtsql-5.9.3.ebuild | 53 +++++++ dev-qt/qtsvg/Manifest | 1 + dev-qt/qtsvg/qtsvg-5.9.3.ebuild | 23 +++ dev-qt/qttest/Manifest | 1 + dev-qt/qttest/qttest-5.9.3.ebuild | 29 ++++ dev-qt/qttranslations/Manifest | 1 + dev-qt/qttranslations/qttranslations-5.9.3.ebuild | 19 +++ dev-qt/qtwayland/Manifest | 1 + dev-qt/qtwayland/qtwayland-5.9.3.ebuild | 39 +++++ dev-qt/qtwebchannel/Manifest | 1 + dev-qt/qtwebchannel/qtwebchannel-5.9.3.ebuild | 26 ++++ dev-qt/qtwebengine/Manifest | 1 + .../files/qtwebengine-5.9.3-icu-60.1.patch | 16 ++ .../qtwebengine-5.9.3-paxmark-mksnapshot.patch | 41 ++++++ dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 122 +++++++++++++++ dev-qt/qtwebsockets/Manifest | 1 + dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild | 27 ++++ dev-qt/qtwidgets/Manifest | 1 + dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild | 50 +++++++ dev-qt/qtx11extras/Manifest | 1 + dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild | 21 +++ dev-qt/qtxml/Manifest | 1 + dev-qt/qtxml/qtxml-5.9.3.ebuild | 25 ++++ dev-qt/qtxmlpatterns/Manifest | 1 + dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild | 19 +++ 66 files changed, 1493 insertions(+) create mode 100644 dev-qt/designer/Manifest create mode 100644 dev-qt/designer/designer-5.9.3.ebuild create mode 100644 dev-qt/linguist-tools/Manifest create mode 100644 dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild create mode 100644 dev-qt/qtbluetooth/Manifest create mode 100644 dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild create mode 100644 dev-qt/qtconcurrent/Manifest create mode 100644 dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild create mode 100644 dev-qt/qtcore/Manifest create mode 100644 dev-qt/qtcore/files/qtcore-5.9.3-avx.patch create mode 100644 dev-qt/qtcore/qtcore-5.9.3.ebuild create mode 100644 dev-qt/qtdbus/Manifest create mode 100644 dev-qt/qtdbus/qtdbus-5.9.3.ebuild create mode 100644 dev-qt/qtdeclarative/Manifest create mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch create mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild create mode 100644 dev-qt/qtgraphicaleffects/Manifest create mode 100644 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.3.ebuild create mode 100644 dev-qt/qtgui/Manifest create mode 100644 dev-qt/qtgui/qtgui-5.9.3.ebuild create mode 100644 dev-qt/qthelp/Manifest create mode 100644 dev-qt/qthelp/qthelp-5.9.3.ebuild create mode 100644 dev-qt/qtmultimedia/Manifest create mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.9.3.ebuild create mode 100644 dev-qt/qtnetwork/Manifest create mode 100644 dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild create mode 100644 dev-qt/qtopengl/Manifest create mode 100644 dev-qt/qtopengl/qtopengl-5.9.3.ebuild create mode 100644 dev-qt/qtpositioning/Manifest create mode 100644 dev-qt/qtpositioning/qtpositioning-5.9.3.ebuild create mode 100644 dev-qt/qtprintsupport/Manifest create mode 100644 dev-qt/qtprintsupport/qtprintsupport-5.9.3.ebuild create mode 100644 dev-qt/qtquickcontrols/Manifest create mode 100644 dev-qt/qtquickcontrols/qtquickcontrols-5.9.3.ebuild create mode 100644 dev-qt/qtquickcontrols2/Manifest create mode 100644 dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.3.ebuild create mode 100644 dev-qt/qtscript/Manifest create mode 100644 dev-qt/qtscript/qtscript-5.9.3.ebuild create mode 100644 dev-qt/qtsensors/Manifest create mode 100644 dev-qt/qtsensors/qtsensors-5.9.3.ebuild create mode 100644 dev-qt/qtsql/Manifest create mode 100644 dev-qt/qtsql/qtsql-5.9.3.ebuild create mode 100644 dev-qt/qtsvg/Manifest create mode 100644 dev-qt/qtsvg/qtsvg-5.9.3.ebuild create mode 100644 dev-qt/qttest/Manifest create mode 100644 dev-qt/qttest/qttest-5.9.3.ebuild create mode 100644 dev-qt/qttranslations/Manifest create mode 100644 dev-qt/qttranslations/qttranslations-5.9.3.ebuild create mode 100644 dev-qt/qtwayland/Manifest create mode 100644 dev-qt/qtwayland/qtwayland-5.9.3.ebuild create mode 100644 dev-qt/qtwebchannel/Manifest create mode 100644 dev-qt/qtwebchannel/qtwebchannel-5.9.3.ebuild create mode 100644 dev-qt/qtwebengine/Manifest create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch create mode 100644 dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild create mode 100644 dev-qt/qtwebsockets/Manifest create mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild create mode 100644 dev-qt/qtwidgets/Manifest create mode 100644 dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild create mode 100644 dev-qt/qtx11extras/Manifest create mode 100644 dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild create mode 100644 dev-qt/qtxml/Manifest create mode 100644 dev-qt/qtxml/qtxml-5.9.3.ebuild create mode 100644 dev-qt/qtxmlpatterns/Manifest create mode 100644 dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild (limited to 'dev-qt') diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest new file mode 100644 index 00000000..2cb01917 --- /dev/null +++ b/dev-qt/designer/Manifest @@ -0,0 +1 @@ +DIST qttools-opensource-src-5.9.3.tar.xz 9777804 SHA256 442c38de3e35f9dcc355dadff35436e23a5a7abd7dd1167a3bf6325e3d9284ff SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f WHIRLPOOL 9a3498ce72d7471a7a5e97545765fe531ee96ceae9b7e0b193f02fd7edfdc626406cf9d7eab55cc10ab4b8a7ad18341526b0d4eb36bf76cf28f42d2449f19317 diff --git a/dev-qt/designer/designer-5.9.3.ebuild b/dev-qt/designer/designer-5.9.3.ebuild new file mode 100644 index 00000000..3a71ad1f --- /dev/null +++ b/dev-qt/designer/designer-5.9.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="declarative webkit" + +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtprintsupport-${PV} + ~dev-qt/qtwidgets-${PV} + ~dev-qt/qtxml-${PV} + declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] ) + webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/designer +) + +src_prepare() { + qt_use_disable_mod declarative quickwidgets \ + src/designer/src/plugins/plugins.pro + + qt_use_disable_mod webkit webkitwidgets \ + src/designer/src/plugins/plugins.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest new file mode 100644 index 00000000..2cb01917 --- /dev/null +++ b/dev-qt/linguist-tools/Manifest @@ -0,0 +1 @@ +DIST qttools-opensource-src-5.9.3.tar.xz 9777804 SHA256 442c38de3e35f9dcc355dadff35436e23a5a7abd7dd1167a3bf6325e3d9284ff SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f WHIRLPOOL 9a3498ce72d7471a7a5e97545765fe531ee96ceae9b7e0b193f02fd7edfdc626406cf9d7eab55cc10ab4b8a7ad18341526b0d4eb36bf76cf28f42d2449f19317 diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild new file mode 100644 index 00000000..dbb5885f --- /dev/null +++ b/dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Tools for working with Qt translation data files" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="qml" + +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtxml-${PV} + qml? ( ~dev-qt/qtdeclarative-${PV} ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/linguist +) + +src_prepare() { + sed -i -e '/SUBDIRS += linguist/d' \ + src/linguist/linguist.pro || die + + qt_use_disable_mod qml qmldevtools-private \ + src/linguist/lupdate/lupdate.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest new file mode 100644 index 00000000..03172d8d --- /dev/null +++ b/dev-qt/qtbluetooth/Manifest @@ -0,0 +1 @@ +DIST qtconnectivity-opensource-src-5.9.3.tar.xz 2723456 SHA256 e2891e6e8d91e82e3c4d5667f3146062458067c0b706d65ac0fc7562afce0649 SHA512 28fe6ac8e9480e52cffec7bddd6db95ed4bc96858e7b7e6f1ecb325f2ebb48442f7ec3e820579e9c0654aac48ee91ad734e51f0eb65faeaa592eb7a0875854f5 WHIRLPOOL 314980ad6600e39b9f63fa42c331755182f13eeba2ba719bfab42bf97df1d28052a31a969e10768afb5363fa373a42f7f0cd357d11f3f335a7866521219eca54 diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild new file mode 100644 index 00000000..e2b130a1 --- /dev/null +++ b/dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtconnectivity" +inherit qt5-build + +DESCRIPTION="Bluetooth support library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtconcurrent-${PV} + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdbus-${PV} + >=net-wireless/bluez-5:= + qml? ( ~dev-qt/qtdeclarative-${PV} ) +" +DEPEND="${RDEPEND} + ~dev-qt/qtnetwork-${PV} +" + +src_prepare() { + sed -i -e 's/nfc//' src/src.pro || die + + qt_use_disable_mod qml quick src/src.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest new file mode 100644 index 00000000..bbdb5796 --- /dev/null +++ b/dev-qt/qtconcurrent/Manifest @@ -0,0 +1 @@ +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild new file mode 100644 index 00000000..489afedf --- /dev/null +++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild @@ -0,0 +1,23 @@ +# 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="Multi-threading concurrence support library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="" + +DEPEND=" + ~dev-qt/qtcore-${PV} +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/concurrent +) diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest new file mode 100644 index 00000000..bbdb5796 --- /dev/null +++ b/dev-qt/qtcore/Manifest @@ -0,0 +1 @@ +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed 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 00000000..be18433b --- /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/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild new file mode 100644 index 00000000..bca803ff --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.9.3.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" +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/qtdbus/Manifest b/dev-qt/qtdbus/Manifest new file mode 100644 index 00000000..bbdb5796 --- /dev/null +++ b/dev-qt/qtdbus/Manifest @@ -0,0 +1 @@ +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed diff --git a/dev-qt/qtdbus/qtdbus-5.9.3.ebuild b/dev-qt/qtdbus/qtdbus-5.9.3.ebuild new file mode 100644 index 00000000..4fe79a48 --- /dev/null +++ b/dev-qt/qtdbus/qtdbus-5.9.3.ebuild @@ -0,0 +1,38 @@ +# 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="Qt5 module for inter-process communication over the D-Bus protocol" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="" + +DEPEND=" + ~dev-qt/qtcore-${PV} + >=sys-apps/dbus-1.4.20 +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/dbus + src/tools/qdbusxml2cpp + src/tools/qdbuscpp2xml +) + +QT5_GENTOO_CONFIG=( + :dbus + :dbus-linked: +) + +src_configure() { + local myconf=( + -dbus-linked + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest new file mode 100644 index 00000000..f64b6e20 --- /dev/null +++ b/dev-qt/qtdeclarative/Manifest @@ -0,0 +1 @@ +DIST qtdeclarative-opensource-src-5.9.3.tar.xz 21443328 SHA256 505f66d2062c1d84ce743a0b4969531e1cf94e30970dc64efffe10f74f989407 SHA512 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24 WHIRLPOOL a742e632981755e983e48f4448490873203fc6153303688f40037917828b50ba0d6efcf9730ab524427300c2aec2481d27d16b6b61f05376e6d33800930346fb diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch new file mode 100644 index 00000000..7799ef71 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch @@ -0,0 +1,18 @@ +diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h +index 4b08194..224ddb1 100644 +--- a/src/qml/jsruntime/qv4global_p.h ++++ b/src/qml/jsruntime/qv4global_p.h +@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } + # undef V4_ENABLE_JIT + #endif + #endif + ++// Gentoo note: disable the JIT due to USE="-jit" ++#ifdef V4_ENABLE_JIT ++#undef V4_ENABLE_JIT ++#endif ++ + // Do certain things depending on whether the JIT is enabled or disabled + + #ifdef V4_ENABLE_JIT + #define ENABLE_YARR_JIT 1 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild new file mode 100644 index 00000000..e9575bed --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +inherit python-any-r1 qt5-build + +DESCRIPTION="The QML and Quick modules for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="gles2 +jit localstorage +widgets xml" + +# qtgui[gles2=] is needed because of bug 504322 +COMMON_DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV}[gles2=] + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qttest-${PV} + localstorage? ( ~dev-qt/qtsql-${PV} ) + widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) + xml? ( + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtxmlpatterns-${PV} + ) +" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} +" +RDEPEND="${COMMON_DEPEND} + !=ICU-60 + +Bug: https://bugs.gentoo.org/639220 +Bug: https://bugreports.qt.io/browse/QTBUG-64925 + +--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc ++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc +@@ -488,7 +488,7 @@ + // are added to the allowed set. The list has to be updated when a new + // version of Unicode is released. The current version is 9.0.0 and ICU 60 + // will have Unicode 10.0 data. +-#if U_ICU_VERSION_MAJOR_NUM < 60 ++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT) + const icu::UnicodeSet aspirational_scripts( + icu::UnicodeString( + // Unified Canadian Syllabics diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch new file mode 100644 index 00000000..ecedaf62 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch @@ -0,0 +1,41 @@ +Bug: https://bugs.gentoo.org/634220 + +--- a/src/3rdparty/chromium/v8/BUILD.gn ++++ b/src/3rdparty/chromium/v8/BUILD.gn +@@ -661,6 +661,7 @@ action("run_mksnapshot") { + + deps = [ + ":mksnapshot($v8_snapshot_toolchain)", ++ ":run_paxmark", + ] + + script = "tools/run.py" +@@ -706,6 +707,28 @@ action("run_mksnapshot") { + args += [ rebase_path(v8_embed_script, root_build_dir) ] + } + } ++action("run_paxmark") { ++ visibility = [ ":*" ] # Only targets in this file can depend on this. ++ ++ deps = [ ++ ":mksnapshot($v8_snapshot_toolchain)", ++ ] ++ ++ script = "/usr/sbin/pypaxctl" ++ ++ sources = [] ++ ++ outputs = [ ++ "$target_out_dir/mksnapshot", ++ ] ++ ++ args = [ ++ "-sm", ++ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", ++ "root_out_dir") + "/mksnapshot", ++ root_build_dir), ++ ] ++} + + action("run_mkpeephole") { + visibility = [ ":*" ] # Only targets in this file can depend on this. diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild new file mode 100644 index 00000000..f9335096 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit multiprocessing pax-utils python-any-r1 qt5-build + +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" + +RDEPEND=" + app-arch/snappy:= + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtprintsupport-${PV} + ~dev-qt/qtwebchannel-${PV}[qml] + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/protobuf:= + dev-libs/re2:= + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/libpng:0= + >=media-libs/libvpx-1.5:=[svc] + media-libs/libwebp:= + media-libs/mesa + media-libs/opus + net-libs/libsrtp:0= + sys-apps/dbus + sys-apps/pciutils + sys-libs/libcap + sys-libs/zlib[minizip] + virtual/jpeg:0 + virtual/libudev + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( dev-libs/icu:= ) + widgets? ( + ~dev-qt/qtdeclarative-${PV}[widgets] + ~dev-qt/qtwidgets-${PV} + ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=app-arch/gzip-1.7 + dev-util/gperf + dev-util/ninja + dev-util/re2c + sys-devel/bison + pax_kernel? ( sys-apps/elfix ) +" + +PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" ) + +src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) + + # bug 620444 - ensure local headers are used + find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die + + qt_use_disable_config alsa alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri + + qt_use_disable_mod geolocation positioning \ + mkspecs/features/configure.prf \ + src/core/core_chromium.pri \ + src/core/core_common.pri + + qt_use_disable_mod widgets widgets src/src.pro + + qt5-build_src_prepare +} + +src_configure() { + export NINJA_PATH=/usr/bin/ninja + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + + local myqmakeargs=( + $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') + $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') + $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # bug 601472 + if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + fi + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest new file mode 100644 index 00000000..6b314cd6 --- /dev/null +++ b/dev-qt/qtwebsockets/Manifest @@ -0,0 +1 @@ +DIST qtwebsockets-opensource-src-5.9.3.tar.xz 199420 SHA256 ce069dff5b552bc6039bcf17e211d2c8837757e2194773bb54054105866111de SHA512 64eb131a0640229ae7553c0e8b9ec04a3f83862d3f48c38464928b8a7a9ca999ed0cba5b0fb91174a9ae8e8e3d6fa844a2aaf62a96b95fefc383361793f8b5de WHIRLPOOL d51ba508eb81ec8dc8e966ec337cbc854c3afc69ee18edbe600110a2de39a73f043e118adb2d6f5ddc703b159f06a0ad14cab46f920c5e00fded8475fb564d19 diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild new file mode 100644 index 00000000..45cb72c6 --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit qt5-build + +DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="qml +ssl" + +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtnetwork-${PV}[ssl=] + qml? ( ~dev-qt/qtdeclarative-${PV} ) + +" +RDEPEND="${DEPEND}" + +src_prepare() { + qt_use_disable_mod qml quick src/src.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest new file mode 100644 index 00000000..bbdb5796 --- /dev/null +++ b/dev-qt/qtwidgets/Manifest @@ -0,0 +1 @@ +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild new file mode 100644 index 00000000..4b839699 --- /dev/null +++ b/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild @@ -0,0 +1,50 @@ +# 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="Set of components for creating classic desktop-style UIs for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +# keep IUSE defaults in sync with qtgui +IUSE="gles2 gtk +png +xcb" + +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] + gtk? ( + ~dev-qt/qtgui-${PV}[dbus] + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/tools/uic + src/widgets + src/plugins/platformthemes +) + +QT5_GENTOO_CONFIG=( + gtk:gtk3: + !:no-widgets: +) + +src_configure() { + local myconf=( + -opengl $(usex gles2 es2 desktop) + $(qt_use gtk) + $(qt_use png libpng system) + $(qt_use xcb xcb system) + $(qt_use xcb xkbcommon system) + $(usex xcb '-xcb-xlib -xinput2 -xkb' '') + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest new file mode 100644 index 00000000..62de46da --- /dev/null +++ b/dev-qt/qtx11extras/Manifest @@ -0,0 +1 @@ +DIST qtx11extras-opensource-src-5.9.3.tar.xz 76612 SHA256 e4e0bf8cbb629758ab85b72d240d7424642482f602ce414e06deef4e147bf2be SHA512 0d1547e25f5d051daa8b20f54ca146bc5a6ad6fdae2c9b9e90dae574840a350bc3ac82b05ddb93b7a544e689fc06e633e57a40f31475cd118e156fad78e91d6c WHIRLPOOL 594ceef1aae55cbaa618adeb33a6b4ac909a8145d56a6fbb1c6bca51ccdd79780ab873916b004076889528c97935c148a35985313e66c8c18287b8921aa59ab6 diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild new file mode 100644 index 00000000..455b9e54 --- /dev/null +++ b/dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit qt5-build + +DESCRIPTION="Linux/X11-specific support library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="" + +RDEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV}[xcb] +" +DEPEND="${RDEPEND} + test? ( ~dev-qt/qtwidgets-${PV} ) +" diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest new file mode 100644 index 00000000..bbdb5796 --- /dev/null +++ b/dev-qt/qtxml/Manifest @@ -0,0 +1 @@ +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed diff --git a/dev-qt/qtxml/qtxml-5.9.3.ebuild b/dev-qt/qtxml/qtxml-5.9.3.ebuild new file mode 100644 index 00000000..61a198e9 --- /dev/null +++ b/dev-qt/qtxml/qtxml-5.9.3.ebuild @@ -0,0 +1,25 @@ +# 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="Implementation of SAX and DOM for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="" + +RDEPEND=" + ~dev-qt/qtcore-${PV} +" +DEPEND="${RDEPEND} + test? ( ~dev-qt/qtnetwork-${PV} ) +" + +QT5_TARGET_SUBDIRS=( + src/xml +) diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest new file mode 100644 index 00000000..4d5adcea --- /dev/null +++ b/dev-qt/qtxmlpatterns/Manifest @@ -0,0 +1 @@ +DIST qtxmlpatterns-opensource-src-5.9.3.tar.xz 1360880 SHA256 cf9c66a612a963382f7b4b51ac8ee5e920bd035b26ecb5c5957f8f3d3286f0ba SHA512 4b345940cc66cfd14de365f2802e49a3ad88c25a46e4c36765e31586728496f3bc5aa9a856a78b79b583e577a70dca5c70534d9689627773e142e9c7e421de01 WHIRLPOOL 40a31bf88354fee6a456b9ea0fe35f1940eed9ee392acdb93168c8a2fb030ef2bb8aaf24f106e17ba5ed9802d06b60b9e538104ea3e455d6c11e46328c677cdd diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild new file mode 100644 index 00000000..1726d6ce --- /dev/null +++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit qt5-build + +DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="" + +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtnetwork-${PV} +" +RDEPEND="${DEPEND}" -- cgit v1.2.3