[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 370bed42870cb08a8460443f46826048f35c2b5a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 8 11:57:47 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 8 11:58:03 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=370bed42 dev-qt/qtdeclarative: enable py3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.11..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.11..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.11..ebuild index 3c719730..509214c0 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.11..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.11..ebuild @@ -8,7 +8,7 @@ if [[ ${PV} != ** ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{8..12} ) inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: ea00eff9f0aefe7926aa453046f29174ee4a67b3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 5 09:07:30 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 5 09:07:30 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ea00eff9 dev-qt/qtdeclarative: drop 6.4.0 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/Manifest | 1 - dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild | 30 - 2 files changed, 31 deletions(-) diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest deleted file mode 100644 index 8faf4b19.. --- a/dev-qt/qtdeclarative/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtdeclarative-everywhere-src-6.4.0.tar.xz 30538764 BLAKE2B 919081ba8a29a07daa01084388454a3d5f814e12ff5d1a4d3b647650e4bd6a839876baee1ab09e664e55e814338dbf675e70e4c44c28842a363c8f2dcf1a2b18 SHA512 6d43c09a14e2ca236fc50166ed477e37084e89a67a04d914f30f31662a18a4e6d0433cb9b2f0654ba9ffcbcd7abcb5dadcb7b12f0ef5928fc11b10925ee6f41e diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild deleted file mode 100644 index e8ac7edd.. --- a/dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="opengl +sql +widgets" - -DEPEND=" - =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}* -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(qt_feature opengl) - $(qt_feature sql) - $(qt_feature widgets) - ) - - qt6-build_src_configure -}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 2bfd7e8b70d3bb07213339de46b8d8053ee395f8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 24 20:24:59 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 24 20:24:59 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2bfd7e8b dev-qt/qtdeclarative: drop 6.3. Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild | 30 -- 1 file changed, 30 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild deleted file mode 100644 index e8ac7edd.. --- a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="opengl +sql +widgets" - -DEPEND=" - =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}* -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(qt_feature opengl) - $(qt_feature sql) - $(qt_feature widgets) - ) - - qt6-build_src_configure -}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 987945ae7e11660260642bd9a51633e631e1b095 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 24 14:41:57 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 24 14:41:57 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=987945ae dev-qt/qtdeclarative: drop 6.3.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/Manifest | 1 - dev-qt/qtdeclarative/qtdeclarative-6.3.2.ebuild | 30 - 2 files changed, 31 deletions(-) diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest deleted file mode 100644 index 21f975d2.. --- a/dev-qt/qtdeclarative/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtdeclarative-everywhere-src-6.3.2.tar.xz 30157476 BLAKE2B 54914ca16a85201232d14f3596b74d91f1cb11c59d03b8b79aa4b7ff26b45a76dcd3d2aba5a47b3ba9c9bb89f073cda20a785997f092ee57197217d95e95d967 SHA512 4929bd1e5ff16475847ddd75322353afc35c7a06688d32e6186649b38a08d88f435a134fdcfbb4f9fe588f9cd317eb8c0fb6aa0f08416b900064156f3af926af diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.2.ebuild deleted file mode 100644 index e8ac7edd.. --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="opengl +sql +widgets" - -DEPEND=" - =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}* -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(qt_feature opengl) - $(qt_feature sql) - $(qt_feature widgets) - ) - - qt6-build_src_configure -}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: e72d5ca6b3ca2b6db29dc43c3308e53f1cb05fb0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 3 22:17:21 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 3 09:12:01 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e72d5ca6 dev-qt/qtdeclarative: python3_11 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild index 34dc81bd..258f5833 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 8f29925c8282e49661673a604c8d89ee087441c2 Author: Jimi Huotari gentoo org> AuthorDate: Wed Jun 22 06:24:26 2022 + Commit: Jimi Huotari gentoo org> CommitDate: Wed Jun 22 06:30:06 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f29925c dev-qt/qtdeclarative: also adjust the defaults to match qtbase Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild| 2 +- dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-6..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild index 6401d1d4..e8ac7edd 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="opengl sql widgets" +IUSE="opengl +sql +widgets" DEPEND=" =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild index 6401d1d4..e8ac7edd 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="opengl sql widgets" +IUSE="opengl +sql +widgets" DEPEND=" =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] diff --git a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild index 6401d1d4..e8ac7edd 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="opengl sql widgets" +IUSE="opengl +sql +widgets" DEPEND=" =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 6522dcf23e8b1c0800bb39eb908db21193ea33ea Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 18 14:52:57 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 21 21:31:21 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6522dcf2 dev-qt/qtdeclarative: Replace -Os with -O2 Bug: https://bugs.gentoo.org/840861 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild index 2bda3893..34dc81bd 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit python-any-r1 qt5-build +inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -47,6 +47,8 @@ src_prepare() { } src_configure() { + replace-flags "-Os" "-O2" # bug 840861 + local myqmakeargs=( -- -qml-debug
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 125f5fbc716c85d598be7f4b4382784d57a0d8e5 Author: Jimi Huotari gentoo org> AuthorDate: Tue Jun 21 20:14:35 2022 + Commit: Jimi Huotari gentoo org> CommitDate: Tue Jun 21 20:14:35 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=125f5fbc dev-qt/qtdeclarative: fix qt6 configure with different USE-flags These flags need to match those of 'qtbase'. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild| 5 + dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild | 5 + dev-qt/qtdeclarative/qtdeclarative-6..ebuild | 5 + 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild index 3204679c..6401d1d4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild @@ -14,11 +14,8 @@ fi IUSE="opengl sql widgets" DEPEND=" - =dev-qt/qtbase-${PV}*[network] + =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-${PV}* - opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) - sql? ( =dev-qt/qtbase-${PV}*[sql] ) - widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild index 3204679c..6401d1d4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild @@ -14,11 +14,8 @@ fi IUSE="opengl sql widgets" DEPEND=" - =dev-qt/qtbase-${PV}*[network] + =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-${PV}* - opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) - sql? ( =dev-qt/qtbase-${PV}*[sql] ) - widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild index 3204679c..6401d1d4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild @@ -14,11 +14,8 @@ fi IUSE="opengl sql widgets" DEPEND=" - =dev-qt/qtbase-${PV}*[network] + =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-${PV}* - opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) - sql? ( =dev-qt/qtbase-${PV}*[sql] ) - widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 2225a14e34139f8d8bcdc872312dde87202ce234 Author: Jimi Huotari gentoo org> AuthorDate: Thu Jun 9 13:47:55 2022 + Commit: Jimi Huotari gentoo org> CommitDate: Mon Jun 20 18:02:04 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2225a14e dev-qt/qtdeclarative: add USE-flags and adjust dependencies for qt6 As requested at: https://github.com/gentoo/gentoo/pull/25635 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qtdeclarative/metadata.xml | 2 ++ dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild| 17 +++-- dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild | 19 --- dev-qt/qtdeclarative/qtdeclarative-6..ebuild | 19 --- 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 050837f3..aa22d78a 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -7,7 +7,9 @@ Build the LocalStorage import for QtQuick (requires QtSql) + Enable OpenGL support Enable support for Vulkan + Enable QtSQL support Enable QtWidgets support diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild index 0c20bbb9..3204679c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.0.ebuild @@ -11,10 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="opengl sql widgets" + DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] + =dev-qt/qtbase-${PV}*[network] =dev-qt/qtshadertools-${PV}* + opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) + sql? ( =dev-qt/qtbase-${PV}*[sql] ) + widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" -# TODO: qml/quick automagic +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild index 051dcc4c..3204679c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,10 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="opengl sql widgets" + DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] + =dev-qt/qtbase-${PV}*[network] =dev-qt/qtshadertools-${PV}* + opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) + sql? ( =dev-qt/qtbase-${PV}*[sql] ) + widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" -# TODO: qml/quick automagic +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild index 051dcc4c..3204679c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,10 +11,23 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="opengl sql widgets" + DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] + =dev-qt/qtbase-${PV}*[network] =dev-qt/qtshadertools-${PV}* + opengl? ( =dev-qt/qtbase-${PV}*[opengl] ) + sql? ( =dev-qt/qtbase-${PV}*[sql] ) + widgets? ( =dev-qt/qtbase-${PV}*[widgets] ) " RDEPEND="${DEPEND}" -# TODO: qml/quick automagic +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 0a6b7ce2b1f9f193d768f72bff23cf4e0aae1570 Author: WANG Xuerui gentoo org> AuthorDate: Wed May 25 11:17:38 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 18 14:21:53 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a6b7ce2 dev-qt/qtdeclarative: keyword 5.15.5. for ~loong See: https://github.com/xen0n/loongson-overlay/pull/25 Tested-by: HougeLangley gmail.com> Signed-off-by: WANG Xuerui gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild index b4b1de7c..2bda3893 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.5..ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 9f027d6975d67758f6230b714d4c70e190ac8f80 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 31 19:23:36 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:09:45 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9f027d69 dev-qt/qtdeclarative: Drop superfluous qmljs link Closes: https://bugs.gentoo.org/836464 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild index c236a22f..b4b1de7c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild @@ -59,7 +59,6 @@ src_install() { qt5-build_src_install qt5_symlink_binary_to_path qml 5 qt5_symlink_binary_to_path qmleasing 5 - qt5_symlink_binary_to_path qmljs 5 qt5_symlink_binary_to_path qmlpreview 5 qt5_symlink_binary_to_path qmlscene 5 }
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/files/, dev-qt/qtdeclarative/
commit: 5fd72895b4a0c9c4bf1a143c3fa8d9b8745f4e89 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 30 18:13:29 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 18:08:25 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5fd72895 dev-qt/qtdeclarative: Drop riscv patch A proper riscv patch is now part of qtcore-5.15.3. Closes: https://bugs.gentoo.org/790689 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtdeclarative-5.15.2-riscv-atomic.patch| 12 dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild| 1 - 2 files changed, 13 deletions(-) diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch deleted file mode 100644 index a619f3db.. --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/qml/qml.pro b/src/qml/qml.pro -index 7d5a92a..01f3b79 100644 a/src/qml/qml.pro -+++ b/src/qml/qml.pro -@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - - # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. - gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks -+gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic - - DEFINES += QT_NO_FOREACH - diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild index de20d2dc..c236a22f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild @@ -29,7 +29,6 @@ BDEPEND="${PYTHON_DEPS}" PATCHES=( "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 - "${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689 ) src_prepare() {
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/
commit: 56cf1c25f6c7c35a06adb2751cd8427640143d4e Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 22 13:16:21 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 24 09:31:04 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=56cf1c25 dev-qt/qtdeclarative: Fix IUSE=jit by using qml-jit feature switch Closes: https://bugs.gentoo.org/551318 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtdeclarative-5.4.2-disable-jit.patch| 18 -- dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) 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.. --- 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.15.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild index 31bdbbb8..de20d2dc 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild @@ -33,8 +33,6 @@ PATCHES=( ) src_prepare() { - use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" ) - qt_use_disable_mod localstorage sql \ src/imports/imports.pro @@ -53,6 +51,7 @@ src_configure() { local myqmakeargs=( -- -qml-debug + $(qt_use jit feature-qml-jit) ) qt5-build_src_configure }
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: b3b0717343b738663c8ba2bc9ba627083ddb7bea Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 27 20:57:03 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 21 10:04:46 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b3b07173 dev-qt/qtdeclarative: Symlink qml* to /usr/bin/qml*5 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild index b1f5a6f3..31bdbbb8 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3..ebuild @@ -1,4 +1,4 @@ -# Copyright 2009-2021 Gentoo Authors +# Copyright 2009-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,3 +56,12 @@ src_configure() { ) qt5-build_src_configure } + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qml 5 + qt5_symlink_binary_to_path qmleasing 5 + qt5_symlink_binary_to_path qmljs 5 + qt5_symlink_binary_to_path qmlpreview 5 + qt5_symlink_binary_to_path qmlscene 5 +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 6f76f748efa572fab7e972b64332f3abcad984a3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 24 16:41:40 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 24 23:08:02 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6f76f748 dev-qt/qtdeclarative: Add missing dev-qt/qtbase USEdeps Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-6..ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild index 66011c10..051dcc4c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild @@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi DEPEND=" - =dev-qt/qtbase-${PV}* + =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] =dev-qt/qtshadertools-${PV}* " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild index 66011c10..051dcc4c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6..ebuild @@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi DEPEND=" - =dev-qt/qtbase-${PV}* + =dev-qt/qtbase-${PV}*[gui,network,opengl,sql,test,widgets] =dev-qt/qtshadertools-${PV}* " RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 4217fc3b952f74acad85e424c00baf14603e15a3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 30 11:11:39 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 30 11:11:39 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4217fc3b dev-qt/qtdeclarative: Sync with Gentoo ebuild repository Minor ebuild style fix. Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild index 135c1c6d..b1f5a6f3 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild @@ -33,7 +33,7 @@ PATCHES=( ) src_prepare() { - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") + use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" ) qt_use_disable_mod localstorage sql \ src/imports/imports.pro
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 4d43cfa264d00e0b7bab9797946d6bd57361d075 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 15 18:16:14 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 22 07:10:55 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d43cfa2 dev-qt/qtdeclarative: Add missing media-libs/libglvnd DEPEND Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild index 5e655b4a..135c1c6d 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2..ebuild @@ -20,6 +20,7 @@ DEPEND=" =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-${QT5_PV}* =dev-qt/qttest-${QT5_PV}* + media-libs/libglvnd localstorage? ( =dev-qt/qtsql-${QT5_PV}* ) widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] ) "
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/
commit: d841a158e7300cdacdf53c8e79c1fe368d36f7d5 Author: Yixun Lan gentoo org> AuthorDate: Sat Jul 17 15:18:56 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 10 18:33:01 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d841a158 dev-qt/qtdeclarative: riscv: fix missing atomic library this will workaroud the error when build in ARCH=riscv, tested with gcc-11 A likely better fix is to have qtcore detect the need for -latomic at configure time and, if needed, link to it Bug: https://bugs.gentoo.org/790689 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtdeclarative-5.15.2-riscv-atomic.patch| 12 dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch new file mode 100644 index ..a619f3db --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch @@ -0,0 +1,12 @@ +diff --git a/src/qml/qml.pro b/src/qml/qml.pro +index 7d5a92a..01f3b79 100644 +--- a/src/qml/qml.pro b/src/qml/qml.pro +@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 + + # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. + gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks ++gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic + + DEFINES += QT_NO_FOREACH + diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index 47330e36..4b9b9920 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -28,6 +28,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 + "${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689 ) src_prepare() {
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 223d3019f37372a86fc1e77ecbe908bce3f3b4db Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Oct 21 06:23:24 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 26 23:56:28 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=223d3019 dev-qt/qtdeclarative: python3_9 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index 0a1641a4..69cb6972 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) + +PYTHON_COMPAT=( python3_{6..9} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: f12f725e3cec026cd40d4866bcac06a5280b258f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 17 21:20:02 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 17 21:20:02 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f12f725e dev-qt/qtdeclarative: Drop obsolete blocker Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index a2d185e8..0a1641a4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -23,9 +23,7 @@ DEPEND=" localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] ) " -RDEPEND="${DEPEND} - !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: fcf9f207ae6d60bde421678719808f5f8e2d4a5d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 25 18:55:32 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 25 18:55:32 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fcf9f207 dev-qt/qtdeclarative: Trigger rebuild on dev-qt/qtgui subslot update Closes: https://bugs.gentoo.org/733674 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index ff91bdd7..a2d185e8 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -17,7 +17,7 @@ BDEPEND="${PYTHON_DEPS}" # qtgui[gles2-only=] is needed because of bug 504322 DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2-only=,vulkan=] + ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-${PV} ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: caaa0caa9348a37b19235dc2d11fb3fe20bcd73a Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 26 14:53:07 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 26 14:53:07 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=caaa0caa dev-qt/qtdeclarative: QQuickItemView: Fix max(X/Y)Extent() Still pending upstream review. KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419514 QTBUG: https://bugreports.qt.io/browse/QTBUG-83890 Bug: https://bugs.gentoo.org/716992 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 4 1 file changed, 4 insertions(+) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index 5e3c49a6..ff91bdd7 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -27,6 +27,10 @@ RDEPEND="${DEPEND} !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/
commit: 94bf4289184ee4f99674091abe08ec9f072dccb3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 24 22:32:05 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 24 22:32:05 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94bf4289 dev-qt/qtdeclarative: Backport fixes from 5.15.1 - Fix subpixel positioned text QTBUG: https://bugreports.qt.io/browse/QTBUG-49646 - QQuickItemView: Fix max(X/Y)Extent() KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419514 QTBUG: https://bugreports.qt.io/browse/QTBUG-83890 Bug: https://bugs.gentoo.org/716992 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ve-5.14.2-QQuickItemView-fix-maxXY-extent.patch | 42 ++ ...ative-5.14.2-fix-subpixel-positioned-text.patch | 64 ++ .../qtdeclarative/qtdeclarative-5.15.0_rc2.ebuild | 5 ++ 3 files changed, 111 insertions(+) diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch new file mode 100644 index ..c9ccb211 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch @@ -0,0 +1,42 @@ +From cc5387ad22ca503d167fd66e2429107d45b937af Mon Sep 17 00:00:00 2001 +From: David Redondo +Date: Wed, 13 May 2020 11:04:23 +0200 +Subject: [PATCH] QQuickItemView: Fix max(X/Y)Extent() + +QQuickFlickable maxXExtent() and maxYExtent() return the amount of space +that is not shown when inside a ScrollView. QQuickItemView however just +returned width() if vertical and height() if horizontal. In these cases +just defer to the QQuickFlickable base implementation like minXExtent() +and minYExtent() already do. + +Fixes: QTBUG-83890 +Pick-to: 5.15 +Change-Id: I7f4060c2f46ae07611bedceca0d322c5f7f6affb +--- + src/quick/items/qquickitemview.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +index 7fb392233e4..ab130ac6857 100644 +--- a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +@@ -1393,7 +1393,7 @@ qreal QQuickItemView::maxYExtent() const + { + Q_D(const QQuickItemView); + if (d->layoutOrientation() == Qt::Horizontal) +-return height(); ++return QQuickFlickable::maxYExtent(); + + if (d->vData.maxExtentDirty) { + d->maxExtent = d->maxExtentForAxis(d->vData, false); +@@ -1421,7 +1421,7 @@ qreal QQuickItemView::maxXExtent() const + { + Q_D(const QQuickItemView); + if (d->layoutOrientation() == Qt::Vertical) +-return width(); ++return QQuickFlickable::maxXExtent(); + + if (d->hData.maxExtentDirty) { + d->maxExtent = d->maxExtentForAxis(d->hData, true); +-- +2.16.3 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch new file mode 100644 index ..23eaa7d5 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch @@ -0,0 +1,64 @@ +From e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d Mon Sep 17 00:00:00 2001 +From: Eskil Abrahamsen Blomfeldt +Date: Tue, 5 May 2020 11:36:24 +0200 +Subject: [PATCH] Fix subpixel positioned text with Text.NativeRendering + +We would be generating subpixel positioned glyphs based on the +relative positions of the glyphs, ignoring the fractional part +contributed by the origin of the text. So if the text origin was +inside a pixel, the subpixel antialiasing would be wrong and we +would see kerning errors. + +This was especially visible when using AlignHCenter on text +with hinting disabled and resizing the item it was aligning to. + +Pick-to: 5.15 +Task-number: QTBUG-49646 +Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a +Reviewed-by: Lars Knoll +Reviewed-by: Konstantin Ritt +--- + src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 9 - + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +index cfa645bfd03..f73b64f537f 100644 +--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +@@ -789,11 +789,12 @@ void QSGTextMaskMaterial::populate(const QPointF , +const QMargins ) + { + Q_ASSERT(m_font.isValid()); ++QPointF position(p.x(), p.y() - m_font.ascent()); + QVector fixedPointPositions; + const int glyphPositionsSize = glyphPositions.size(); + fixedPointPositions.reserve(glyphPositionsSize); + for (int i=0; i < glyphPositionsSize; ++i) +- fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i))); ++
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: bc16411eb7eddb58cd833fdc5670eb0d2843ef25 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Apr 16 13:11:31 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 16 19:30:28 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc16411e dev-qt/qtdeclarative: keyworded 5.14.2 for sparc Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild index 5e576bf9..5e3c49a6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild @@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index 5e576bf9..5e3c49a6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 5e576bf9..5e3c49a6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/
commit: aefade7ae0d3be5b6c432a7e6edef20d896ff3e9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 6 22:21:40 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 6 22:24:50 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=aefade7a dev-qt/qtdeclarative: Fix double inclusion of CMake plugin targets See also: https://bugreports.qt.io/browse/QTBUG-83282 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> ...15.0_beta3-cmake-targets-double-inclusion.patch | 44 ++ .../qtdeclarative-5.15.0_beta3.ebuild | 2 + 2 files changed, 46 insertions(+) diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.0_beta3-cmake-targets-double-inclusion.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.0_beta3-cmake-targets-double-inclusion.patch new file mode 100644 index ..1abf58a9 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.0_beta3-cmake-targets-double-inclusion.patch @@ -0,0 +1,44 @@ +From 1a2ab822fa24733f83d6720d2af8498ecbd5cbda Mon Sep 17 00:00:00 2001 +From: Alexandru Croitor +Date: Fri, 3 Apr 2020 10:04:04 +0200 +Subject: [PATCH] CMake: Fix double inclusion of CMake plugin targets + +After 99ace38d22c640e37bb1a41095ee3b126169816a, all plugin files are +included automatically, not only the ones ending in Plugin.cmake. + +Thus the extra inclusion done by the QmlConfigExtras file should only +be done if strict mode is set. + +This fixes errors of the following type when doing find_package(Qt5Qml) + +add_library cannot create imported target + "Qt5::QTcpServerConnectionFactory" because another target with the same + name already exists. + +Amends 99ace38d22c640e37bb1a41095ee3b126169816a +Amends 2f2dd3b0c28db210ea1f00d569f6c1626894c5f4 + +Task-number: QTBUG-83282 +Change-Id: I205036092bff9925aa95472f0aa6a212f0372227 +Reviewed-by: Kai Koehne +Reviewed-by: Friedemann Kleint +--- + src/qml/Qt5QmlConfigExtras.cmake.in | 10 ++ + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/qml/Qt5QmlConfigExtras.cmake.in b/src/qml/Qt5QmlConfigExtras.cmake.in +index 9ddb9885cd..4242143bca 100644 +--- a/src/qml/Qt5QmlConfigExtras.cmake.in b/src/qml/Qt5QmlConfigExtras.cmake.in +@@ -1,5 +1,7 @@ +-file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_*Factory.cmake") ++if(QT5_STRICT_PLUGIN_GLOB OR Qt5Qml_STRICT_PLUGIN_GLOB) ++file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_*Factory.cmake") + +-foreach(_other_plugin ${_qt5qml_other_plugins}) +-include(${_other_plugin} OPTIONAL) +-endforeach() ++foreach(_other_plugin ${_qt5qml_other_plugins}) ++include(${_other_plugin} OPTIONAL) ++endforeach() ++endif() diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild index 5e576bf9..11037c81 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild @@ -27,6 +27,8 @@ RDEPEND="${DEPEND} !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: b92877d400ade2e5f3407949c0ecac9ce8a7d364 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:38:04 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 2 18:09:22 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b92877d4 dev-qt/qtdeclarative: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/metadata.xml | 1 - dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild | 8 dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 8 dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 8 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 9fc82650..b036c9a0 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -6,7 +6,6 @@ Gentoo Qt Project - Use GLES 2.0 or later instead of full OpenGL Build the LocalStorage import for QtQuick (requires QtSql) Enable support for Vulkan Enable QtWidgets support diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild index 74bb692c..5e576bf9 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild @@ -11,17 +11,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="gles2 +jit localstorage vulkan +widgets" +IUSE="gles2-only +jit localstorage vulkan +widgets" BDEPEND="${PYTHON_DEPS}" -# qtgui[gles2=] is needed because of bug 504322 +# qtgui[gles2-only=] is needed because of bug 504322 DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,vulkan=] + ~dev-qt/qtgui-${PV}[gles2-only=,vulkan=] ~dev-qt/qtnetwork-${PV} ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) + widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] ) " RDEPEND="${DEPEND}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 37c72ad91f12a710e80b7b8e0c146a17ea703a33 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 21 13:50:33 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 21 13:50:33 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=37c72ad9 dev-qt/qtdeclarative: Add USE vulkan to 5. as well Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index a70c3d60..74bb692c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="gles2 +jit localstorage +widgets" +IUSE="gles2 +jit localstorage vulkan +widgets" BDEPEND="${PYTHON_DEPS}" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=] + ~dev-qt/qtgui-${PV}[gles2=,vulkan=] ~dev-qt/qtnetwork-${PV} ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 820e61a0d802ecd9aa19c087971cc8fb7dccd1d6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 26 21:43:03 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 28 10:11:33 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=820e61a0 dev-qt/qtdeclarative: Add USE vulkan Bug: https://bugs.gentoo.org/703594 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/metadata.xml | 1 + dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index cffb0c60..9fc82650 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -8,6 +8,7 @@ Use GLES 2.0 or later instead of full OpenGL Build the LocalStorage import for QtQuick (requires QtSql) + Enable support for Vulkan Enable QtWidgets support diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild index a70c3d60..74bb692c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="gles2 +jit localstorage +widgets" +IUSE="gles2 +jit localstorage vulkan +widgets" BDEPEND="${PYTHON_DEPS}" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=] + ~dev-qt/qtgui-${PV}[gles2=,vulkan=] ~dev-qt/qtnetwork-${PV} ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index a70c3d60..74bb692c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="gles2 +jit localstorage +widgets" +IUSE="gles2 +jit localstorage vulkan +widgets" BDEPEND="${PYTHON_DEPS}" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=] + ~dev-qt/qtgui-${PV}[gles2=,vulkan=] ~dev-qt/qtnetwork-${PV} ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 9e697977b2bcd41910c93df1fb77c8fea9139abc Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 6 00:04:27 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 6 00:04:27 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9e697977 dev-qt/qtdeclarative: Drop python2_7, add python3_8 python3_8 was tested by Arfrever. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild index 0c9e7da8..a70c3d60 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild @@ -1,8 +1,8 @@ -# Copyright 2009-2019 Gentoo Authors +# Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild index 0c9e7da8..a70c3d60 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild @@ -1,8 +1,8 @@ -# Copyright 2009-2019 Gentoo Authors +# Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index 0c9e7da8..a70c3d60 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -1,8 +1,8 @@ -# Copyright 2009-2019 Gentoo Authors +# Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 0c9e7da8..a70c3d60 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -1,8 +1,8 @@ -# Copyright 2009-2019 Gentoo Authors +# Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: e5d46f440385ee85d25d08e31f88e242c013cbb6 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Oct 12 01:44:48 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 13 21:55:11 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e5d46f44 dev-qt/qtdeclarative: Drop unsupported python3_4 from PYTHON_COMPAT Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.13.1.ebuild| 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild index c208c86f..4d1a907e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2009-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.1.ebuild index c208c86f..4d1a907e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.13.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2009-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild index c208c86f..4d1a907e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2009-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild index c208c86f..4d1a907e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2009-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild index c208c86f..4d1a907e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2009-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index c208c86f..4d1a907e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2009-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 57d05b694964d6919fc9bf8dc236271b49608087 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 12 00:03:43 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 16 18:34:33 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=57d05b69 dev-qt/qtdeclarative: Drop USE xml xmllistmodel was moved to qtdeclarative in upstream commit 0477a057fd02050fd330760bf046f5e0e91a9331. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/metadata.xml | 1 - dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild | 13 ++--- dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild | 11 +-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 13 ++--- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 6333b589..cffb0c60 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -9,7 +9,6 @@ Use GLES 2.0 or later instead of full OpenGL Build the LocalStorage import for QtQuick (requires QtSql) Enable QtWidgets support - Build the XmlListModel import for QtQuick (requires QtXmlPatterns) https://bugreports.qt.io/ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild index 8876b08e..b3c3411f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" fi -IUSE="gles2 +jit localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets" # qtgui[gles2=] is needed because of bug 504322 COMMON_DEPEND=" @@ -21,10 +21,6 @@ COMMON_DEPEND=" ~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} @@ -47,11 +43,6 @@ src_prepare() { tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro - qt_use_disable_mod xml xmlpatterns \ - src/imports/imports.pro \ - tests/auto/quick/quick.pro \ - tests/auto/quick/examples/examples.pro - qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild index 31657b80..b3c3411f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" fi -IUSE="gles2 +jit localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets" # qtgui[gles2=] is needed because of bug 504322 COMMON_DEPEND=" @@ -21,10 +21,6 @@ COMMON_DEPEND=" ~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} @@ -47,11 +43,6 @@ src_prepare() { tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro - qt_use_disable_mod xml xmlpatterns \ - src/imports/imports.pro \ - tests/auto/quick/quick.pro \ - tests/auto/quick/examples/examples.pro - qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 8876b08e..b3c3411f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" fi -IUSE="gles2 +jit localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets" # qtgui[gles2=] is needed because of bug 504322 COMMON_DEPEND=" @@ -21,10 +21,6 @@ COMMON_DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( - ~dev-qt/qtnetwork-${PV} -
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: a1bafcadab049bccdcf1b6d635d083bc5dc9d048 Author: Jonathan Callen gentoo org> AuthorDate: Thu Dec 6 12:27:55 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 6 12:28:40 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1bafcad dev-qt/qtdeclarative: add python3_7 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Jonathan Callen gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.12.0_rc.ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild index 3da293ee..8876b08e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.0_rc.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.0_rc.ebuild index 325ae743..8876b08e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.12.0_rc.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.0_rc.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild index 3da293ee..8876b08e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.12..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 3da293ee..8876b08e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: e216d4340820b2144eaa9047d34391e9898a5ce4 Author: Michael Palimaka gentoo org> AuthorDate: Mon Jan 1 03:43:44 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 1 03:49:10 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e216d434 dev-qt/qtdeclarative: configure with -qml-debug Since 6fc5fc1a9455d495abb11cfdf72257b8d8b22c6f, -qml-debug is no longer handled via qtbase and is exposed via qtdeclarative instead. Although this is enabled by default, list it explicitly here to follow the old approach Upstream-commit: 4e6d5951ed853b236b03ad46ac14649449830d96 Package-Manager: Portage-2.3.14, Repoman-2.3.6 dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 8 1 file changed, 8 insertions(+) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 985b6923..0c80aec3 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -54,3 +54,11 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + -qml-debug + ) + qt5-build_src_configure +}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 0a6e6665044d02ade89cc2ffc6a8d26db34897df Author: Pacho Ramos gentoo org> AuthorDate: Mon Jan 1 03:11:42 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 1 03:12:07 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a6e6665 dev-qt/qtdeclarative: Add support for newer python Package-Manager: Portage-2.3.14, Repoman-2.3.6 dev-qt/qtdeclarative/qtdeclarative-5.10.0.ebuild| 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10.0.ebuild index 23c47148..985b6923 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.10.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.10.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild index 23c47148..985b6923 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild index 23c47148..985b6923 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 23c47148..985b6923 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 3171e9dadc5ff17ca8568f525eb6fe1581787b68 Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 13 12:09:34 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 13 12:11:57 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3171e9da dev-qt/qtdeclarative: revert workaround The workaround is actually not required beginning with 5.8. This reverts commit 4512a456df71b4e9efb59b9952cc74ea565d9a03. This reverts commit f743270fbbe4e084be0f1496cbbcc6cb2fcaed85. dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild | 8 +--- dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild | 8 +--- dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild | 8 +--- dev-qt/qtdeclarative/qtdeclarative-5..ebuild| 8 +--- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild index c6957999..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { - # this is supposed to be handled by the build system (src/qml/qml.pro), - # fails because we override QMAKE_CXXFLAGS. bug 626070 - if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then - append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse - fi - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild index c6957999..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { - # this is supposed to be handled by the build system (src/qml/qml.pro), - # fails because we override QMAKE_CXXFLAGS. bug 626070 - if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then - append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse - fi - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild index c6957999..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { - # this is supposed to be handled by the build system (src/qml/qml.pro), - # fails because we override QMAKE_CXXFLAGS. bug 626070 - if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then - append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse - fi - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index c6957999..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { - # this is supposed to be handled by the build system (src/qml/qml.pro), - # fails because we override QMAKE_CXXFLAGS. bug 626070 - if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then - append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse - fi - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: f743270fbbe4e084be0f1496cbbcc6cb2fcaed85 Author: Michael Palimaka gentoo org> AuthorDate: Tue Sep 12 15:28:04 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Sep 12 15:28:20 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f743270f dev-qt/qtdeclarative: apply forgotten changes to 5.10. Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.10..ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit python-any-r1 qt5-build +inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { + # this is supposed to be handled by the build system (src/qml/qml.pro), + # fails because we override QMAKE_CXXFLAGS. bug 626070 + if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse + fi + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 4512a456df71b4e9efb59b9952cc74ea565d9a03 Author: Michael Palimaka gentoo org> AuthorDate: Mon Sep 11 13:10:37 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Sep 11 13:11:04 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4512a456 dev-qt/qtdeclarative: avoid runtime crashes when built with GCC 6 Gentoo-bug: 626070 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild| 8 +++- dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild | 8 +++- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 8 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit python-any-r1 qt5-build +inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { + # this is supposed to be handled by the build system (src/qml/qml.pro), + # fails because we override QMAKE_CXXFLAGS. bug 626070 + if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse + fi + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit python-any-r1 qt5-build +inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { + # this is supposed to be handled by the build system (src/qml/qml.pro), + # fails because we override QMAKE_CXXFLAGS. bug 626070 + if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse + fi + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit python-any-r1 qt5-build +inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { + # this is supposed to be handled by the build system (src/qml/qml.pro), + # fails because we override QMAKE_CXXFLAGS. bug 626070 + if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse + fi + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: f38b5de13295251f4db568f2d08c65925fe95d49 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jul 23 02:22:18 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jul 23 02:34:28 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f38b5de1 dev-qt/qtdeclarative: switch to qt_use_disable_mod Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild| 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild index 13e05c9e..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild @@ -36,8 +36,8 @@ RDEPEND="${COMMON_DEPEND} src_prepare() { use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - use localstorage || sed -i -e '/localstorage/d' \ - src/imports/imports.pro || die + qt_use_disable_mod localstorage sql \ + src/imports/imports.pro qt_use_disable_mod widgets widgets \ src/src.pro \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild index 13e05c9e..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9..ebuild @@ -36,8 +36,8 @@ RDEPEND="${COMMON_DEPEND} src_prepare() { use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - use localstorage || sed -i -e '/localstorage/d' \ - src/imports/imports.pro || die + qt_use_disable_mod localstorage sql \ + src/imports/imports.pro qt_use_disable_mod widgets widgets \ src/src.pro \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 13e05c9e..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -36,8 +36,8 @@ RDEPEND="${COMMON_DEPEND} src_prepare() { use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - use localstorage || sed -i -e '/localstorage/d' \ - src/imports/imports.pro || die + qt_use_disable_mod localstorage sql \ + src/imports/imports.pro qt_use_disable_mod widgets widgets \ src/src.pro \
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: c5bc0231247caad5c5198553a5dc52b3842519e9 Author: Davide Pesavento gentoo org> AuthorDate: Wed Oct 12 11:57:33 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Oct 12 11:57:33 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c5bc0231 dev-qt/qtdeclarative: add python3_5 Package-Manager: portage-2.3.1 dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild | 3 +-- dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild | 3 +-- dev-qt/qtdeclarative/qtdeclarative-5.8..ebuild | 3 +-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild index c51da86..3840a9f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild @@ -3,8 +3,7 @@ # $Id$ EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_{4,5} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild index 3df6e0d..373a7be 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild @@ -3,8 +3,7 @@ # $Id$ EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_{4,5} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.8..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.8..ebuild index 3df6e0d..373a7be 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.8..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.8..ebuild @@ -3,8 +3,7 @@ # $Id$ EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_{4,5} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 3df6e0d..373a7be 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -3,8 +3,7 @@ # $Id$ EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_{4,5} ) inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 87d35ed276b25d060ec4612b8baf1186fc5d Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 6 15:22:42 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 6 15:23:08 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=87d35ed2 dev-qt/qtdeclarative: remove blocker introduced by accident Package-Manager: portage-2.3.1 dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild index 3df6e0d..c51da86 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild @@ -16,7 +16,7 @@ fi IUSE="gles2 +jit localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 -COMMON_DEPEND=" +RDEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV}[gles2=] ~dev-qt/qtnetwork-${PV} @@ -28,12 +28,9 @@ COMMON_DEPEND=" ~dev-qt/qtxmlpatterns-${PV} ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} ${PYTHON_DEPS} " -RDEPEND="${COMMON_DEPEND} - !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 6447ec1f8ab760e25383edc3578e8ca92f6ba5a9 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 6 15:20:26 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 6 15:20:55 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6447ec1f dev-qt/qtdeclarative: python is required at build time Gentoo-bug: 593250 Package-Manager: portage-2.3.1 dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild | 13 ++--- dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild | 11 --- dev-qt/qtdeclarative/qtdeclarative-5.8..ebuild | 11 --- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 11 --- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild index cbbb871..3df6e0d 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild @@ -3,7 +3,9 @@ # $Id$ EAPI=6 -inherit qt5-build + +PYTHON_COMPAT=( python2_7 python3_4 ) +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -14,7 +16,7 @@ fi IUSE="gles2 +jit localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 -DEPEND=" +COMMON_DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV}[gles2=] ~dev-qt/qtnetwork-${PV} @@ -26,7 +28,12 @@ DEPEND=" ~dev-qt/qtxmlpatterns-${PV} ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} +" +RDEPEND="${COMMON_DEPEND} + !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 6d2d7d240d5d2f2836d3918c915691b727f553e3 Author: Davide Pesavento gentoo org> AuthorDate: Sun May 29 23:58:06 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Sun May 29 23:58:06 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6d2d7d24 dev-qt/qtdeclarative: block older qtquickcontrols due to file collisions Gentoo-Bug: 579390 Package-Manager: portage-2.3.0_rc1 dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild | 4 +++- dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild | 4 +++- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild index cbbb871..dd88f47 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild @@ -26,7 +26,9 @@ DEPEND=" ~dev-qt/qtxmlpatterns-${PV} ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: edf5b4efb0300314db0d61793f6dd4f4c0be53ce Author: Davide Pesavento gentoo org> AuthorDate: Sun May 29 23:10:01 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Sun May 29 23:10:01 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=edf5b4ef dev-qt/qtdeclarative: xmllistmodel requires also qtnetwork Package-Manager: portage-2.3.0_rc1 dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild | 8 ++-- dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild | 8 ++-- dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild | 8 ++-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 8 ++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild index d3c6c3a..cbbb871 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild @@ -21,7 +21,10 @@ DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( ~dev-qt/qtxmlpatterns-${PV} ) + xml? ( + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtxmlpatterns-${PV} + ) " RDEPEND="${DEPEND}" @@ -41,7 +44,8 @@ src_prepare() { qt_use_disable_mod xml xmlpatterns \ src/imports/imports.pro \ - tests/auto/quick/quick.pro + tests/auto/quick/quick.pro \ + tests/auto/quick/examples/examples.pro qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild index d3c6c3a..cbbb871 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild @@ -21,7 +21,10 @@ DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( ~dev-qt/qtxmlpatterns-${PV} ) + xml? ( + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtxmlpatterns-${PV} + ) " RDEPEND="${DEPEND}" @@ -41,7 +44,8 @@ src_prepare() { qt_use_disable_mod xml xmlpatterns \ src/imports/imports.pro \ - tests/auto/quick/quick.pro + tests/auto/quick/quick.pro \ + tests/auto/quick/examples/examples.pro qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild index d3c6c3a..cbbb871 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild @@ -21,7 +21,10 @@ DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( ~dev-qt/qtxmlpatterns-${PV} ) + xml? ( + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtxmlpatterns-${PV} + ) " RDEPEND="${DEPEND}" @@ -41,7 +44,8 @@ src_prepare() { qt_use_disable_mod xml xmlpatterns \ src/imports/imports.pro \ - tests/auto/quick/quick.pro + tests/auto/quick/quick.pro \ + tests/auto/quick/examples/examples.pro qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index d3c6c3a..cbbb871 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -21,7 +21,10 @@ DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( ~dev-qt/qtxmlpatterns-${PV} ) + xml? ( + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtxmlpatterns-${PV} + ) " RDEPEND="${DEPEND}" @@ -41,7 +44,8 @@ src_prepare() { qt_use_disable_mod xml xmlpatterns \ src/imports/imports.pro \ - tests/auto/quick/quick.pro + tests/auto/quick/quick.pro \ + tests/auto/quick/examples/examples.pro qt5-build_src_prepare }
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 680fadd0bf5ee2951bbad1bf2481ab8ab99a32cd Author: Davide Pesavento gentoo org> AuthorDate: Wed Jan 20 17:31:21 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 20 17:31:21 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=680fadd0 dev-qt/qtdeclarative: do not call epatch manually Package-Manager: portage-2.2.27 dev-qt/qtdeclarative/qtdeclarative-5.6.0_beta.ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.0_beta.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.0_beta.ebuild index e0fe3e3..ad43659 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6.0_beta.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6.0_beta.ebuild @@ -26,7 +26,7 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild index e0fe3e3..ad43659 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild @@ -26,7 +26,7 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index e0fe3e3..ad43659 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -26,7 +26,7 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: a3796a566fdabd71e36b32bbe57fe14a9cfc2dfd Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 15:38:04 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 15:51:54 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a3796a56 dev-qt/qtdeclarative: fix dev-qt/qtwidgets automagic Gentoo-bug: 560858 Package-Manager: portage-2.2.20.1 dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild| 5 ++--- dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild | 5 ++--- dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild | 5 ++--- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild index 6e560db..d6202e6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild @@ -31,11 +31,10 @@ src_prepare() { use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die - use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \ - src/qmltest/qmltest.pro || die - qt_use_disable_mod widgets widgets \ src/src.pro \ + src/qmltest/qmltest.pro \ + tests/auto/auto.pro \ tools/tools.pro \ tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild index 6e560db..d6202e6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild @@ -31,11 +31,10 @@ src_prepare() { use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die - use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \ - src/qmltest/qmltest.pro || die - qt_use_disable_mod widgets widgets \ src/src.pro \ + src/qmltest/qmltest.pro \ + tests/auto/auto.pro \ tools/tools.pro \ tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild index 6e560db..d6202e6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild @@ -31,11 +31,10 @@ src_prepare() { use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die - use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \ - src/qmltest/qmltest.pro || die - qt_use_disable_mod widgets widgets \ src/src.pro \ + src/qmltest/qmltest.pro \ + tests/auto/auto.pro \ tools/tools.pro \ tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 6e560db..d6202e6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -31,11 +31,10 @@ src_prepare() { use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die - use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \ - src/qmltest/qmltest.pro || die - qt_use_disable_mod widgets widgets \ src/src.pro \ + src/qmltest/qmltest.pro \ + tests/auto/auto.pro \ tools/tools.pro \ tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/files/
commit: 07529d2a4ce81d8a3b6273a5ed6e39e15cd88fe9 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 1 17:22:37 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 1 17:22:37 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=07529d2a dev-qt/qtdeclarative: add missing patch Gentoo-bug: 561986 Package-Manager: portage-2.2.20.1 .../files/qtdeclarative-5.4.2-disable-jit.patch| 18 ++ 1 file changed, 18 insertions(+) diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch new file mode 100644 index 000..7799ef7 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch @@ -0,0 +1,18 @@ +diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h +index 4b08194..224ddb1 100644 +--- a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h +@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } + #undef V4_ENABLE_JIT + #endif + #endif + ++// Gentoo note: disable the JIT due to USE="-jit" ++#ifdef V4_ENABLE_JIT ++#undef V4_ENABLE_JIT ++#endif ++ + // Do certain things depending on whether the JIT is enabled or disabled + + #ifdef V4_ENABLE_JIT + #define ENABLE_YARR_JIT 1
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtscript/
commit: 2a78d6eaf28a7ad6b0e17e756c8dc94c429bce69 Author: Davide Pesavento pesa AT gentoo DOT org AuthorDate: Mon Aug 24 19:27:27 2015 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Mon Aug 24 19:27:27 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2a78d6ea dev-qt/qt{declarative,script}: sync with gentoo.git wrt USE=jit Signed-off-by: Davide Pesavento pesa AT gentoo.org dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild| 4 +++- dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild | 4 +++- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 4 +++- dev-qt/qtscript/qtscript-5.5.0.ebuild | 9 - dev-qt/qtscript/qtscript-5.5..ebuild | 9 - dev-qt/qtscript/qtscript-5..ebuild | 9 - 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild index 70af74e..6e560db 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 fi -IUSE=gles2 localstorage +widgets xml +IUSE=gles2 +jit localstorage +widgets xml # qtgui[gles2=] is needed because of bug 504322 DEPEND= @@ -26,6 +26,8 @@ DEPEND= RDEPEND=${DEPEND} src_prepare() { + use jit || epatch ${FILESDIR}/${PN}-5.4.2-disable-jit.patch + use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild index 70af74e..6e560db 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 fi -IUSE=gles2 localstorage +widgets xml +IUSE=gles2 +jit localstorage +widgets xml # qtgui[gles2=] is needed because of bug 504322 DEPEND= @@ -26,6 +26,8 @@ DEPEND= RDEPEND=${DEPEND} src_prepare() { + use jit || epatch ${FILESDIR}/${PN}-5.4.2-disable-jit.patch + use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index 70af74e..6e560db 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 fi -IUSE=gles2 localstorage +widgets xml +IUSE=gles2 +jit localstorage +widgets xml # qtgui[gles2=] is needed because of bug 504322 DEPEND= @@ -26,6 +26,8 @@ DEPEND= RDEPEND=${DEPEND} src_prepare() { + use jit || epatch ${FILESDIR}/${PN}-5.4.2-disable-jit.patch + use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtscript/qtscript-5.5.0.ebuild b/dev-qt/qtscript/qtscript-5.5.0.ebuild index 3912f2f..2eadc8c 100644 --- a/dev-qt/qtscript/qtscript-5.5.0.ebuild +++ b/dev-qt/qtscript/qtscript-5.5.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 fi -IUSE=scripttools +IUSE=+jit scripttools DEPEND= =dev-qt/qtcore-${PV}:5 @@ -28,3 +28,10 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + $(usex jit '' JAVASCRIPTCORE_JIT=no) + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtscript/qtscript-5.5..ebuild b/dev-qt/qtscript/qtscript-5.5..ebuild index 3912f2f..2eadc8c 100644 --- a/dev-qt/qtscript/qtscript-5.5..ebuild +++ b/dev-qt/qtscript/qtscript-5.5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 fi -IUSE=scripttools +IUSE=+jit scripttools DEPEND= =dev-qt/qtcore-${PV}:5 @@ -28,3 +28,10 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + $(usex jit '' JAVASCRIPTCORE_JIT=no) + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtscript/qtscript-5..ebuild b/dev-qt/qtscript/qtscript-5..ebuild index 3912f2f..2eadc8c 100644 --- a/dev-qt/qtscript/qtscript-5..ebuild +++ b/dev-qt/qtscript/qtscript-5..ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 fi -IUSE=scripttools +IUSE=+jit scripttools DEPEND= =dev-qt/qtcore-${PV}:5 @@ -28,3 +28,10 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + $(usex jit ''
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtmultimedia/, dev-qt/qtprintsupport/, ...
commit: 5d02af58a0482e6967f56e78b6ec4e9d5eff00f7 Author: Davide Pesavento pesa AT gentoo DOT org AuthorDate: Wed Jun 10 18:02:52 2015 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Wed Jun 10 18:02:52 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5d02af58 [dev-qt] Make opengl support mandatory in qtgui:5, adjust reverse deps. This helps to avoid a whole class of nasty bugs similar to #532140. dev-qt/qt3d/qt3d-5..ebuild | 2 +- dev-qt/qtdeclarative/metadata.xml | 2 +- dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 4 ++-- dev-qt/qtdiag/qtdiag-5.4..ebuild | 4 ++-- dev-qt/qtdiag/qtdiag-5.5..ebuild | 4 ++-- dev-qt/qtdiag/qtdiag-5..ebuild | 4 ++-- dev-qt/qtgui/metadata.xml | 2 +- dev-qt/qtgui/qtgui-5.4..ebuild | 26 -- dev-qt/qtgui/qtgui-5.5..ebuild | 26 -- dev-qt/qtgui/qtgui-5..ebuild | 26 -- dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild | 4 +--- dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 4 +--- dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 4 +--- dev-qt/qtopengl/metadata.xml | 2 +- dev-qt/qtopengl/qtopengl-5.4..ebuild | 4 ++-- dev-qt/qtopengl/qtopengl-5.5..ebuild | 4 ++-- dev-qt/qtopengl/qtopengl-5..ebuild | 4 ++-- dev-qt/qtprintsupport/metadata.xml | 3 +++ .../qtprintsupport/qtprintsupport-5.4..ebuild | 8 +++ .../qtprintsupport/qtprintsupport-5.5..ebuild | 8 +++ dev-qt/qtprintsupport/qtprintsupport-5..ebuild | 8 +++ dev-qt/qtwayland/qtwayland-5.4..ebuild | 2 +- dev-qt/qtwayland/qtwayland-5.5..ebuild | 2 +- dev-qt/qtwayland/qtwayland-5..ebuild | 2 +- dev-qt/qtwidgets/metadata.xml | 2 +- dev-qt/qtwidgets/qtwidgets-5.4..ebuild | 17 +++--- dev-qt/qtwidgets/qtwidgets-5.5..ebuild | 17 +++--- dev-qt/qtwidgets/qtwidgets-5..ebuild | 17 +++--- 30 files changed, 80 insertions(+), 140 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5..ebuild b/dev-qt/qt3d/qt3d-5..ebuild index 32eadeb..1dc75d1 100644 --- a/dev-qt/qt3d/qt3d-5..ebuild +++ b/dev-qt/qt3d/qt3d-5..ebuild @@ -16,7 +16,7 @@ IUSE= DEPEND= =dev-qt/qtcore-${PV}:5[debug=] - =dev-qt/qtgui-${PV}:5[debug=,opengl] + =dev-qt/qtgui-${PV}:5[debug=] =dev-qt/qtnetwork-${PV}:5[debug=] RDEPEND=${DEPEND} diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 0327c6d..f96540a 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -5,7 +5,7 @@ use flag name=exceptionsAdd support for exceptions - like catching them inside the event loop (recommended by upstream)/flag - flag name=gles2Use OpenGL ES instead of desktop OpenGL/flag + flag name=gles2Use GLES 2.0 or later instead of full OpenGL/flag flag name=localstorageBuild the LocalStorage import for QtQuick (requires QtSql)/flag flag name=qt3supportEnable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4./flag diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild index 8c3b826..c98c15c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild @@ -16,11 +16,11 @@ IUSE=gles2 localstorage +widgets xml # qtgui[gles2=] is needed because of bug 504322 DEPEND= =dev-qt/qtcore-${PV}:5[debug=] - =dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl] + =dev-qt/qtgui-${PV}:5[debug=,gles2=] =dev-qt/qtnetwork-${PV}:5[debug=] =dev-qt/qttest-${PV}:5[debug=] localstorage? ( =dev-qt/qtsql-${PV}:5[debug=] ) - widgets? ( =dev-qt/qtwidgets-${PV}:5[debug=] ) + widgets? ( =dev-qt/qtwidgets-${PV}:5[debug=,gles2=] ) xml? ( =dev-qt/qtxmlpatterns-${PV}:5[debug=] ) RDEPEND=${DEPEND} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild index 8c3b826..c98c15c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild @@ -16,11 +16,11 @@ IUSE=gles2 localstorage +widgets xml # qtgui[gles2=] is needed because of bug 504322 DEPEND= =dev-qt/qtcore-${PV}:5[debug=] - =dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl] +
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdbus/, dev-qt/qtxmlpatterns/, dev-qt/qtsql/, ...
commit: e637dd1716dc6ee01cc4b308db54afceda18d3f8 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Fri Dec 12 15:25:33 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Fri Dec 12 15:25:33 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e637dd17 [dev-qt] 5.4.0 is in the main tree. Package-Manager: portage-2.2.15 --- dev-qt/assistant/Manifest | 1 - dev-qt/assistant/assistant-5.4.0.ebuild| 42 -- dev-qt/designer/Manifest | 1 - dev-qt/designer/designer-5.4.0.ebuild | 45 -- dev-qt/linguist-tools/Manifest | 1 - dev-qt/linguist-tools/linguist-tools-5.4.0.ebuild | 40 -- dev-qt/linguist/Manifest | 1 - dev-qt/linguist/linguist-5.4.0.ebuild | 33 - dev-qt/pixeltool/Manifest | 1 - dev-qt/pixeltool/pixeltool-5.4.0.ebuild| 31 - dev-qt/qdbus/Manifest | 1 - dev-qt/qdbus/qdbus-5.4.0.ebuild| 30 dev-qt/qdbusviewer/Manifest| 1 - dev-qt/qdbusviewer/qdbusviewer-5.4.0.ebuild| 32 - dev-qt/qdoc/Manifest | 1 - dev-qt/qdoc/qdoc-5.4.0.ebuild | 29 dev-qt/qtconcurrent/Manifest | 1 - dev-qt/qtconcurrent/qtconcurrent-5.4.0.ebuild | 28 dev-qt/qtcore/Manifest | 1 - dev-qt/qtcore/qtcore-5.4.0.ebuild | 45 -- dev-qt/qtdbus/Manifest | 1 - dev-qt/qtdbus/qtdbus-5.4.0.ebuild | 44 -- dev-qt/qtdeclarative/Manifest | 1 - dev-qt/qtdeclarative/qtdeclarative-5.4.0.ebuild| 49 --- dev-qt/qtdiag/Manifest | 1 - dev-qt/qtdiag/qtdiag-5.4.0.ebuild | 30 dev-qt/qtgraphicaleffects/Manifest | 1 - .../qtgraphicaleffects-5.4.0.ebuild| 31 - dev-qt/qtgui/Manifest | 1 - dev-qt/qtgui/qtgui-5.4.0.ebuild| 152 - dev-qt/qthelp/Manifest | 1 - dev-qt/qthelp/qthelp-5.4.0.ebuild | 36 - dev-qt/qtimageformats/Manifest | 1 - dev-qt/qtimageformats/qtimageformats-5.4.0.ebuild | 27 dev-qt/qtmultimedia/Manifest | 1 - dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild | 63 - dev-qt/qtnetwork/Manifest | 1 - dev-qt/qtnetwork/qtnetwork-5.4.0.ebuild| 55 dev-qt/qtopengl/Manifest | 1 - dev-qt/qtopengl/qtopengl-5.4.0.ebuild | 39 -- dev-qt/qtpaths/Manifest| 1 - dev-qt/qtpaths/qtpaths-5.4.0.ebuild| 28 dev-qt/qtpositioning/Manifest | 1 - dev-qt/qtpositioning/qtpositioning-5.4.0.ebuild| 40 -- dev-qt/qtprintsupport/Manifest | 1 - dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild | 46 --- dev-qt/qtquick1/Manifest | 1 - dev-qt/qtquick1/qtquick1-5.4.0.ebuild | 52 --- dev-qt/qtquickcontrols/Manifest| 1 - .../qtquickcontrols/qtquickcontrols-5.4.0.ebuild | 36 - dev-qt/qtscript/Manifest | 1 - dev-qt/qtscript/qtscript-5.4.0.ebuild | 33 - dev-qt/qtsensors/Manifest | 1 - dev-qt/qtsensors/qtsensors-5.4.0.ebuild| 30 dev-qt/qtserialport/Manifest | 1 - dev-qt/qtserialport/qtserialport-5.4.0.ebuild | 23 dev-qt/qtsql/Manifest | 1 - dev-qt/qtsql/qtsql-5.4.0.ebuild| 58 dev-qt/qtsvg/Manifest | 1 - dev-qt/qtsvg/qtsvg-5.4.0.ebuild| 27 dev-qt/qttest/Manifest | 1 - dev-qt/qttest/qttest-5.4.0.ebuild | 34 - dev-qt/qttranslations/Manifest | 1 - dev-qt/qttranslations/qttranslations-5.4.0.ebuild | 23 dev-qt/qtwayland/Manifest | 1 - dev-qt/qtwayland/qtwayland-5.4.0.ebuild| 42 -- dev-qt/qtwebkit/Manifest | 1 - dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild | 89 dev-qt/qtwebsockets/Manifest | 1 - dev-qt/qtwebsockets/qtwebsockets-5.4.0.ebuild | 31 - dev-qt/qtwidgets/Manifest | 1 - dev-qt/qtwidgets/qtwidgets-5.4.0.ebuild| 57 dev-qt/qtx11extras/Manifest| 1 -
[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/
commit: 5d80ca71ee095d15aca1d9a4e654ceb41c26b1f2 Author: Davide Pesavento pesa AT gentoo DOT org AuthorDate: Sat Aug 2 22:44:43 2014 + Commit: Davide Pesavento pesa AT gentoo DOT org CommitDate: Sat Aug 2 22:44:43 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5d80ca71 [dev-qt/qtdeclarative:5] Add USE=gles2 in order to fix bug 504322. Plus a couple of fixes wrt USE=widgets. Package-Manager: portage-2.2.10 --- dev-qt/qtdeclarative/metadata.xml | 7 +++ dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild| 9 ++--- dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild | 9 ++--- dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 9 ++--- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index b0bba8a..db5d53d 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -5,14 +5,13 @@ use flag name=exceptionsAdd support for exceptions - like catching them inside the event loop (recommended by Nokia)/flag - flag name=localstorageBuild the LocalStorage import for - QtQuick (requires QtSql)/flag + flag name=gles2Use OpenGL ES instead of desktop OpenGL/flag + flag name=localstorageBuild the LocalStorage import for QtQuick (requires QtSql)/flag flag name=qt3supportEnable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4./flag flag name=webkitBuild the WebView QML component/flag flag name=widgetsEnable QtWidgets support/flag - flag name=xmlBuild the XmlListModel import for QtQuick2 - (requires QtXmlPatterns)/flag + flag name=xmlBuild the XmlListModel import for QtQuick (requires QtXmlPatterns)/flag /use upstream bugs-tohttps://bugreports.qt-project.org//bugs-to diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild index d01f6f9..c40af5a 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild @@ -14,11 +14,11 @@ else KEYWORDS=~amd64 ~x86 fi -IUSE=+localstorage +widgets +xml +IUSE=gles2 +localstorage +widgets +xml DEPEND= =dev-qt/qtcore-${PV}:5[debug=] - =dev-qt/qtgui-${PV}:5[debug=,opengl] + =dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl] =dev-qt/qtnetwork-${PV}:5[debug=] =dev-qt/qttest-${PV}:5[debug=] localstorage? ( =dev-qt/qtsql-${PV}:5[debug=] ) @@ -31,8 +31,11 @@ src_prepare() { use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die + use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \ + src/qmltest/qmltest.pro || die + qt_use_disable_mod widgets widgets \ - src/imports/imports.pro \ + src/src.pro \ tools/tools.pro \ tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild index d01f6f9..c40af5a 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild @@ -14,11 +14,11 @@ else KEYWORDS=~amd64 ~x86 fi -IUSE=+localstorage +widgets +xml +IUSE=gles2 +localstorage +widgets +xml DEPEND= =dev-qt/qtcore-${PV}:5[debug=] - =dev-qt/qtgui-${PV}:5[debug=,opengl] + =dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl] =dev-qt/qtnetwork-${PV}:5[debug=] =dev-qt/qttest-${PV}:5[debug=] localstorage? ( =dev-qt/qtsql-${PV}:5[debug=] ) @@ -31,8 +31,11 @@ src_prepare() { use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die + use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \ + src/qmltest/qmltest.pro || die + qt_use_disable_mod widgets widgets \ - src/imports/imports.pro \ + src/src.pro \ tools/tools.pro \ tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro diff --git a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild index d01f6f9..c40af5a 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild @@ -14,11 +14,11 @@ else KEYWORDS=~amd64 ~x86 fi -IUSE=+localstorage +widgets +xml +IUSE=gles2 +localstorage +widgets +xml DEPEND= =dev-qt/qtcore-${PV}:5[debug=] - =dev-qt/qtgui-${PV}:5[debug=,opengl] +