From 9aa97b9a2dc85237ce1ccf53a082de26b513f8c3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 23 Jan 2023 20:18:00 +0100 Subject: dev-qt/qtdeclarative: drop 5.15.7, 5.15.7-r1 Signed-off-by: Andreas Sturmlechner --- dev-qt/qtdeclarative/Manifest | 2 - ...tive-5.15.7-a11y-track-item-enabled-state.patch | 57 ------------------ .../qtdeclarative/qtdeclarative-5.15.7-r1.ebuild | 68 ---------------------- dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild | 67 --------------------- 4 files changed, 194 deletions(-) delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.15.7-r1.ebuild delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index a67365f7f3a8..010fbac7a108 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,6 +1,4 @@ -DIST qtdeclarative-5.15.7-gentoo-kde-1.tar.xz 24768 BLAKE2B 4595a64432e7c05eb51d9b565189d7f1d76e4d372db4247f1c21f8b4a655a0243c2487203ea669ac88143bb3f3d5dad969370d56522b046bc8fcc28d6597e124 SHA512 96859b52ccc453379c9137587176a26f99f2d4339bbf9008f8268585e77852339b32ffd86b57715109d573b5c6e2ad4963638ae946359d5b46e7a2e570ab2c64 DIST qtdeclarative-5.15.8-gentoo-kde-1.tar.xz 19932 BLAKE2B e889597ce322d642f0a1a60fd47b23a34b7d40585ab34841cfbce2225c24a4c56075698a3c9b9b93eb8dce80f2a42140269b84538a6c2817997221404892c180 SHA512 88c9483fca6eb10ecf4810dac369260b7d85372a1b698ea9587201398f65d442b6f8bd87603a277acc71f94e6f7cff2cca750888261a3b31c2734c09415d1fd3 -DIST qtdeclarative-everywhere-opensource-src-5.15.7.tar.xz 21591224 BLAKE2B bdb11b3929419a80a3ccd4bbcbc38c17069f1ddbfe5a8bb06345afda7d1cec66396b262b8e2783227912fca90c62b83b388922f631fb284b3b4476c43882276a SHA512 909721a7c756ad3f55fa30b539ddd7f459449edc599883a4e04acbe6f1cecaf44b3a5f2b3b17adb83adaf8cd3e1e5e7e09829b30b0df3dacb1e203892b996508 DIST qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz 21592984 BLAKE2B 623264ffcca9f623896d73ce946cc0f621bdae50b520e454b59a1888a2c767f0ff089f69ed1c5e028d01fd28ae447add826fb09c615718af61e787fa1849b16e SHA512 c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73 DIST qtdeclarative-everywhere-src-6.4.0.tar.xz 30538764 BLAKE2B 919081ba8a29a07daa01084388454a3d5f814e12ff5d1a4d3b647650e4bd6a839876baee1ab09e664e55e814338dbf675e70e4c44c28842a363c8f2dcf1a2b18 SHA512 6d43c09a14e2ca236fc50166ed477e37084e89a67a04d914f30f31662a18a4e6d0433cb9b2f0654ba9ffcbcd7abcb5dadcb7b12f0ef5928fc11b10925ee6f41e DIST qtdeclarative-everywhere-src-6.4.2.tar.xz 30564432 BLAKE2B b445672bfd91978855d11eac953c01902522ffe5c3bb48296f926be6234ee7dccfbb3386478633b81a44cbb067ef2078cf3c05a0b7358ae15e635c0d5ab9ccc6 SHA512 76742b8b0902802c1d7615c8b7948b245a535c5f9574893d0fc5f8e09cb914578c1243be23dee37f98bd037e9407f82bc71b22b688067aaa68efcec1db8f922a diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch deleted file mode 100644 index e41838a34e30..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f697f2e1a4c5f60f3f09ae7d2e3d3dcd20854aef Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Mon, 28 Nov 2022 14:59:33 +0100 -Subject: [PATCH 1/2] a11y: track item enabled state -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -disabled items are neither enabled nor focusable - -Change-Id: I4f286c7b85605d5ad6fa787d1f5cfcce1297d268 -Reviewed-by: Volker Hilsheimer -Reviewed-by: Jan Arve Sæther -(cherry picked from commit 20fd2902a6d7bdb4a3306005d2718ca5a8fef96d) ---- - src/quick/accessible/qaccessiblequickitem.cpp | 4 ++++ - src/quick/items/qquickitem.cpp | 9 +++++++++ - 2 files changed, 13 insertions(+) - -diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp -index eb3df4d4cd..78e2ab302c 100644 ---- a/src/quick/accessible/qaccessiblequickitem.cpp -+++ b/src/quick/accessible/qaccessiblequickitem.cpp -@@ -210,6 +210,10 @@ QAccessible::State QAccessibleQuickItem::state() const - if (role() == QAccessible::EditableText) - if (auto ti = qobject_cast(item())) - state.passwordEdit = ti->echoMode() != QQuickTextInput::Normal; -+ if (!item()->isEnabled()) { -+ state.focusable = false; -+ state.disabled = true; -+ } - return state; - } - -diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp -index 4cf73ff73d..dec0ae19ae 100644 ---- a/src/quick/items/qquickitem.cpp -+++ b/src/quick/items/qquickitem.cpp -@@ -6174,6 +6174,15 @@ void QQuickItemPrivate::setEffectiveEnableRecur(QQuickItem *scope, bool newEffec - } - - itemChange(QQuickItem::ItemEnabledHasChanged, effectiveEnable); -+#if QT_CONFIG(accessibility) -+ if (isAccessible) { -+ QAccessible::State changedState; -+ changedState.disabled = true; -+ changedState.focusable = true; -+ QAccessibleStateChangeEvent ev(q, changedState); -+ QAccessible::updateAccessibility(&ev); -+ } -+#endif - emit q->enabledChanged(); - } - --- -2.38.1 - diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.7-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.7-r1.ebuild deleted file mode 100644 index f865ec6efb2f..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.7-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2009-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -PYTHON_COMPAT=( python3_{9..11} ) -inherit flag-o-matic python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -IUSE="gles2-only +jit localstorage vulkan +widgets" - -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - =dev-qt/qtcore-${QT5_PV}* - =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=] ) -" -RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 - "${FILESDIR}/${P}-a11y-track-item-enabled-state.patch" # kde/5.15 -) - -src_prepare() { - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - 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 - - qt5-build_src_prepare -} - -src_configure() { - replace-flags "-Os" "-O2" # bug 840861 - - local myqmakeargs=( - -- - -qml-debug - $(qt_use jit feature-qml-jit) - ) - 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 qmlpreview 5 - qt5_symlink_binary_to_path qmlscene 5 -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild deleted file mode 100644 index ef4219df3a48..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.7.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2009-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -PYTHON_COMPAT=( python3_{9..11} ) -inherit flag-o-matic python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -IUSE="gles2-only +jit localstorage vulkan +widgets" - -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - =dev-qt/qtcore-${QT5_PV}* - =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=] ) -" -RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 -) - -src_prepare() { - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - 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 - - qt5-build_src_prepare -} - -src_configure() { - replace-flags "-Os" "-O2" # bug 840861 - - local myqmakeargs=( - -- - -qml-debug - $(qt_use jit feature-qml-jit) - ) - 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 qmlpreview 5 - qt5_symlink_binary_to_path qmlscene 5 -} -- cgit v1.2.3-65-gdbad