From e98e69391231e8eb88b05a316e8181f2b8cc9a9b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Apr 2018 00:11:04 +0100 Subject: Revert "dev-qt : bump to 5.9.5" This reverts commit e237be2025e6eb302f4267576a245b7c65576ebc. --- dev-qt/designer/Manifest | 2 +- dev-qt/designer/designer-5.9.3-r1000.ebuild | 40 +++++ dev-qt/designer/designer-5.9.5-r1000.ebuild | 57 ------- dev-qt/linguist-tools/Manifest | 2 +- .../linguist-tools-5.9.3-r1000.ebuild | 35 +++++ .../linguist-tools-5.9.5-r1000.ebuild | 35 ----- dev-qt/qtbluetooth/Manifest | 2 +- dev-qt/qtbluetooth/qtbluetooth-5.9.3-r1000.ebuild | 33 +++++ dev-qt/qtbluetooth/qtbluetooth-5.9.5-r1000.ebuild | 33 ----- dev-qt/qtcharts/Manifest | 2 +- dev-qt/qtcharts/qtcharts-5.9.3-r1000.ebuild | 29 ++++ dev-qt/qtcharts/qtcharts-5.9.5-r1000.ebuild | 29 ---- dev-qt/qtconcurrent/Manifest | 2 +- .../qtconcurrent/qtconcurrent-5.9.3-r1000.ebuild | 23 +++ .../qtconcurrent/qtconcurrent-5.9.5-r1000.ebuild | 23 --- dev-qt/qtcore/Manifest | 2 +- dev-qt/qtcore/files/qtcore-5.9.3-avx.patch | 69 +++++++++ dev-qt/qtcore/qtcore-5.9.3-r1000.ebuild | 68 +++++++++ dev-qt/qtcore/qtcore-5.9.5-r1000.ebuild | 66 --------- dev-qt/qtdbus/Manifest | 2 +- dev-qt/qtdbus/qtdbus-5.9.3-r1000.ebuild | 38 +++++ dev-qt/qtdbus/qtdbus-5.9.5-r1000.ebuild | 38 ----- dev-qt/qtdeclarative/Manifest | 2 +- .../qtdeclarative-5.9.5-texture-memleak.patch | 59 -------- .../qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild | 56 +++++++ .../qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild | 58 -------- dev-qt/qtgraphicaleffects/Manifest | 2 +- .../qtgraphicaleffects-5.9.3-r1000.ebuild | 21 +++ .../qtgraphicaleffects-5.9.5-r1000.ebuild | 21 --- dev-qt/qtgui/Manifest | 2 +- dev-qt/qtgui/qtgui-5.9.3-r1000.ebuild | 164 +++++++++++++++++++++ dev-qt/qtgui/qtgui-5.9.5-r1000.ebuild | 164 --------------------- dev-qt/qthelp/Manifest | 2 +- dev-qt/qthelp/qthelp-5.9.3-r1000.ebuild | 30 ++++ dev-qt/qthelp/qthelp-5.9.5-r1000.ebuild | 30 ---- dev-qt/qtmultimedia/Manifest | 2 +- .../qtmultimedia/qtmultimedia-5.9.3-r1000.ebuild | 65 ++++++++ .../qtmultimedia/qtmultimedia-5.9.5-r1000.ebuild | 65 -------- dev-qt/qtnetwork/Manifest | 2 +- dev-qt/qtnetwork/qtnetwork-5.9.3-r1000.ebuild | 53 +++++++ dev-qt/qtnetwork/qtnetwork-5.9.5-r1000.ebuild | 53 ------- dev-qt/qtopengl/Manifest | 2 +- dev-qt/qtopengl/qtopengl-5.9.3-r1000.ebuild | 34 +++++ dev-qt/qtopengl/qtopengl-5.9.5-r1000.ebuild | 34 ----- dev-qt/qtpositioning/Manifest | 2 +- .../qtpositioning/qtpositioning-5.9.3-r1000.ebuild | 37 +++++ .../qtpositioning/qtpositioning-5.9.5-r1000.ebuild | 37 ----- dev-qt/qtprintsupport/Manifest | 2 +- .../qtprintsupport-5.9.3-r1000.ebuild | 42 ++++++ .../qtprintsupport-5.9.5-r1000.ebuild | 42 ------ dev-qt/qtquickcontrols/Manifest | 2 +- .../qtquickcontrols-5.9.3-r1000.ebuild | 32 ++++ .../qtquickcontrols-5.9.5-r1000.ebuild | 32 ---- dev-qt/qtquickcontrols2/Manifest | 2 +- .../qtquickcontrols2-5.9.3-r1000.ebuild | 30 ++++ .../qtquickcontrols2-5.9.5-r1000.ebuild | 30 ---- dev-qt/qtscript/Manifest | 2 +- dev-qt/qtscript/qtscript-5.9.3-r1000.ebuild | 36 +++++ dev-qt/qtscript/qtscript-5.9.5-r1000.ebuild | 36 ----- dev-qt/qtsensors/Manifest | 2 +- dev-qt/qtsensors/qtsensors-5.9.3-r1000.ebuild | 28 ++++ dev-qt/qtsensors/qtsensors-5.9.5-r1000.ebuild | 28 ---- dev-qt/qtsql/Manifest | 2 +- dev-qt/qtsql/qtsql-5.9.3-r1000.ebuild | 53 +++++++ dev-qt/qtsql/qtsql-5.9.5-r1000.ebuild | 53 ------- dev-qt/qtsvg/Manifest | 2 +- dev-qt/qtsvg/qtsvg-5.9.3-r1000.ebuild | 23 +++ dev-qt/qtsvg/qtsvg-5.9.5-r1000.ebuild | 23 --- dev-qt/qttest/Manifest | 2 +- dev-qt/qttest/qttest-5.9.3-r1000.ebuild | 29 ++++ dev-qt/qttest/qttest-5.9.5-r1000.ebuild | 29 ---- dev-qt/qttranslations/Manifest | 2 +- .../qttranslations-5.9.3-r1000.ebuild | 19 +++ .../qttranslations-5.9.5-r1000.ebuild | 19 --- dev-qt/qtwayland/Manifest | 2 +- dev-qt/qtwayland/qtwayland-5.9.3-r1000.ebuild | 39 +++++ dev-qt/qtwayland/qtwayland-5.9.5-r1000.ebuild | 39 ----- dev-qt/qtwebchannel/Manifest | 2 +- .../qtwebchannel/qtwebchannel-5.9.3-r1000.ebuild | 26 ++++ .../qtwebchannel/qtwebchannel-5.9.5-r1000.ebuild | 26 ---- dev-qt/qtwebengine/Manifest | 2 +- .../files/qtwebengine-5.9.4-jpeg-9-1.patch | 70 --------- .../files/qtwebengine-5.9.4-jpeg-9-2.patch | 46 ------ dev-qt/qtwebengine/qtwebengine-5.9.3-r1000.ebuild | 122 +++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.9.5-r1000.ebuild | 127 ---------------- dev-qt/qtwebsockets/Manifest | 2 +- .../qtwebsockets/qtwebsockets-5.9.3-r1000.ebuild | 27 ++++ .../qtwebsockets/qtwebsockets-5.9.5-r1000.ebuild | 27 ---- dev-qt/qtwidgets/Manifest | 2 +- dev-qt/qtwidgets/qtwidgets-5.9.3-r1000.ebuild | 50 +++++++ dev-qt/qtwidgets/qtwidgets-5.9.5-r1000.ebuild | 50 ------- dev-qt/qtx11extras/Manifest | 2 +- dev-qt/qtx11extras/qtx11extras-5.9.3-r1000.ebuild | 21 +++ dev-qt/qtx11extras/qtx11extras-5.9.5-r1000.ebuild | 21 --- dev-qt/qtxml/Manifest | 2 +- dev-qt/qtxml/qtxml-5.9.3-r1000.ebuild | 25 ++++ dev-qt/qtxml/qtxml-5.9.5-r1000.ebuild | 25 ---- dev-qt/qtxmlpatterns/Manifest | 2 +- .../qtxmlpatterns/qtxmlpatterns-5.9.3-r1000.ebuild | 19 +++ .../qtxmlpatterns/qtxmlpatterns-5.9.5-r1000.ebuild | 19 --- 100 files changed, 1448 insertions(+), 1576 deletions(-) create mode 100644 dev-qt/designer/designer-5.9.3-r1000.ebuild delete mode 100644 dev-qt/designer/designer-5.9.5-r1000.ebuild create mode 100644 dev-qt/linguist-tools/linguist-tools-5.9.3-r1000.ebuild delete mode 100644 dev-qt/linguist-tools/linguist-tools-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtbluetooth/qtbluetooth-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtbluetooth/qtbluetooth-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtcharts/qtcharts-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtcharts/qtcharts-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtconcurrent/qtconcurrent-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtconcurrent/qtconcurrent-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtcore/files/qtcore-5.9.3-avx.patch create mode 100644 dev-qt/qtcore/qtcore-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtdbus/qtdbus-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtdbus/qtdbus-5.9.5-r1000.ebuild delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch create mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtgui/qtgui-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtgui/qtgui-5.9.5-r1000.ebuild create mode 100644 dev-qt/qthelp/qthelp-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qthelp/qthelp-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtnetwork/qtnetwork-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtnetwork/qtnetwork-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtopengl/qtopengl-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtopengl/qtopengl-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtpositioning/qtpositioning-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtpositioning/qtpositioning-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtprintsupport/qtprintsupport-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtprintsupport/qtprintsupport-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtquickcontrols/qtquickcontrols-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtquickcontrols/qtquickcontrols-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtscript/qtscript-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtscript/qtscript-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtsensors/qtsensors-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtsensors/qtsensors-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtsql/qtsql-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtsql/qtsql-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtsvg/qtsvg-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtsvg/qtsvg-5.9.5-r1000.ebuild create mode 100644 dev-qt/qttest/qttest-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qttest/qttest-5.9.5-r1000.ebuild create mode 100644 dev-qt/qttranslations/qttranslations-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qttranslations/qttranslations-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtwayland/qtwayland-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtwayland/qtwayland-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtwebchannel/qtwebchannel-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtwebchannel/qtwebchannel-5.9.5-r1000.ebuild 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 create mode 100644 dev-qt/qtwebengine/qtwebengine-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtwebengine/qtwebengine-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtwidgets/qtwidgets-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtx11extras/qtx11extras-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtx11extras/qtx11extras-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtxml/qtxml-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtxml/qtxml-5.9.5-r1000.ebuild create mode 100644 dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3-r1000.ebuild delete mode 100644 dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.5-r1000.ebuild diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest index 7d05c46f..0e0d4950 100644 --- a/dev-qt/designer/Manifest +++ b/dev-qt/designer/Manifest @@ -1 +1 @@ -DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e +DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f diff --git a/dev-qt/designer/designer-5.9.3-r1000.ebuild b/dev-qt/designer/designer-5.9.3-r1000.ebuild new file mode 100644 index 00000000..c1d1f1af --- /dev/null +++ b/dev-qt/designer/designer-5.9.3-r1000.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-r10000 + +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-r10000_src_prepare +} diff --git a/dev-qt/designer/designer-5.9.5-r1000.ebuild b/dev-qt/designer/designer-5.9.5-r1000.ebuild deleted file mode 100644 index 38ce5cd0..00000000 --- a/dev-qt/designer/designer-5.9.5-r1000.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" -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 index 7d05c46f..0e0d4950 100644 --- a/dev-qt/linguist-tools/Manifest +++ b/dev-qt/linguist-tools/Manifest @@ -1 +1 @@ -DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e +DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.3-r1000.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.3-r1000.ebuild new file mode 100644 index 00000000..98f11ed5 --- /dev/null +++ b/dev-qt/linguist-tools/linguist-tools-5.9.3-r1000.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-r10000 + +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-r10000_src_prepare +} diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.5-r1000.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.5-r1000.ebuild deleted file mode 100644 index 98f11ed5..00000000 --- a/dev-qt/linguist-tools/linguist-tools-5.9.5-r1000.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 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" -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/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest index 6ead9fa8..4ec7756a 100644 --- a/dev-qt/qtbluetooth/Manifest +++ b/dev-qt/qtbluetooth/Manifest @@ -1 +1 @@ -DIST qtconnectivity-opensource-src-5.9.5.tar.xz 2712036 BLAKE2B 2f0eae70d857f0804660da5fc1e134d8bc1d27dd6a2e725d182b8e856ecd47a0b51a928ef1e1a371da48f9bcb831bec9858d5df837eae38c256f29e52fc7accf SHA512 def2dd384c50667eff73aea5a905dd004c39b975826713f6ef2b28bb041e8c1a85252220c7d8f491e0c2eb967ca055af29b9cf902d4dd187ffb6e7380c9d21f0 +DIST qtconnectivity-opensource-src-5.9.3.tar.xz 2723456 BLAKE2B b3b18b90d09b612789b65a14937178ebde2ff423ef7931d2b4272f5f61b7fc9df52645d888e10fa135d03a72fcedb398ce95ddd7916a8382b35d6bc3cf79a179 SHA512 28fe6ac8e9480e52cffec7bddd6db95ed4bc96858e7b7e6f1ecb325f2ebb48442f7ec3e820579e9c0654aac48ee91ad734e51f0eb65faeaa592eb7a0875854f5 diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.3-r1000.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.3-r1000.ebuild new file mode 100644 index 00000000..66bece29 --- /dev/null +++ b/dev-qt/qtbluetooth/qtbluetooth-5.9.3-r1000.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-r10000 + +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-r10000_src_prepare +} diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.5-r1000.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.5-r1000.ebuild deleted file mode 100644 index 66bece29..00000000 --- a/dev-qt/qtbluetooth/qtbluetooth-5.9.5-r1000.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 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" -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 index 01e5312b..66e8bc45 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -1 +1 @@ -DIST qtcharts-opensource-src-5.9.5.tar.xz 4155904 BLAKE2B 991b535139d7cd7b4b9d8e6f954af2a99dfc504d4d040a9e44e43a85d6d5b175b27b42ebda3b5eabd56e476266d93f9488823a1ea564b4ff0e11a79593b2fbed SHA512 bbb2f8056d42293d71d82799a18d2a0d9444ef52572972603332899e94f0c1730a5a4bd227e97879591b03c4eb0872184fecbc0e925287856247172d812febab +DIST qtcharts-opensource-src-5.9.3.tar.xz 4157772 BLAKE2B 9f1c783e89848bde42978a8f4a307cd8ba8e4d5bffd012f3e1953b8825a598f12f4fd6274bcdf9e719c0130a1e0e33dcc706789ef7017cc2645426e0725a03d5 SHA512 394806f9e2abfe5c36772efdbad576f7b8372f8cdd3e171bca320b8e35159f11a8022752f789038f98a63c448473200fcdc8b636781af8a417dce30184402355 diff --git a/dev-qt/qtcharts/qtcharts-5.9.3-r1000.ebuild b/dev-qt/qtcharts/qtcharts-5.9.3-r1000.ebuild new file mode 100644 index 00000000..90eac620 --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-5.9.3-r1000.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 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" +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/qtcharts/qtcharts-5.9.5-r1000.ebuild b/dev-qt/qtcharts/qtcharts-5.9.5-r1000.ebuild deleted file mode 100644 index 90eac620..00000000 --- a/dev-qt/qtcharts/qtcharts-5.9.5-r1000.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 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" -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 index 0381b6db..44ceaa0b 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1 +1 @@ -DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.3-r1000.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.3-r1000.ebuild new file mode 100644 index 00000000..4d470735 --- /dev/null +++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.3-r1000.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-r10000 + +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/qtconcurrent/qtconcurrent-5.9.5-r1000.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.5-r1000.ebuild deleted file mode 100644 index 4d470735..00000000 --- a/dev-qt/qtconcurrent/qtconcurrent-5.9.5-r1000.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -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 index 0381b6db..44ceaa0b 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1 +1 @@ -DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch new file mode 100644 index 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-r1000.ebuild b/dev-qt/qtcore/qtcore-5.9.3-r1000.ebuild new file mode 100644 index 00000000..58ee5179 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.9.3-r1000.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-r10000 + +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-r10000_src_configure +} + +src_install() { + qt5-build-r10000_src_install + + local flags=( + ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE + HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM + OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR + XFIXES XKB XRANDR XRENDER XSYNC ZLIB + ) + + for flag in ${flags[@]}; do + cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.9.5-r1000.ebuild b/dev-qt/qtcore/qtcore-5.9.5-r1000.ebuild deleted file mode 100644 index 6b17e40a..00000000 --- a/dev-qt/qtcore/qtcore-5.9.5-r1000.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -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}" - -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-r10000_src_configure -} - -src_install() { - qt5-build-r10000_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 index 0381b6db..44ceaa0b 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1 +1 @@ -DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c diff --git a/dev-qt/qtdbus/qtdbus-5.9.3-r1000.ebuild b/dev-qt/qtdbus/qtdbus-5.9.3-r1000.ebuild new file mode 100644 index 00000000..00ef1532 --- /dev/null +++ b/dev-qt/qtdbus/qtdbus-5.9.3-r1000.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-r10000 + +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-r10000_src_configure +} diff --git a/dev-qt/qtdbus/qtdbus-5.9.5-r1000.ebuild b/dev-qt/qtdbus/qtdbus-5.9.5-r1000.ebuild deleted file mode 100644 index 00ef1532..00000000 --- a/dev-qt/qtdbus/qtdbus-5.9.5-r1000.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -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-r10000_src_configure -} diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index bec84aca..ece3b29a 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1 +1 @@ -DIST qtdeclarative-opensource-src-5.9.5.tar.xz 21413796 BLAKE2B d8b365654eda101d5fa62736d6ed523c097310cce8c9a1ed4854b694903f9084aebf408c8f4a6a021175d6ee00763928201a071a798caf46c4245a9fda45436a SHA512 0d04b9f7ee299d1bad125dd839cac850c11ee8dff06192852489c5e8c8054b5b6e256bc20866ce45e3dad3eb0e11796994d649052645c6ff6fb289485038dcd4 +DIST qtdeclarative-opensource-src-5.9.3.tar.xz 21443328 BLAKE2B acf201966b55f748e516d0f32c2fae0c3990d00ff5b2f31d72d012840ecff4328ba693eb96a800fa6eaefad285a72edfbaae93343e4d664792c561e78ba56882 SHA512 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch deleted file mode 100644 index c2a143ec..00000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 839f09c65523fb5c419b62e078f72bb39285449a Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Wed, 28 Mar 2018 00:24:56 +0100 -Subject: [PATCH] Avoid marking hidden windows as updatePending in Gui render - loop - -Since eeb320bbd8763f3e72f79369cc3908e999a0da3c the GL context only -deletes textures when all windows with pending updates have finished -rendering. - -renderWindow will not process any window that is not visible. This -leaves a logic bug that we can have the updatePending flag set but -never cleared. - -If we have two windows, this leaves the other window still updating -normally, but lastDirtyWindow will always be false and we never call -endSync. - -This results in an effective memory leak of all textures. - -This patch resets the flag on hide() a move that can be considered safe -given the show() method will reset this flag anyway. - -Change-Id: Iab0171716e27e31077a66b5e36a00bf28a2e7a8c -Reviewed-by: Kai Uwe Broulik -Reviewed-by: Qt CI Bot -Reviewed-by: Dominik Holland -Reviewed-by: Aleix Pol -Reviewed-by: Andy Nichols ---- - src/quick/scenegraph/qsgrenderloop.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp -index 60f3538662..2eaed497ef 100644 ---- a/src/quick/scenegraph/qsgrenderloop.cpp -+++ b/src/quick/scenegraph/qsgrenderloop.cpp -@@ -305,6 +305,8 @@ void QSGGuiThreadRenderLoop::hide(QQuickWindow *window) - { - QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window); - cd->fireAboutToStop(); -+ if (m_windows.contains(window)) -+ m_windows[window].updatePending = false; - } - - void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window) -@@ -494,7 +496,8 @@ QImage QSGGuiThreadRenderLoop::grab(QQuickWindow *window) - - void QSGGuiThreadRenderLoop::maybeUpdate(QQuickWindow *window) - { -- if (!m_windows.contains(window)) -+ QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window); -+ if (!cd->isRenderable() || !m_windows.contains(window)) - return; - - m_windows[window].updatePending = true; --- -2.16.3 - diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild new file mode 100644 index 00000000..937e98cc --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.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-r10000 + +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} + ! -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/qtwebengine-5.9.3-r1000.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3-r1000.ebuild new file mode 100644 index 00000000..ee253d3b --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.9.3-r1000.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-r10000 + +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-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=( + $(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-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/qtwebengine/qtwebengine-5.9.5-r1000.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.5-r1000.ebuild deleted file mode 100644 index dc9bbdad..00000000 --- a/dev-qt/qtwebengine/qtwebengine-5.9.5-r1000.ebuild +++ /dev/null @@ -1,127 +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" -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}/${PN}-5.9.3-icu-60.1.patch" - "${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch" - "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.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-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=( - $(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-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/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index 0e5bb720..dd69899f 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -1 +1 @@ -DIST qtwebsockets-opensource-src-5.9.5.tar.xz 199632 BLAKE2B ac174f9b005ed2fe31395dae844ea5e331603b7320e31d0efb186381f41aa9a3a465eb1f339e1969c8914ae27e6ad494a1197676a6b54881a75af58d2278d75f SHA512 20a1a259fa41b0a743673d1af046b7aa655c375d2ef6dc34b9ea9958650f5288594519291188228b8531631809f21dbb599d333d2edc2c3a516fc0d85cfaaecd +DIST qtwebsockets-opensource-src-5.9.3.tar.xz 199420 BLAKE2B 0c0ed7e193422ca0459e0f77850ddbc28dc0e16f72171476bd2ea33cf2809798811720cb927a6d2ed2a812e80d06d587d0d5cdf02b0313766237f6ff5415a6d8 SHA512 64eb131a0640229ae7553c0e8b9ec04a3f83862d3f48c38464928b8a7a9ca999ed0cba5b0fb91174a9ae8e8e3d6fa844a2aaf62a96b95fefc383361793f8b5de diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.3-r1000.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.3-r1000.ebuild new file mode 100644 index 00000000..4b528d5c --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.3-r1000.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-r10000 + +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-r10000_src_prepare +} diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.5-r1000.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.5-r1000.ebuild deleted file mode 100644 index 4b528d5c..00000000 --- a/dev-qt/qtwebsockets/qtwebsockets-5.9.5-r1000.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 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" -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 index 0381b6db..44ceaa0b 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1 +1 @@ -DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.3-r1000.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.3-r1000.ebuild new file mode 100644 index 00000000..300cfc74 --- /dev/null +++ b/dev-qt/qtwidgets/qtwidgets-5.9.3-r1000.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-r10000 + +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-r10000_src_configure +} diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.5-r1000.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.5-r1000.ebuild deleted file mode 100644 index 300cfc74..00000000 --- a/dev-qt/qtwidgets/qtwidgets-5.9.5-r1000.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -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-r10000_src_configure -} diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest index 6c9c19e3..694f92c2 100644 --- a/dev-qt/qtx11extras/Manifest +++ b/dev-qt/qtx11extras/Manifest @@ -1 +1 @@ -DIST qtx11extras-opensource-src-5.9.5.tar.xz 76864 BLAKE2B 138db8967adf1aa7b2b6a24e2c569d9fcfcf16c46e31b78e6e927e5d363879b053f182c0ee04df14da9dbe37b414fd350f9eb95eeb0d561143c29c08b98ec577 SHA512 633f34f1ddbbcfc5cb01ab703a29fcabe5699f36c4d565020cfcb4bcdd9ae88588598d2431e93394645d929ab7511fee612ca432a52e75741b5e84f654df4d57 +DIST qtx11extras-opensource-src-5.9.3.tar.xz 76612 BLAKE2B 8d31d78c161311bcbb5b98b448e54b9c140c0851ec029f3a2642700ed9ad355c36fbde16eae2542c441759b39ab39edd91a17cb6f879401e36b0bd855a6e3ebf SHA512 0d1547e25f5d051daa8b20f54ca146bc5a6ad6fdae2c9b9e90dae574840a350bc3ac82b05ddb93b7a544e689fc06e633e57a40f31475cd118e156fad78e91d6c diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.3-r1000.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.3-r1000.ebuild new file mode 100644 index 00000000..9bfe92fb --- /dev/null +++ b/dev-qt/qtx11extras/qtx11extras-5.9.3-r1000.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-r10000 + +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/qtx11extras/qtx11extras-5.9.5-r1000.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.5-r1000.ebuild deleted file mode 100644 index 9bfe92fb..00000000 --- a/dev-qt/qtx11extras/qtx11extras-5.9.5-r1000.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 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" -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 index 0381b6db..44ceaa0b 100644 --- a/dev-qt/qtxml/Manifest +++ b/dev-qt/qtxml/Manifest @@ -1 +1 @@ -DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c diff --git a/dev-qt/qtxml/qtxml-5.9.3-r1000.ebuild b/dev-qt/qtxml/qtxml-5.9.3-r1000.ebuild new file mode 100644 index 00000000..cda700b4 --- /dev/null +++ b/dev-qt/qtxml/qtxml-5.9.3-r1000.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-r10000 + +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/qtxml/qtxml-5.9.5-r1000.ebuild b/dev-qt/qtxml/qtxml-5.9.5-r1000.ebuild deleted file mode 100644 index cda700b4..00000000 --- a/dev-qt/qtxml/qtxml-5.9.5-r1000.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build-r10000 - -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 index 9c1fc998..bfe2e47e 100644 --- a/dev-qt/qtxmlpatterns/Manifest +++ b/dev-qt/qtxmlpatterns/Manifest @@ -1 +1 @@ -DIST qtxmlpatterns-opensource-src-5.9.5.tar.xz 1344548 BLAKE2B edd65de866be0aec6dd8da672bb6713b5384d09ab0ad074efc731ab7aca843882db19d678de75bc9f9662802a7164148f66f3b5e3d0d67c313049b84481e948a SHA512 ed4e335b474e76d05ea811b86b2bcaece9ccb6c9e358704ab974024593d40a80465dba48074ffbaaacf9850c0bc9844c0715c114e677c980ab3b39c65e79fd2f +DIST qtxmlpatterns-opensource-src-5.9.3.tar.xz 1360880 BLAKE2B 52b3840c0351e305afa402520811e770979617274e1cad00e39d66b6fd685d3322fe0828347298245a7a519ba9bfb1e273f9645649113e43da9d495f8f672c57 SHA512 4b345940cc66cfd14de365f2802e49a3ad88c25a46e4c36765e31586728496f3bc5aa9a856a78b79b583e577a70dca5c70534d9689627773e142e9c7e421de01 diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3-r1000.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3-r1000.ebuild new file mode 100644 index 00000000..5c174556 --- /dev/null +++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3-r1000.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-r10000 + +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}" diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.5-r1000.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.5-r1000.ebuild deleted file mode 100644 index 5c174556..00000000 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.5-r1000.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2017 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" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV} -" -RDEPEND="${DEPEND}" -- cgit v1.2.3