From 05e19c5517a36fa78707b8674e83e6268b0efc6b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Dec 2018 11:03:46 +0000 Subject: drop our Qt5 ebuilds, use the ones from Gentoo --- dev-qt/designer/Manifest | 1 - dev-qt/designer/designer-5.11.1-r1337.ebuild | 57 -- dev-qt/linguist-tools/Manifest | 1 - .../linguist-tools-5.11.1-r1337.ebuild | 35 - dev-qt/qdbus/Manifest | 1 - dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild | 25 - dev-qt/qtbluetooth/Manifest | 1 - dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild | 33 - dev-qt/qtcharts/Manifest | 1 - dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild | 29 - dev-qt/qtconcurrent/Manifest | 1 - .../qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild | 23 - dev-qt/qtcore/Manifest | 1 - dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild | 75 -- dev-qt/qtdbus/Manifest | 1 - dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild | 43 - dev-qt/qtdeclarative/Manifest | 1 - .../files/qtdeclarative-5.4.2-disable-jit.patch | 18 - .../qtdeclarative-5.11.1-r1337.ebuild | 64 -- dev-qt/qtgraphicaleffects/Manifest | 1 - .../qtgraphicaleffects-5.11.1-r1337.ebuild | 21 - dev-qt/qtgui/Manifest | 1 - dev-qt/qtgui/qtgui-5.11.1-r1337.ebuild | 170 ---- dev-qt/qthelp/Manifest | 1 - dev-qt/qthelp/qthelp-5.11.1-r1337.ebuild | 30 - dev-qt/qtimageformats/Manifest | 1 - .../qtimageformats-5.11.1-r1337.ebuild | 29 - dev-qt/qtmultimedia/Manifest | 1 - .../qtmultimedia/qtmultimedia-5.11.1-r1337.ebuild | 68 -- dev-qt/qtnetwork/Manifest | 1 - dev-qt/qtnetwork/qtnetwork-5.11.1-r1337.ebuild | 57 -- dev-qt/qtopengl/Manifest | 1 - dev-qt/qtopengl/qtopengl-5.11.1-r1337.ebuild | 34 - dev-qt/qtpaths/Manifest | 1 - dev-qt/qtpaths/qtpaths-5.11.1-r1337.ebuild | 23 - dev-qt/qtpositioning/Manifest | 1 - .../qtpositioning-5.11.1-r1337.ebuild | 40 - dev-qt/qtprintsupport/Manifest | 1 - .../qtprintsupport-5.11.1-r1337.ebuild | 42 - dev-qt/qtquickcontrols/Manifest | 1 - .../qtquickcontrols-5.11.1-r1337.ebuild | 32 - dev-qt/qtquickcontrols2/Manifest | 1 - .../qtquickcontrols2-5.11.1-r1337.ebuild | 30 - dev-qt/qtscript/Manifest | 1 - dev-qt/qtscript/qtscript-5.11.1-r1337.ebuild | 36 - dev-qt/qtsensors/Manifest | 1 - dev-qt/qtsensors/qtsensors-5.11.1-r1337.ebuild | 28 - dev-qt/qtspeech/Manifest | 1 - dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch | 12 - dev-qt/qtspeech/qtspeech-5.11.1-r1337.ebuild | 22 - dev-qt/qtsql/Manifest | 1 - dev-qt/qtsql/qtsql-5.11.1-r1337.ebuild | 57 -- dev-qt/qtsvg/Manifest | 1 - dev-qt/qtsvg/qtsvg-5.11.1-r1337.ebuild | 23 - dev-qt/qttest/Manifest | 1 - dev-qt/qttest/qttest-5.11.1-r1337.ebuild | 33 - dev-qt/qttranslations/Manifest | 1 - .../qttranslations-5.11.1-r1337.ebuild | 19 - dev-qt/qtvirtualkeyboard/Manifest | 1 - .../qtvirtualkeyboard-5.11.1-r1337.ebuild | 38 - dev-qt/qtwayland/Manifest | 1 - dev-qt/qtwayland/qtwayland-5.11.1-r1337.ebuild | 39 - dev-qt/qtwebchannel/Manifest | 1 - .../qtwebchannel/qtwebchannel-5.11.1-r1337.ebuild | 26 - dev-qt/qtwebengine/Manifest | 1 - ...-5.11.1-eglGetProcAddress-fallback-lookup.patch | 68 -- .../files/qtwebengine-5.11.1-ffmpeg4.patch | 32 - ...webengine-5.11.1-libxml2-disable-catalogs.patch | 46 -- .../qtwebengine-5.11.1-nouveau-disable-gpu.patch | 98 --- .../files/qtwebengine-5.9.3-icu-60.1.patch | 16 - .../qtwebengine-5.9.3-paxmark-mksnapshot.patch | 41 - .../files/qtwebengine-5.9.4-jpeg-9-1.patch | 70 -- .../files/qtwebengine-5.9.4-jpeg-9-2.patch | 46 -- .../qtwebengine/files/qtwebengine-5.9.6-gcc8.patch | 24 - dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild | 138 ---- dev-qt/qtwebkit/Manifest | 1 - .../qtwebkit-5.212.0_pre20180120-functional.patch | 22 - .../qtwebkit-5.212.0_pre20180120-r1337.ebuild | 140 ---- dev-qt/qtwebsockets/Manifest | 1 - .../qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild | 27 - dev-qt/qtwidgets/Manifest | 1 - dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild | 57 -- dev-qt/qtx11extras/Manifest | 1 - dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild | 21 - dev-qt/qtxml/Manifest | 1 - dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild | 29 - dev-qt/qtxmlpatterns/Manifest | 1 - .../qtxmlpatterns-5.11.1-r1337.ebuild | 19 - eclass/qt5-build-r10000.eclass | 862 --------------------- 89 files changed, 3105 deletions(-) delete mode 100644 dev-qt/designer/Manifest delete mode 100644 dev-qt/designer/designer-5.11.1-r1337.ebuild delete mode 100644 dev-qt/linguist-tools/Manifest delete mode 100644 dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qdbus/Manifest delete mode 100644 dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtbluetooth/Manifest delete mode 100644 dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtcharts/Manifest delete mode 100644 dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtconcurrent/Manifest delete mode 100644 dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtcore/Manifest delete mode 100644 dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtdbus/Manifest delete mode 100644 dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtdeclarative/Manifest delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtgraphicaleffects/Manifest delete mode 100644 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtgui/Manifest delete mode 100644 dev-qt/qtgui/qtgui-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qthelp/Manifest delete mode 100644 dev-qt/qthelp/qthelp-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtimageformats/Manifest delete mode 100644 dev-qt/qtimageformats/qtimageformats-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtmultimedia/Manifest delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtnetwork/Manifest delete mode 100644 dev-qt/qtnetwork/qtnetwork-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtopengl/Manifest delete mode 100644 dev-qt/qtopengl/qtopengl-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtpaths/Manifest delete mode 100644 dev-qt/qtpaths/qtpaths-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtpositioning/Manifest delete mode 100644 dev-qt/qtpositioning/qtpositioning-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtprintsupport/Manifest delete mode 100644 dev-qt/qtprintsupport/qtprintsupport-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtquickcontrols/Manifest delete mode 100644 dev-qt/qtquickcontrols/qtquickcontrols-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtquickcontrols2/Manifest delete mode 100644 dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtscript/Manifest delete mode 100644 dev-qt/qtscript/qtscript-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtsensors/Manifest delete mode 100644 dev-qt/qtsensors/qtsensors-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtspeech/Manifest delete mode 100644 dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch delete mode 100644 dev-qt/qtspeech/qtspeech-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtsql/Manifest delete mode 100644 dev-qt/qtsql/qtsql-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtsvg/Manifest delete mode 100644 dev-qt/qtsvg/qtsvg-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qttest/Manifest delete mode 100644 dev-qt/qttest/qttest-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qttranslations/Manifest delete mode 100644 dev-qt/qttranslations/qttranslations-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtvirtualkeyboard/Manifest delete mode 100644 dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtwayland/Manifest delete mode 100644 dev-qt/qtwayland/qtwayland-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtwebchannel/Manifest delete mode 100644 dev-qt/qtwebchannel/qtwebchannel-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtwebengine/Manifest delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch delete mode 100644 dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtwebkit/Manifest delete mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch delete mode 100644 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild delete mode 100644 dev-qt/qtwebsockets/Manifest delete mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtwidgets/Manifest delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtx11extras/Manifest delete mode 100644 dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtxml/Manifest delete mode 100644 dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild delete mode 100644 dev-qt/qtxmlpatterns/Manifest delete mode 100644 dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild delete mode 100644 eclass/qt5-build-r10000.eclass diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest deleted file mode 100644 index c149cc7f..00000000 --- a/dev-qt/designer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 diff --git a/dev-qt/designer/designer-5.11.1-r1337.ebuild b/dev-qt/designer/designer-5.11.1-r1337.ebuild deleted file mode 100644 index 82aae8a4..00000000 --- a/dev-qt/designer/designer-5.11.1-r1337.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qttools" -inherit desktop gnome2-utils qt5-build-r10000 - -DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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-r10000_src_prepare -} - -src_install() { - qt5-build-r10000_src_install - - doicon -s 128 src/designer/src/designer/images/designer.png - make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner' -} - -pkg_postinst() { - qt5-build-r10000_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - qt5-build-r10000_pkg_postrm - gnome2_icon_cache_update -} diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest deleted file mode 100644 index c149cc7f..00000000 --- a/dev-qt/linguist-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild deleted file mode 100644 index 4240e2ed..00000000 --- a/dev-qt/linguist-tools/linguist-tools-5.11.1-r1337.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qttools" -inherit qt5-build-r10000 - -DESCRIPTION="Tools for working with Qt translation data files" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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-r10000_src_prepare -} diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest deleted file mode 100644 index c149cc7f..00000000 --- a/dev-qt/qdbus/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 diff --git a/dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild b/dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild deleted file mode 100644 index 54cc8fad..00000000 --- a/dev-qt/qdbus/qdbus-5.11.1-r1337.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qttools" -inherit qt5-build-r10000 - -DESCRIPTION="Interface to Qt applications communicating over D-Bus" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdbus-${PV} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/qdbus/qdbus -) diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest deleted file mode 100644 index 0ac6f83d..00000000 --- a/dev-qt/qtbluetooth/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtconnectivity-everywhere-src-5.11.1.tar.xz 2734864 BLAKE2B 7bd22542f06f6a46689b176181e83a315569690e3e5ce20f95d473af6d8513c03d47f2c7801cfbce522f49e25e1183e7553e104c7aaa7d071b86719236847438 SHA512 3533b117a6d028ef7bf4fe89b9ee42409b7a6eb62e60bca84e5f1323f6cd9892234d2c9b213ac806cda29cf36c8c6c646dec145933534664d376cda5bff94d8d diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild deleted file mode 100644 index ff5fd647..00000000 --- a/dev-qt/qtbluetooth/qtbluetooth-5.11.1-r1337.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtconnectivity" -inherit qt5-build-r10000 - -DESCRIPTION="Bluetooth support library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -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-r10000_src_prepare -} diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest deleted file mode 100644 index 3e4e293f..00000000 --- a/dev-qt/qtcharts/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtcharts-everywhere-src-5.11.1.tar.xz 4245496 BLAKE2B 92c1d9330d2da96524505186cd39c34765fc65ba5e5947d27f0bc7e275bc044112d3cd9fcef0c5455b20d0fb931d3bf15f8961381e47a7d537e47d1dffcbe5ee SHA512 e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b diff --git a/dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild b/dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild deleted file mode 100644 index 0124cb36..00000000 --- a/dev-qt/qtcharts/qtcharts-5.11.1-r1337.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit qt5-build-r10000 - -DESCRIPTION="Chart component library for the Qt5 framework" -LICENSE="GPL-3" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" -fi - -IUSE="qml" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - qt_use_disable_mod qml quick \ - src/src.pro - - qt5-build-r10000_src_prepare -} diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest deleted file mode 100644 index 297e2c65..00000000 --- a/dev-qt/qtconcurrent/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild deleted file mode 100644 index 7f10be60..00000000 --- a/dev-qt/qtconcurrent/qtconcurrent-5.11.1-r1337.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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 deleted file mode 100644 index 297e2c65..00000000 --- a/dev-qt/qtcore/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 diff --git a/dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild deleted file mode 100644 index 08d160b8..00000000 --- a/dev-qt/qtcore/qtcore-5.11.1-r1337.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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} - !> "${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 deleted file mode 100644 index 297e2c65..00000000 --- a/dev-qt/qtdbus/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 diff --git a/dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild b/dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild deleted file mode 100644 index b965500c..00000000 --- a/dev-qt/qtdbus/qtdbus-5.11.1-r1337.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :dbus - :dbus-linked -) - -src_configure() { - local myconf=( - -dbus-linked - ) - qt5-build-r10000_src_configure -} diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest deleted file mode 100644 index e99dd841..00000000 --- a/dev-qt/qtdeclarative/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053 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 deleted file mode 100644 index 7799ef71..00000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch +++ /dev/null @@ -1,18 +0,0 @@ -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.11.1-r1337.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.1-r1337.ebuild deleted file mode 100644 index 401fa541..00000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.11.1-r1337.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 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-r10000 - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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} - ! -Date: Mon, 11 Jun 2018 16:16:55 +0300 -Subject: Add fallback lookup for eglGetProcAddress - -Use the GLContext to find address for eglGetProcAddress symbol, if it's -not found with dlopen. - -Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85 -Reviewed-by: Michal Klocek ---- - src/core/gl_context_qt.cpp | 11 +++++++++++ - src/core/gl_context_qt.h | 1 + - src/core/gl_surface_qt.cpp | 4 ++++ - 3 files changed, 16 insertions(+) - -diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp -index 9ed1db8b..95491709 100644 ---- a/src/core/gl_context_qt.cpp -+++ b/src/core/gl_context_qt.cpp -@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress() - return get_proc_address; - } - -+QFunctionPointer GLContextHelper::getEglGetProcAddress() -+{ -+ QFunctionPointer get_proc_address = nullptr; -+#ifndef QT_NO_OPENGL -+ if (QOpenGLContext *context = qt_gl_global_share_context()) { -+ get_proc_address = context->getProcAddress("eglGetProcAddress"); -+ } -+#endif -+ return get_proc_address; -+} -+ - QT_END_NAMESPACE - - #if defined(USE_OZONE) || defined(OS_WIN) -diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h -index 8ffdad58..cecceabc 100644 ---- a/src/core/gl_context_qt.h -+++ b/src/core/gl_context_qt.h -@@ -63,6 +63,7 @@ public: - static void* getXDisplay(); - static void* getNativeDisplay(); - static QFunctionPointer getGlXGetProcAddress(); -+ static QFunctionPointer getEglGetProcAddress(); - private: - Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs); - -diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp -index 7e579246..4d38d7c2 100644 ---- a/src/core/gl_surface_qt.cpp -+++ b/src/core/gl_surface_qt.cpp -@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) { - base::GetFunctionPointerFromNativeLibrary(library, - "eglGetProcAddress")); - if (!get_proc_address) { -+ QFunctionPointer address = GLContextHelper::getEglGetProcAddress(); -+ get_proc_address = reinterpret_cast(address); -+ } -+ if (!get_proc_address) { - LOG(ERROR) << "eglGetProcAddress not found."; - base::UnloadNativeLibrary(library); - return false; --- -cgit v1.1-6-g87c4 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch deleted file mode 100644 index e9ef452a..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001 -From: Xiaohan Wang -Date: Mon, 29 Jan 2018 21:28:28 +0000 -Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64 - -AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg: -https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5 - -BUG=777484 - -Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db -Reviewed-on: https://chromium-review.googlesource.com/889686 -Reviewed-by: Dale Curtis -Commit-Queue: Xiaohan Wang -Cr-Commit-Position: refs/heads/master@{#532593} ---- - src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h -index 0341e5784f725..60ffba708b0e5 100644 ---- a/src/3rdparty/chromium/media/base/decoder_buffer.h -+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h -@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer - : public base::RefCountedThreadSafe { - public: - enum { -- kPaddingSize = 32, -+ kPaddingSize = 64, - #if defined(ARCH_CPU_ARM_FAMILY) - kAlignmentSize = 16 - #else diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch deleted file mode 100644 index 8ac5b90b..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/config.tests/xml2/xml2.cpp -+++ b/config.tests/xml2/xml2.cpp -@@ -27,9 +27,6 @@ - ****************************************************************************/ - - #include --#if defined(LIBXML_CATALOG_ENABLED) --#error "libxml catalog enabled" --#endif - #if !defined(LIBXML_ICU_ENABLED) - #error "libxml icu not enabled" - #endif ---- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp -+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp -@@ -28,6 +28,10 @@ - - #include - #include -+#include -+#if defined(LIBXML_CATALOG_ENABLED) -+#include -+#endif - #include - #include - #include "core/css/StyleEngine.h" -@@ -538,10 +542,6 @@ - static bool ShouldAllowExternalLoad(const KURL& url) { - String url_string = url.GetString(); - -- // libxml should not be configured with catalogs enabled, so it -- // should not be asking to load default catalogs. -- CHECK(!IsLibxmlDefaultCatalogFile(url)); -- - // The most common DTD. There isn't much point in hammering www.w3c.org by - // requesting this URL for every XHTML document. - if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) -@@ -646,6 +646,9 @@ - if (did_init) - return; - -+#if defined(LIBXML_CATALOG_ENABLED) -+ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); -+#endif - xmlInitParser(); - xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); - xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch deleted file mode 100644 index aaf3aae4..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch +++ /dev/null @@ -1,98 +0,0 @@ -From: Antonio Larrosa -Subject: Disable GPU when using nouveau or running on wayland -References: boo#1005323, boo#1060990 - -Qt WebEngine uses multi-threaded OpenGL, which nouveau does not support. -It also crashes when running on wayland, the cause is not yet known. -Work around these issues by not doing GPU-accelerated rendering in such -cases. - -Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp -=================================================================== ---- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp -+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp -@@ -100,6 +100,7 @@ - #include - #ifndef QT_NO_OPENGL - # include -+# include - #endif - #include - #include -@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v - } - #endif - -+#ifndef QT_NO_OPENGL -+QString openGLVendor() -+{ -+ QString vendor; -+ -+ QOpenGLContext *oldContext = QOpenGLContext::currentContext(); -+ QSurface *oldSurface = 0; -+ if (oldContext) -+ oldSurface = oldContext->surface(); -+ -+ QScopedPointer surface( new QOffscreenSurface ); -+ surface->create(); -+ QOpenGLContext context; -+ if (!context.create()) { -+ qDebug() << "Error creating openGL context"; -+ } -+ else if (!context.makeCurrent(surface.data())) { -+ qDebug() << "Error making openGL context current context"; -+ } else { -+ const GLubyte *p; -+ QOpenGLFunctions *f = context.functions(); -+ if ((p = f->glGetString(GL_VENDOR))) -+ vendor = QString::fromLatin1(reinterpret_cast(p)); -+ } -+ -+ context.doneCurrent(); -+ if (oldContext && oldSurface) -+ oldContext->makeCurrent(oldSurface); -+ -+ return vendor; -+} -+#endif -+ - } // namespace - - namespace QtWebEngineCore { -@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext() - const char *glType = 0; - #ifndef QT_NO_OPENGL - -+ bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU"); -+ -+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive)) -+ { -+ qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n" -+ "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n" -+ "environment variable before running this application, but this is \n" -+ "not recommended since this usually causes applications to crash."; -+ disableGpu = true; -+ } -+ -+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau")) -+ { -+ qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n" -+ "Note: you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n" -+ "environment variable before running this application, but this is \n" -+ "not recommended since this usually causes applications to crash as\n" -+ "Nouveau openGL drivers don't support multithreaded rendering"; -+ disableGpu = true; -+ } -+ - bool tryGL = - !usingANGLE() - && (!usingSoftwareDynamicGL() -@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext() - || enableWebGLSoftwareRendering - #endif - ) -- && !usingQtQuick2DRenderer(); -+ && !usingQtQuick2DRenderer() && !disableGpu; - - if (tryGL) { - if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) { diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch deleted file mode 100644 index 9866ab92..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix build with >=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 deleted file mode 100644 index ecedaf62..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/files/qtwebengine-5.9.4-jpeg-9-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch deleted file mode 100644 index 8b739680..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 Mon Sep 17 00:00:00 2001 -From: Viktor Engelmann -Date: Fri, 18 Aug 2017 14:50:20 +0200 -Subject: [PATCH] Fix improper boolean values - -jpeg_codec.cc contained some implicit conversions to boolean, which -is apparently problematic for some versions of libjpeg. Patch -taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191 -but not backported, since it has not been accepted into chromium yet. - -Task-Number: QTBUG-58482 - -Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4 -Reviewed-by: Allan Sandfeld Jensen ---- - src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -index 6d92637..85c7bec 100644 ---- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { - // tell libjpeg where to write the next data - cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; - cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used; -- return 1; -+ return TRUE; - } - - // Cleans up the JpegEncoderState to prepare for returning in the final form. -@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, - cinfo.data_precision = 8; - - jpeg_set_defaults(&cinfo); -- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100 -+ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100 - - // set up the destination manager - jpeg_destination_mgr destmgr; -@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, - JpegEncoderState state(output); - cinfo.client_data = &state; - -- jpeg_start_compress(&cinfo, 1); -+ jpeg_start_compress(&cinfo, TRUE); - - // feed it the rows, doing necessary conversions for the color format - #ifdef JCS_EXTENSIONS -@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) { - // set to a positive value if TRUE is returned. A FALSE return should only - // be used when I/O suspension is desired." - boolean FillInputBuffer(j_decompress_ptr cinfo) { -- return false; -+ return FALSE; - } - - // Skip data in the buffer. Since we have all the data at once, this operation -@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, - cinfo.client_data = &state; - - // fill the file metadata into our buffer -- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) -+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) - return false; - - // we want to always get RGB data out --- -2.7.4 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch deleted file mode 100644 index ef5f44ef..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix build with jpeg-9. Bug #646456 - ---- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-01-15 12:39:43.000000000 +0100 -+++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-02-06 20:55:37.455912163 +0100 -@@ -57,12 +57,12 @@ - }; - extern "C" { - static boolean _src_fill_buffer(j_decompress_ptr cinfo) { -- return 0; -+ return FALSE; - } - }; - extern "C" { - static boolean _src_resync(j_decompress_ptr cinfo, int desired) { -- return 0; -+ return FALSE; - } - }; - extern "C" { -@@ -126,7 +126,7 @@ - jpeg_destroy_decompress(&cinfo); - return false; - } -- int ret = jpeg_read_header(&cinfo, true); -+ int ret = jpeg_read_header(&cinfo, TRUE); - if (ret != JPEG_HEADER_OK) { - jpeg_destroy_decompress(&cinfo); - return false; -@@ -210,7 +210,7 @@ - } - cinfo.image_width = m_OrigWidth; - cinfo.image_height = m_OrigHeight; -- int ret = jpeg_read_header(&cinfo, true); -+ int ret = jpeg_read_header(&cinfo, TRUE); - if (ret != JPEG_HEADER_OK) - return false; - -@@ -433,7 +433,7 @@ - if (setjmp(ctx->m_JumpMark) == -1) - return 1; - -- int ret = jpeg_read_header(&ctx->m_Info, true); -+ int ret = jpeg_read_header(&ctx->m_Info, TRUE); - if (ret == JPEG_SUSPENDED) - return 2; - if (ret != JPEG_HEADER_OK) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch deleted file mode 100644 index ba6a49fd..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Fedora -Subject: Fix build for 32-bit platforms - -Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source? -https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch - -diff -up chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h ---- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400 -+++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 -@@ -18,7 +18,13 @@ - #endif - - // Like the C++11 |alignof| operator. --#if __cplusplus >= 201103L -+#if defined(__GNUC__) && __GNUC__ >= 8 -+// GCC 8 has changed the alignof operator to return the minimal alignment -+// required by the target ABI, instead of the preferred alignment. -+// This means that on 32-bit x86, it will return 4 instead of 8. -+// Use __alignof__ instead to avoid this. -+#define MOJO_ALIGNOF(type) __alignof__(type) -+#elif __cplusplus >= 201103L - #define MOJO_ALIGNOF(type) alignof(type) - #elif defined(__GNUC__) - #define MOJO_ALIGNOF(type) __alignof__(type) diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild deleted file mode 100644 index bc55f9cb..00000000 --- a/dev-qt/qtwebengine/qtwebengine-5.11.1-r1337.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# 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-r10000 - -DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" -REQUIRED_USE="designer? ( 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/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libvpx-1.5:=[svc] - media-libs/libwebp:= - media-libs/mesa[egl] - media-libs/opus - net-libs/libsrtp:0= - sys-apps/dbus - sys-apps/pciutils - sys-libs/libcap - sys-libs/zlib[minizip] - 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 ) - designer? ( ~dev-qt/designer-${PV} ) - 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}/${PN}-5.9.6-gcc8.patch" # bug 657124 - "${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078 - "${FILESDIR}/${P}-ffmpeg4.patch" - "${FILESDIR}/${P}-eglGetProcAddress-fallback-lookup.patch" # 5.11 branch - "${FILESDIR}/${P}-nouveau-disable-gpu.patch" # bug 609752 -) - -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 webengine-alsa src/core/config/linux.pri - qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri - - qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro - - 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-r10000_src_prepare -} - -src_configure() { - export NINJA_PATH=/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" - - local myqmakeargs=( - -- - -opus - -printing-and-pdf - -webp - $(usex alsa '-alsa' '') - $(usex bindist '' '-proprietary-codecs') - $(usex pulseaudio '-pulseaudio' '') - $(usex system-ffmpeg '-ffmpeg' '') - $(usex system-icu '-webengine-icu' '') - ) - qt5-build-r10000_src_configure -} - -src_install() { - qt5-build-r10000_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/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest deleted file mode 100644 index 2edec829..00000000 --- a/dev-qt/qtwebkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047 diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch deleted file mode 100644 index d8b5ba6c..00000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Fri, 26 Jan 2018 20:50:07 +0300 -Subject: [PATCH] Add missing #include - -Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f ---- - Source/WebCore/dom/SlotAssignment.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h -index 0fcd4dfa6de8..9b9ebe429816 100644 ---- a/Source/WebCore/dom/SlotAssignment.h -+++ b/Source/WebCore/dom/SlotAssignment.h -@@ -28,6 +28,7 @@ - - #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT) - -+#include - #include - #include - #include diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild deleted file mode 100644 index 98972468..00000000 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120-r1337.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da -CMAKE_MAKEFILE_GENERATOR="ninja" -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby24 ruby25" - -inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs - -DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" -HOMEPAGE="https://www.qt.io/" -SRC_URI="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD LGPL-2+" -SLOT="5/5.212" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" - -REQUIRED_USE=" - nsplugin? ( X ) - qml? ( opengl ) - ?? ( gstreamer multimedia ) -" - -# Dependencies found at Source/cmake/OptionsQt.cmake -QT_MIN_VER="5.9.1:5" -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/qtcore-${QT_MIN_VER} - >=dev-qt/qtgui-${QT_MIN_VER} - >=dev-qt/qtnetwork-${QT_MIN_VER} - >=dev-qt/qtwidgets-${QT_MIN_VER}= - media-libs/libpng:0= - virtual/jpeg:0 - geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-bad:1.0 - ) - hyphen? ( dev-libs/hyphen ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) - opengl? ( - >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] - >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] - ) - orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) - printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) - qml? ( - >=dev-qt/qtdeclarative-${QT_MIN_VER} - >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] - ) - webp? ( media-libs/libwebp:= ) - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ${RUBY_DEPS} - dev-lang/perl - dev-util/gperf - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig -" - -S=${WORKDIR}/${COMMIT} - -PATCHES=( "${FILESDIR}/${P}-functional.patch" ) - -CHECKREQS_DISK_BUILD="16G" # bug 417307 - -_check_reqs() { - if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then - einfo "Checking for sufficient disk space to build ${PN} with debugging flags" - check-reqs_$1 - fi -} - -pkg_pretend() { - _check_reqs pkg_pretend -} - -pkg_setup() { - _check_reqs pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - # Respect CC, otherwise fails on prefix, bug #395875 - tc-export CC - - # Multiple rendering bugs on youtube, github, etc without this, bug #547224 - append-flags $(test-flags -fno-strict-aliasing) - - local mycmakeargs=( - -DPORT=Qt - -DENABLE_API_TESTS=OFF - -DENABLE_GEOLOCATION=$(usex geolocation) - -DUSE_GSTREAMER=$(usex gstreamer) - -DENABLE_JIT=$(usex jit) - -DUSE_QT_MULTIMEDIA=$(usex multimedia) - -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_DEVICE_ORIENTATION=$(usex orientation) - -DENABLE_WEBKIT2=$(usex qml) - $(cmake-utils_use_find_package webp WebP) - -DENABLE_X11_TARGET=$(usex X) - ) - - if has_version "virtual/rubygems[ruby_targets_ruby25]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) - elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) ) - else - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) ) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # bug 572056 - if [[ ! -f ${ED%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then - eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." - die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' - fi -} diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest deleted file mode 100644 index eb54f4c3..00000000 --- a/dev-qt/qtwebsockets/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtwebsockets-everywhere-src-5.11.1.tar.xz 231468 BLAKE2B d115bd37e1223fd1333515c7abdacb01a9d2e38c847eb3b655b584ec8ea833634549c74c0483bcca25a5807c650c250301b02bb6b7d05e61bdef44062d95831a SHA512 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild deleted file mode 100644 index c78e6beb..00000000 --- a/dev-qt/qtwebsockets/qtwebsockets-5.11.1-r1337.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit qt5-build-r10000 - -DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -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-r10000_src_prepare -} diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest deleted file mode 100644 index 297e2c65..00000000 --- a/dev-qt/qtwidgets/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild deleted file mode 100644 index 886bc57b..00000000 --- a/dev-qt/qtwidgets/qtwidgets-5.11.1-r1337.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -src_configure() { - local myconf=( - -opengl $(usex gles2 es2 desktop) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon system) - $(usex xcb '-xcb-xlib -xinput2 -xkb' '') - ) - qt5-build-r10000_src_configure -} diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest deleted file mode 100644 index 6eab3c7e..00000000 --- a/dev-qt/qtx11extras/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtx11extras-everywhere-src-5.11.1.tar.xz 116368 BLAKE2B 49cc0cbc73719186d812b376b0ae02abf68bee2f22b03ca003761681af4585243c9388d13b3ce8a1257ced8b2a0db7b71188ef10925d123327606f2fad94b335 SHA512 a5acd182e06ced304bdb9d86982c3cdb826411ed4c888dfc530e5bf005f34ac9c58812bda3c98dde66eea372c7075f9eedd62a6e36cb8b549a56b8dc7a9b19af diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild deleted file mode 100644 index ffbd36c5..00000000 --- a/dev-qt/qtx11extras/qtx11extras-5.11.1-r1337.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit qt5-build-r10000 - -DESCRIPTION="Linux/X11-specific support library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -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 deleted file mode 100644 index 297e2c65..00000000 --- a/dev-qt/qtxml/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 diff --git a/dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild b/dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild deleted file mode 100644 index 79543d00..00000000 --- a/dev-qt/qtxml/qtxml-5.11.1-r1337.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -fi - -IUSE="" - -RDEPEND=" - ~dev-qt/qtcore-${PV} -" -DEPEND="${RDEPEND} - test? ( ~dev-qt/qtnetwork-${PV} ) -" - -QT5_TARGET_SUBDIRS=( - src/xml -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :xml -) diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest deleted file mode 100644 index 756ad4b1..00000000 --- a/dev-qt/qtxmlpatterns/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066 diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild deleted file mode 100644 index f0aa8d4d..00000000 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1-r1337.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit qt5-build-r10000 - -DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV} -" -RDEPEND="${DEPEND}" diff --git a/eclass/qt5-build-r10000.eclass b/eclass/qt5-build-r10000.eclass deleted file mode 100644 index 6cb8c2df..00000000 --- a/eclass/qt5-build-r10000.eclass +++ /dev/null @@ -1,862 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: qt5-build-r10000.eclass -# @MAINTAINER: -# qt@gentoo.org -# @AUTHOR: -# Davide Pesavento -# @SUPPORTED_EAPIS: 6 -# @BLURB: Eclass for Qt5 split ebuilds. -# @DESCRIPTION: -# This eclass contains various functions that are used when building Qt5. -# Requires EAPI 6. - -if [[ ${CATEGORY} != dev-qt ]]; then - die "qt5-build-r10000.eclass is only to be used for building Qt 5." -fi - -case ${EAPI} in - 6) : ;; - *) die "qt5-build-r10000.eclass: unsupported EAPI=${EAPI:-0}" ;; -esac - -# @ECLASS-VARIABLE: QT5_MODULE -# @PRE_INHERIT -# @DESCRIPTION: -# The upstream name of the module this package belongs to. Used for -# SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass. -: ${QT5_MODULE:=${PN}} - -# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Array variable containing the source directories that should be built. -# All paths must be relative to ${S}. - -# @ECLASS-VARIABLE: QT5_GENTOO_CONFIG -# @DEFAULT_UNSET -# @DESCRIPTION: -# Array of triplets that are evaluated in src_install -# to generate the per-package list of enabled QT_CONFIG features and macro -# definitions, which are then merged together with all other Qt5 packages -# installed on the system to obtain the global qconfig.{h,pri} files. - -# @ECLASS-VARIABLE: VIRTUALX_REQUIRED -# @DESCRIPTION: -# For proper description see virtualx.eclass man page. -# Here we redefine default value to be manual, if your package needs virtualx -# for tests you should proceed with setting VIRTUALX_REQUIRED=test. -: ${VIRTUALX_REQUIRED:=manual} - -inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx - -HOMEPAGE="https://www.qt.io/" -LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -SLOT=5/$(get_version_component_range 1-2) - -QT5_MINOR_VERSION=$(get_version_component_range 2) -QT5_PATCH_VERSION=$(get_version_component_range 3) -readonly QT5_MINOR_VERSION QT5_PATCH_VERSION - -case ${PV} in - 5.9999) - # git dev branch - QT5_BUILD_TYPE="live" - EGIT_BRANCH="dev" - ;; - 5.?.9999|5.??.9999|5.???.9999) - # git stable branch - QT5_BUILD_TYPE="live" - EGIT_BRANCH=${PV%.9999} - ;; - *_alpha*|*_beta*|*_rc*) - # development release - QT5_BUILD_TYPE="release" - - if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then - MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-} - else - MY_P=${QT5_MODULE}-opensource-src-${PV/_/-} - fi - - SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - ;; - *) - # official stable release - QT5_BUILD_TYPE="release" - - if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then - MY_P=${QT5_MODULE}-everywhere-src-${PV} - else - MY_P=${QT5_MODULE}-opensource-src-${PV} - fi - - SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - ;; -esac -readonly QT5_BUILD_TYPE - -EGIT_REPO_URI=( - "https://code.qt.io/qt/${QT5_MODULE}.git" - "https://github.com/qt/${QT5_MODULE}.git" -) -[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3 - -# @ECLASS-VARIABLE: QT5_BUILD_DIR -# @OUTPUT_VARIABLE -# @DESCRIPTION: -# Build directory for out-of-source builds. -case ${QT5_BUILD_TYPE} in - live) : ${QT5_BUILD_DIR:=${S}_build} ;; - release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312 -esac - -IUSE="debug test" - -[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584 -[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182 - -DEPEND=" - dev-lang/perl - virtual/pkgconfig -" -if [[ (${PN} != qttest && ${PN} != qtwebkit) || (${PN} == qtwebkit && ${QT5_MINOR_VERSION} -lt 9) ]]; then - DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" -fi -RDEPEND=" - dev-qt/qtchooser -" - - -###### Phase functions ###### - -EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm - -# @FUNCTION: qt5-build-r10000_src_unpack -# @DESCRIPTION: -# Unpacks the sources. -qt5-build-r10000_src_unpack() { - if tc-is-gcc; then - local min_gcc4_minor_version=7 - if [[ $(gcc-major-version) -lt 4 ]] || \ - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then - eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" - die "GCC 4.${min_gcc4_minor_version} or later required" - fi - fi - - # bug 307861 - if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." - ewarn - fi - eshopts_pop - fi - - case ${QT5_BUILD_TYPE} in - live) git-r3_src_unpack ;; - release) default ;; - esac -} - -# @FUNCTION: qt5-build-r10000_src_prepare -# @DESCRIPTION: -# Prepares the environment and patches the sources if necessary. -qt5-build-r10000_src_prepare() { - qt5_prepare_env - - if [[ ${QT5_MODULE} == qtbase ]]; then - qt5_symlink_tools_to_build_dir - - # Avoid unnecessary qmake recompilations - if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then - sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ - -e '/echo "Done."/a fi' \ - configure || die "sed failed (skip qmake bootstrap)" - else - sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ - configure || die "sed failed (skip qmake bootstrap)" - fi - - # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake - sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ - ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ - 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \ - -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \ - configure || die "sed failed (respect env for qmake build)" - sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ - qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)" - - # Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests - sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ - configure || die "sed failed (QMAKE_CONF_COMPILER)" - - if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then - # Respect toolchain and flags in config.tests - find config.tests/unix -name '*.test' -type f -execdir \ - sed -i -e 's/-nocache //' '{}' + || die - fi - - # Don't inject -msse/-mavx/... into CXXFLAGS when detecting - # compiler support for extended instruction sets (bug 552942) - find config.tests/common -name '*.pro' -type f -execdir \ - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die - - # Don't add -O3 to CXXFLAGS (bug 549140) - sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ - src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" - - # Respect build variables in configure tests (bug #639494) - if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then - sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die - fi - fi - - default -} - -# @FUNCTION: qt5-build-r10000_src_configure -# @DESCRIPTION: -# Runs qmake in the target directories. For packages -# in qtbase, ./configure is also run before qmake. -qt5-build-r10000_src_configure() { - if [[ ${QT5_MODULE} == qtbase ]]; then - qt5_base_configure - fi - - qt5_foreach_target_subdir qt5_qmake -} - -# @FUNCTION: qt5-build-r10000_src_compile -# @DESCRIPTION: -# Runs emake in the target directories. -qt5-build-r10000_src_compile() { - qt5_foreach_target_subdir emake -} - -# @FUNCTION: qt5-build-r10000_src_test -# @DESCRIPTION: -# Runs tests in the target directories. -qt5-build-r10000_src_test() { - # disable broken cmake tests (bug 474004) - local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake SUBDIRS-=installed_cmake) - - qt5_foreach_target_subdir qt5_qmake - qt5_foreach_target_subdir emake - - # create a custom testrunner script that correctly sets - # LD_LIBRARY_PATH before executing the given test - local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner - cat > "${testrunner}" <<-_EOF_ || die - #!/bin/sh - export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}" - "\$@" - _EOF_ - chmod +x "${testrunner}" - - set -- qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check - if [[ ${VIRTUALX_REQUIRED} == test ]]; then - virtx "$@" - else - "$@" - fi -} - -# @FUNCTION: qt5-build-r10000_src_install -# @DESCRIPTION: -# Runs emake install in the target directories. -qt5-build-r10000_src_install() { - qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install - - if [[ ${PN} == qtcore ]]; then - pushd "${QT5_BUILD_DIR}" >/dev/null || die - - set -- emake INSTALL_ROOT="${D}" \ - sub-qmake-qmake-aux-pro-install_subtargets \ - install_{syncqt,mkspecs} - - einfo "Running $*" - "$@" - - popd >/dev/null || die - - docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global - - # install an empty Gentoo/gentoo-qconfig.h in ${D} - # so that it's placed under package manager control - > "${T}"/gentoo-qconfig.h - ( - insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo - doins "${T}"/gentoo-qconfig.h - ) - - # include gentoo-qconfig.h at the beginning of QtCore/qconfig.h - sed -i -e '1i #include \n' \ - "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ - || die "sed failed (qconfig.h)" - - # install qtchooser configuration file - cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die - ${QT5_BINDIR} - ${QT5_LIBDIR} - _EOF_ - - ( - insinto /etc/xdg/qtchooser - doins "${T}/qt5-${CHOST}.conf" - ) - - # convenience symlinks - dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf - dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf - fi - - qt5_install_module_qconfigs - prune_libtool_files -} - -# @FUNCTION: qt5-build-r10000_pkg_postinst -# @DESCRIPTION: -# Regenerate configuration after installation or upgrade/downgrade. -qt5-build-r10000_pkg_postinst() { - qt5_regenerate_global_qconfigs -} - -# @FUNCTION: qt5-build-r10000_pkg_postrm -# @DESCRIPTION: -# Regenerate configuration when a module is completely removed. -qt5-build-r10000_pkg_postrm() { - if [[ -z ${REPLACED_BY_VERSION} && ${PN} != qtcore ]]; then - qt5_regenerate_global_qconfigs - fi -} - - -###### Public helpers ###### - -# @FUNCTION: qt_use -# @USAGE: [feature] [enableval] -# @DESCRIPTION: -# is the name of a flag in IUSE. -# -# Outputs "-${enableval}-${feature}" if is enabled, "-no-${feature}" -# otherwise. If [feature] is not specified, is used in its place. -# If [enableval] is not specified, the "-${enableval}" prefix is omitted. -qt_use() { - [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" - - usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}" -} - -# @FUNCTION: qt_use_compile_test -# @USAGE: [config] -# @DESCRIPTION: -# is the name of a flag in IUSE. -# [config] is the argument of qtCompileTest, defaults to . -# -# This function is useful to disable optional dependencies that are checked -# at qmake-time using the qtCompileTest() function. If is disabled, -# the compile test is skipped and the dependency is assumed to be unavailable, -# i.e. the corresponding feature will be disabled. Note that all invocations -# of this function must happen before calling qt5-build-r10000_src_configure. -qt_use_compile_test() { - [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" - - if ! use "$1"; then - mkdir -p "${QT5_BUILD_DIR}" || die - echo "CONFIG += done_config_${2:-$1}" >> "${QT5_BUILD_DIR}"/.qmake.cache || die - fi -} - -# @FUNCTION: qt_use_disable_config -# @USAGE: -# @DESCRIPTION: -# is the name of a flag in IUSE. -# is the (lowercase) name of a Qt5 config entry. -# is a list of one or more qmake project files. -# -# This function patches to treat as disabled -# when is disabled, otherwise it does nothing. -# This can be useful to avoid an automagic dependency when the config entry -# is enabled on the system but the corresponding USE flag is disabled. -qt_use_disable_config() { - [[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments" - - local flag=$1 - local config=$2 - shift 2 - - if ! use "${flag}"; then - echo "$@" | xargs sed -i -e "s/qtConfig(${config})/false/g" || die - fi -} - -# @FUNCTION: qt_use_disable_mod -# @USAGE: -# @DESCRIPTION: -# is the name of a flag in IUSE. -# is the (lowercase) name of a Qt5 module. -# is a list of one or more qmake project files. -# -# This function patches to treat as not installed -# when is disabled, otherwise it does nothing. -# This can be useful to avoid an automagic dependency when the module -# is present on the system but the corresponding USE flag is disabled. -qt_use_disable_mod() { - [[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments" - - local flag=$1 - local module=$2 - shift 2 - - if ! use "${flag}"; then - echo "$@" | xargs sed -i -e "s/qtHaveModule(${module})/false/g" || die - fi -} - - -###### Internal functions ###### - -# @FUNCTION: qt5_prepare_env -# @INTERNAL -# @DESCRIPTION: -# Prepares the environment for building Qt. -qt5_prepare_env() { - # setup installation directories - # note: keep paths in sync with qmake-utils.eclass - QT5_PREFIX=${EPREFIX}/usr - QT5_HEADERDIR=${QT5_PREFIX}/include/qt5 - QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir) - QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5 - QT5_BINDIR=${QT5_ARCHDATADIR}/bin - QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins - QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec - QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports - QT5_QMLDIR=${QT5_ARCHDATADIR}/qml - QT5_DATADIR=${QT5_PREFIX}/share/qt5 - QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} - QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations - QT5_EXAMPLESDIR=${QT5_DATADIR}/examples - QT5_TESTSDIR=${QT5_DATADIR}/tests - QT5_SYSCONFDIR=${EPREFIX}/etc/xdg - readonly QT5_PREFIX QT5_HEADERDIR QT5_LIBDIR QT5_ARCHDATADIR \ - QT5_BINDIR QT5_PLUGINDIR QT5_LIBEXECDIR QT5_IMPORTDIR \ - QT5_QMLDIR QT5_DATADIR QT5_DOCDIR QT5_TRANSLATIONDIR \ - QT5_EXAMPLESDIR QT5_TESTSDIR QT5_SYSCONFDIR - - if [[ ${QT5_MODULE} == qtbase ]]; then - # see mkspecs/features/qt_config.prf - export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" - fi -} - -# @FUNCTION: qt5_foreach_target_subdir -# @INTERNAL -# @DESCRIPTION: -# Executes the command given as argument from inside each directory -# listed in QT5_TARGET_SUBDIRS. Handles autotests subdirs automatically. -qt5_foreach_target_subdir() { - [[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("") - - local subdir= - for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do - if [[ ${EBUILD_PHASE} == test ]]; then - subdir=tests/auto${subdir#src} - [[ -d ${S}/${subdir} ]] || continue - fi - - local msg="Running $* ${subdir:+in ${subdir}}" - einfo "${msg}" - - mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die -n || return $? - pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die -n || return $? - - "$@" || die -n "${msg} failed" || return $? - - popd >/dev/null || die -n || return $? - done -} - -# @FUNCTION: qt5_symlink_tools_to_build_dir -# @INTERNAL -# @DESCRIPTION: -# Symlinks qmake and a few other tools to QT5_BUILD_DIR, -# so that they can be used when building other modules. -qt5_symlink_tools_to_build_dir() { - local tool= tools=() - if [[ ${PN} != qtcore ]]; then - tools+=(qmake moc rcc qlalr) - [[ ${PN} != qtdbus ]] && tools+=(qdbuscpp2xml qdbusxml2cpp) - [[ ${PN} != qtwidgets ]] && tools+=(uic) - fi - - mkdir -p "${QT5_BUILD_DIR}"/bin || die - pushd "${QT5_BUILD_DIR}"/bin >/dev/null || die - - for tool in "${tools[@]}"; do - [[ -e ${QT5_BINDIR}/${tool} ]] || continue - ln -s "${QT5_BINDIR}/${tool}" . || die "failed to symlink ${tool}" - done - - popd >/dev/null || die -} - -# @FUNCTION: qt5_base_configure -# @INTERNAL -# @DESCRIPTION: -# Runs ./configure for modules belonging to qtbase. -qt5_base_configure() { - # setup toolchain variables used by configure - tc-export AR CC CXX OBJDUMP RANLIB STRIP - export LD="$(tc-getCXX)" - - # bug 633838 - if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then - unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES - fi - - # configure arguments - local conf=( - # installation paths - -prefix "${QT5_PREFIX}" - -bindir "${QT5_BINDIR}" - -headerdir "${QT5_HEADERDIR}" - -libdir "${QT5_LIBDIR}" - -archdatadir "${QT5_ARCHDATADIR}" - -plugindir "${QT5_PLUGINDIR}" - -libexecdir "${QT5_LIBEXECDIR}" - -importdir "${QT5_IMPORTDIR}" - -qmldir "${QT5_QMLDIR}" - -datadir "${QT5_DATADIR}" - -docdir "${QT5_DOCDIR}" - -translationdir "${QT5_TRANSLATIONDIR}" - -sysconfdir "${QT5_SYSCONFDIR}" - -examplesdir "${QT5_EXAMPLESDIR}" - -testsdir "${QT5_TESTSDIR}" - - # configure in release mode by default, - # override via the CONFIG qmake variable - -release - -no-separate-debug-info - - # no need to forcefully build host tools in optimized mode, - # just follow the overall debug/release build type - -no-optimized-tools - - # licensing stuff - -opensource -confirm-license - - # autodetect the highest supported version of the C++ standard - #-c++std - - # build shared libraries - -shared - - # always enable large file support - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -largefile) - - # disabling accessibility is not recommended by upstream, as - # it will break QStyle and may break other internal parts of Qt - -accessibility - - # disable all SQL drivers by default, override in qtsql - -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc - -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds - - # ensure the QML debugging support (qmltooling) is built in qtdeclarative - $([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug) - - # MIPS DSP instruction set extensions - $(is-flagq -mno-dsp && echo -no-mips_dsp) - $(is-flagq -mno-dspr2 && echo -no-mips_dspr2) - - # use pkg-config to detect include and library paths - -pkg-config - - # prefer system libraries (only common hard deps here) - -system-zlib - -system-pcre - -system-doubleconversion - - # disable everything to prevent automagic deps (part 1) - -no-mtdev - -no-journald -no-syslog - -no-libpng -no-libjpeg - -no-freetype -no-harfbuzz - -no-openssl -no-libproxy - -no-xkbcommon-x11 -no-xkbcommon-evdev - -no-xinput2 -no-xcb-xlib - - # cannot use -no-gif because there is no way to override it later - #-no-gif - - # always enable glib event loop support - -glib - - # disable everything to prevent automagic deps (part 2) - -no-gtk - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa) - - # exclude examples and tests from default build - -nomake examples - -nomake tests - -no-compile-examples - - # disable rpath on non-prefix (bugs 380415 and 417169) - $(usex prefix '' -no-rpath) - - # print verbose information about each configure test - -verbose - - # always enable iconv support - # since 5.8 this is handled in qtcore - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv) - - # disable everything to prevent automagic deps (part 3) - -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus - - # let portage handle stripping - -no-strip - - # precompiled headers can cause problems on hardened, so turn them off - -no-pch - - # link-time code generation is not something we want to enable by default - -no-ltcg - - # reduced relocations cause major breakage on at least arm and ppc, so - # don't specify anything and let the configure figure out if they are - # supported; see also https://bugreports.qt.io/browse/QTBUG-36129 - #-reduce-relocations - - # use the system linker (gold will be selected automagically otherwise) - $(tc-ld-is-gold && echo -use-gold-linker || echo -no-use-gold-linker) - - # disable all platform plugins by default, override in qtgui - -no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb -no-mirclient - - # disable undocumented X11-related flags, override in qtgui - # (not shown in ./configure -help output) - -no-xkb - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-xrender) - - # disable obsolete/unused X11-related flags - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync) - - # always enable session management support: it doesn't need extra deps - # at configure time and turning it off is dangerous, see bug 518262 - -sm - - # typedef qreal to double (warning: changing this flag breaks the ABI) - -qreal double - - # disable OpenGL and EGL support by default, override in qtgui, - # qtopengl, qtprintsupport and qtwidgets - -no-opengl -no-egl - - # disable libinput-based generic plugin by default, override in qtgui - -no-libinput - - # disable gstreamer by default, override in qtmultimedia - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer) - - # respect system proxies by default: it's the most natural - # setting, and it'll become the new upstream default in 5.8 - -system-proxies - - # do not build with -Werror - -no-warnings-are-errors - - # module-specific options - "${myconf[@]}" - ) - - pushd "${QT5_BUILD_DIR}" >/dev/null || die - - einfo "Configuring with: ${conf[@]}" - "${S}"/configure "${conf[@]}" || die "configure failed" - - if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then - # a forwarding header is no longer created since 5.8, causing the system - # config to always be used. bug 599636 - cp src/corelib/global/qconfig.h include/QtCore/ || die - fi - - popd >/dev/null || die - -} - -# @FUNCTION: qt5_qmake_args -# @INTERNAL -# @DESCRIPTION: -# Helper function to get the various toolchain-related variables. -qt5_qmake_args() { - echo \ - QMAKE_AR=\"$(tc-getAR)\" \ - QMAKE_CC=\"$(tc-getCC)\" \ - QMAKE_LINK_C=\"$(tc-getCC)\" \ - QMAKE_LINK_C_SHLIB=\"$(tc-getCC)\" \ - QMAKE_CXX=\"$(tc-getCXX)\" \ - QMAKE_LINK=\"$(tc-getCXX)\" \ - QMAKE_LINK_SHLIB=\"$(tc-getCXX)\" \ - QMAKE_OBJCOPY=\"$(tc-getOBJCOPY)\" \ - QMAKE_RANLIB= \ - QMAKE_STRIP=\"$(tc-getSTRIP)\" \ - QMAKE_CFLAGS=\"${CFLAGS}\" \ - QMAKE_CFLAGS_RELEASE= \ - QMAKE_CFLAGS_DEBUG= \ - QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \ - QMAKE_CXXFLAGS_RELEASE= \ - QMAKE_CXXFLAGS_DEBUG= \ - QMAKE_LFLAGS=\"${LDFLAGS}\" \ - QMAKE_LFLAGS_RELEASE= \ - QMAKE_LFLAGS_DEBUG= -} - -# @FUNCTION: qt5_qmake -# @INTERNAL -# @DESCRIPTION: -# Helper function that runs qmake in the current target subdir. -# Intended to be called by qt5_foreach_target_subdir(). -qt5_qmake() { - local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}} - local qmakepath= - if [[ ${QT5_MODULE} == qtbase ]]; then - qmakepath=${QT5_BUILD_DIR}/bin - else - qmakepath=${QT5_BINDIR} - fi - - "${qmakepath}"/qmake \ - "${projectdir}" \ - CONFIG+=$(usex debug debug release) \ - CONFIG-=$(usex debug release debug) \ - QMAKE_AR="$(tc-getAR) cqs" \ - QMAKE_CC="$(tc-getCC)" \ - QMAKE_LINK_C="$(tc-getCC)" \ - QMAKE_LINK_C_SHLIB="$(tc-getCC)" \ - QMAKE_CXX="$(tc-getCXX)" \ - QMAKE_LINK="$(tc-getCXX)" \ - QMAKE_LINK_SHLIB="$(tc-getCXX)" \ - QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ - QMAKE_RANLIB= \ - QMAKE_STRIP="$(tc-getSTRIP)" \ - QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CFLAGS_RELEASE= \ - QMAKE_CFLAGS_DEBUG= \ - QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_CXXFLAGS_RELEASE= \ - QMAKE_CXXFLAGS_DEBUG= \ - QMAKE_LFLAGS="${LDFLAGS}" \ - QMAKE_LFLAGS_RELEASE= \ - QMAKE_LFLAGS_DEBUG= \ - "${myqmakeargs[@]}" \ - || die "qmake failed (${projectdir#${S}/})" -} - -# @FUNCTION: qt5_install_module_qconfigs -# @INTERNAL -# @DESCRIPTION: -# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files. -qt5_install_module_qconfigs() { - local x qconfig_add= qconfig_remove= - - > "${T}"/${PN}-qconfig.h - > "${T}"/${PN}-qconfig.pri - - # generate qconfig_{add,remove} and ${PN}-qconfig.h - for x in "${QT5_GENTOO_CONFIG[@]}"; do - local flag=${x%%:*} - x=${x#${flag}:} - local feature=${x%%:*} - x=${x#${feature}:} - local macro=${x} - macro=$(tr 'a-z-' 'A-Z_' <<< "${macro}") - - if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then - [[ -n ${feature} ]] && qconfig_add+=" ${feature}" - [[ -n ${macro} ]] && echo "#define QT_${macro}" >> "${T}"/${PN}-qconfig.h - else - [[ -n ${feature} ]] && qconfig_remove+=" ${feature}" - [[ -n ${macro} ]] && echo "#define QT_NO_${macro}" >> "${T}"/${PN}-qconfig.h - fi - done - - # install ${PN}-qconfig.h - [[ -s ${T}/${PN}-qconfig.h ]] && ( - insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo - doins "${T}"/${PN}-qconfig.h - ) - - # generate and install ${PN}-qconfig.pri - [[ -n ${qconfig_add} ]] && echo "QCONFIG_ADD=${qconfig_add}" >> "${T}"/${PN}-qconfig.pri - [[ -n ${qconfig_remove} ]] && echo "QCONFIG_REMOVE=${qconfig_remove}" >> "${T}"/${PN}-qconfig.pri - [[ -s ${T}/${PN}-qconfig.pri ]] && ( - insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo - doins "${T}"/${PN}-qconfig.pri - ) - - if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then - insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo - newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri - fi -} - -# @FUNCTION: qt5_regenerate_global_qconfigs -# @INTERNAL -# @DESCRIPTION: -# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration. -# Don't call die here because dying in pkg_post{inst,rm} only makes things worse. -qt5_regenerate_global_qconfigs() { - einfo "Regenerating gentoo-qconfig.h" - - find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \ - -name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \ - -execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h - - [[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty" - mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \ - || eerror "Failed to install new gentoo-qconfig.h" - - einfo "Updating QT_CONFIG in qconfig.pri" - - local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri - local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri - if [[ -f ${qconfig_pri} ]]; then - local x qconfig_add= qconfig_remove= - if [[ -f ${qconfig_pri_orig} ]]; then - local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") - else - local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") - fi - local new_qt_config= - - # generate list of QT_CONFIG entries from the existing list, - # appending QCONFIG_ADD and excluding QCONFIG_REMOVE - eshopts_push -s nullglob - for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do - qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=\s*//p' "${x}")" - qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=\s*//p' "${x}")" - done - eshopts_pop - for x in ${qt_config} ${qconfig_add}; do - if ! has "${x}" ${new_qt_config} ${qconfig_remove}; then - new_qt_config+=" ${x}" - fi - done - - # now replace the existing QT_CONFIG with the generated list - sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \ - "${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}" - else - ewarn "${qconfig_pri} or ${qconfig_pri_orig} does not exist or is not a regular file" - fi -} -- cgit v1.2.3