diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index a942c97f881ee..cd0789de20a5e 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,5 +1,4 @@ DIST qtdeclarative-5.15.17-gentoo-kde-1.tar.xz 18464 BLAKE2B e72479cd8ace4ef3be544ebbc9cd812091627b0ea7d62543ce93db14a1f6c6e209102467c56189b3ca60cc7bedebe89b000fb4070566e6fa199cd80e53a015dd SHA512 eca93160d02359038ad838acd1034cd415f8282e974ddde9a1118e79a27f06b9f817eab69385c346c42b5202a8be8e62110dfa934fb0625c5be8ffb154d50e20 DIST qtdeclarative-everywhere-opensource-src-5.15.17.tar.xz 21605592 BLAKE2B 44cc5d5355028c927a0d7dca5c48466db0bf2b13040b4c384b0a5fb9570fe439fc2fd8813fc612a7b9fa9109c2703c6f67ec3b81c6a9dbc468ebf25ffb8c3944 SHA512 854d2b1aeb4b8b858c9ec5c33dc63e53823ef4391cf6953c715192d909d315c87fe859872c1d2c4f20cda22f43f400cb1c7a8d8500c1afd3ea0af9afe2800826 DIST qtdeclarative-everywhere-src-6.10.0-rc.tar.xz 37521376 BLAKE2B 4e63b14119ebf3026a3e8895a4f7c4753039e2325d2113358ac71807e1b227db52fafdb578ac64a7a2065b89a0634fcb0ebf9adea294819478601a891c11e452 SHA512 650e66904401a7feb15652cd661101109ca1824e5018b73bf5068007006fbef8e79b8d9c1b0f43496ddff06fbb7d532124dc2e87c74f8f90d81138a8691d7be7 -DIST qtdeclarative-everywhere-src-6.9.1.tar.xz 37006920 BLAKE2B 8c1e73484acb12b2792a8605cc758ebcba0ddd186371d1e0f5bfabaedf4fd1d7de73f4083eea92c9d56738b9077d2546dc39247cf4c59a18bb616cf1d86521de SHA512 665acf561f74373f5d220c7c7b8b32ded627d9d17bf709ad30b155863086c20c59f02032fbb8a8046bc6041576ff52ff67621a1b57e19657ad537e20aee024c4 DIST qtdeclarative-everywhere-src-6.9.2.tar.xz 37207872 BLAKE2B e5e85374a100eb92c6ed132b7e3cdfd0e5bf37457185f8cec224078b8d06e3cb1ebd61a19a062abde6e67cd5d96d4653c082f4792aacb9b5fc657955c1f3508f SHA512 75ec507c7c55089d91415f8365aef97456692dd563ac55571f73f1e5ace81e38a5515589b40a4e144790f9ab6ce4ed6150b26a79b62afc1bd6bad85d00306d1d diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-QTBUG-135158.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-QTBUG-135158.patch deleted file mode 100644 index d4ee052f8522b..0000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-QTBUG-135158.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugreports.qt.io/browse/QTBUG-135158 -https://codereview.qt-project.org/c/qt/qtdeclarative/+/647212 ---- a/src/quicktemplates/qquickpopuppositioner.cpp -+++ b/src/quicktemplates/qquickpopuppositioner.cpp -@@ -321,5 +321,8 @@ - : p->parentItem->mapToGlobal(windowPos.x(), windowPos.y()); - QRectF rect = { globalCoords.x(), globalCoords.y(), popupItem->width(), popupItem->height() }; -- if (!skipFittingStep) { -+ -+ // QTBUG-99618: On wayland, we can't use QWindow::mapToGlobal(), and should use a xdg_positioner instead. -+ static bool isWayland = QGuiApplication::platformName().startsWith(QLatin1String("wayland")); -+ if (!skipFittingStep && !isWayland) { - const QScreen *screenAtPopupPosition = QGuiApplication::screenAt(globalCoords.toPoint()); - const QScreen *screen = screenAtPopupPosition ? screenAtPopupPosition : QGuiApplication::primaryScreen(); diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch deleted file mode 100644 index f3a0b70e00b0e..0000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugreports.qt.io/browse/QTBUG-136998 -https://bugreports.qt.io/browse/QTBUG-137196 -https://bugreports.qt.io/browse/QTBUG-137411 -https://github.com/qt/qtdeclarative/commit/672e6777e8e6a8fd86c7877075e7a8aa0ea0a31a ---- a/src/qmlcompiler/qqmljsimportvisitor.cpp -+++ b/src/qmlcompiler/qqmljsimportvisitor.cpp -@@ -1042,14 +1042,15 @@ - - if (!prevRequiredScope.isNull()) { -- auto sourceScope = prevRequiredScope->baseType(); -- suggestion = QQmlJSFixSuggestion{ -- "%1:%2:%3: Property marked as required in %4."_L1 -- .arg(sourceScope->filePath()) -- .arg(sourceScope->sourceLocation().startLine) -- .arg(sourceScope->sourceLocation().startColumn) -- .arg(requiredScopeName), -- sourceScope->sourceLocation() -- }; -- suggestion->setFilename(sourceScope->filePath()); -+ if (auto sourceScope = prevRequiredScope->baseType()) { -+ suggestion = QQmlJSFixSuggestion{ -+ "%1:%2:%3: Property marked as required in %4."_L1 -+ .arg(sourceScope->filePath()) -+ .arg(sourceScope->sourceLocation().startLine) -+ .arg(sourceScope->sourceLocation().startColumn) -+ .arg(requiredScopeName), -+ sourceScope->sourceLocation() -+ }; -+ suggestion->setFilename(sourceScope->filePath()); -+ } - } else { - message += " (marked as required by %1)"_L1.arg(requiredScopeName); diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r2.ebuild deleted file mode 100644 index 0da3307cc0a07..0000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -QT6_HAS_STATIC_LIBS=1 -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -QT6_RESTRICT_TESTS=1 -inherit python-any-r1 qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" -fi - -IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] - qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) - svg? ( ~dev-qt/qtsvg-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND=" - ${PYTHON_DEPS} - ~dev-qt/qtshadertools-${PV}:6 -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.9.1-QTBUG-135158.patch - "${FILESDIR}"/${PN}-6.9.1-qmlcachegen-crash.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) - $(cmake_use_find_package sql Qt6Sql) - $(cmake_use_find_package svg Qt6Svg) - $(qt_feature jit qml_jit) - $(qt_feature network qml_network) - $(qt_feature ssl qml_ssl) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675 - eerror "${CATEGORY}/${PF} seems to have been improperly built and" - eerror "install was aborted to protect the system. Possibly(?) due" - eerror "to a rare portage ordering bug. If using portage, try:" - eerror " emerge -1 qtshadertools:6 qtdeclarative:6" - eerror "If that did not resolve the issue, please provide build.log" - eerror "on https://bugs.gentoo.org/940675" - die "aborting due to incomplete/broken build (see above)" - fi -}