diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qt-creator/Manifest | 4 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-18.0.1.ebuild (renamed from dev-qt/qt-creator/qt-creator-17.0.2.ebuild) | 18 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/files/qtdeclarative-6.10.1-QTBUG-142331.patch | 66 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.15.18-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.15.18.ebuild | 68 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.10.1-r1.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-6.10.1.ebuild) | 4 | ||||
| -rw-r--r-- | dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch | 15 | ||||
| -rw-r--r-- | dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild | 2 | ||||
| -rw-r--r-- | dev-qt/qtquick3d/qtquick3d-6.9999.ebuild | 2 |
9 files changed, 97 insertions, 84 deletions
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 4756661cbab4..d423340fab64 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,4 +1,4 @@ -DIST qt-creator-opensource-src-17.0.2-vendor.tar.xz 509064 BLAKE2B 961adde1b6d093cbbcbba4d3794d2f1aeb0dd2c701c30a38abbb65531b8af9d215f223a95ef2ce1b79f401fd663844548586c394e46ebb321ba93b5d9d8303b1 SHA512 f4972a9e286f0d3edfc7d7ed7ed6db8022ec720be94ba310f2f142ccbcadfda262405725f8d6cf9695f719f26e7c3eb5386e07c8fdd05fab5a1dc6d55cfbdf26 -DIST qt-creator-opensource-src-17.0.2.tar.xz 55745020 BLAKE2B bbaf4c14c61fed188342a8a1fc09409f41464e06f7256194670f3eba018776f3bbd4af8c839efd9f2e39c8b420cd95db1fb9f418b75996f39df74a2d8f3e8434 SHA512 db444e723d0b05436a3c7c00861b4da4ce751a3ae70af274f48bb339789172f49f265e6094d68170114a72c22bb7432eb1bb697d1d563ff69b9fcdd48cdfcb28 DIST qt-creator-opensource-src-18.0.0-vendor.tar.xz 510428 BLAKE2B a189b7e467ba0f9297b510a76d7261596cb19d52530129b40417577d3653892190734bc54fa3d95317bb31e367b255d7a9320f40c3d24ea69b9400eeadb4890f SHA512 3fcf4573ae1b2c7d77a8503fbd7d47182bc78a3baa0769ec9261cb6f88e259a1efef6a5f6500959f11a0c9cb503f684e1ee6da999fe434c26d74aabce91d97c7 DIST qt-creator-opensource-src-18.0.0.tar.xz 56167564 BLAKE2B 45f3a0284e1ce3c91c8c69075afd39a3108d1c7082ad25c39d32a99c1ff009799d4485b0602d11d03c610f6fdb0d823606cff495c641ea8bca115cd265ce93fb SHA512 180bb491947b2b57d5420fdda3bc184b22e1158b6f6e292ada294b7c32b4d3696cb99674b92a75682d405eb573d96ecebbf5d80db90de1d7748aaca59ebb4781 +DIST qt-creator-opensource-src-18.0.1-vendor.tar.xz 509236 BLAKE2B 571b06b87b5a3f94647c303c3b75ec791b805f029f6a6acc8a3b221a18ec842d7a3558bdade3933d0edade4a1ecc1f19860a4b560349296c090b33c4a005ad4d SHA512 0f0f200506140ce1f94d5e0750739902d28d93a3d25d67b6c4c76113ce172a6a33257ed5fcb446385af96abb71220bc0bf91122a8984f4fb11ea2e2cff939288 +DIST qt-creator-opensource-src-18.0.1.tar.xz 56192968 BLAKE2B fad37e224753bceec96f8583c6801eaa26d2355f16402d695551933b662fef2cf9b00ff0bea54bb04ce3d572155fb6465defed7ffafb76f999b0123d8391b57e SHA512 0f293afe2464fd71b49a8dbd0c8e9e020ff403a55509db43d75ac71a367fac43d86d1655541d28dcda7ab999d54df35668a1092a2b71e3e7f96aec7c81a11ee2 diff --git a/dev-qt/qt-creator/qt-creator-17.0.2.ebuild b/dev-qt/qt-creator/qt-creator-18.0.1.ebuild index 9471ab42a13e..f8c5b71c2a25 100644 --- a/dev-qt/qt-creator/qt-creator-17.0.2.ebuild +++ b/dev-qt/qt-creator/qt-creator-18.0.1.ebuild @@ -29,7 +29,7 @@ else cmdbridge-server? ( https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz ) " S=${WORKDIR}/${QTC_P} - KEYWORDS="amd64" + KEYWORDS="~amd64" fi DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" @@ -51,7 +51,6 @@ QT_PV=6.7.3:6 COMMON_DEPEND=" app-arch/libarchive:= dev-cpp/yaml-cpp:= - >=dev-qt/qt5compat-${QT_PV} >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,ssl,widgets,xml] >=dev-qt/qtdeclarative-${QT_PV}= clang? ( @@ -186,11 +185,9 @@ src_configure() { -DBUILD_PLUGIN_HELP=$(usex help) -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + # TODO?: unbundle litehtml, but support for latest releases + # tend to lag behind and bundled may work out better for now -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # https://bugreports.qt.io/browse/QTCREATORBUG-29169 - $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) # help shouldn't use with the above, but qmldesigner is automagic $(use help || use qmldesigner && @@ -200,8 +197,8 @@ src_configure() { -DENABLE_SVG_SUPPORT=$(usex svg) -DWITH_QMLDESIGNER=$(usex qmldesigner) - $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925 - -DUPX_BIN=UPX_BIN-NOTFOUND #961623 + -DBUILD_EXECUTABLE_CMDBRIDGE=$(usex cmdbridge-server) #945925 + $(usev cmdbridge-server -DUPX_BIN=UPX_BIN-NOTFOUND) #961623 # meant to be in sync with qtbase[journald], but think(?) not worth # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays @@ -223,9 +220,8 @@ src_test() { local -x QT_QPA_PLATFORM=offscreen local CMAKE_SKIP_TESTS=( - # tst_Process::recursiveBlockingProcess() broke in 17.0.0, not really looked - # into yet but does not seem to cause visible issues, skip for now (unknown - # if it passes upstream given their CI is failing to run tests right now) + # broke since 17.0.0 and hasn't really been looked into yet, + # does not seem to cause visible problems so skipping for now tst_process # skipping same tests+label as upstream's CI by default # `grep ctest .github/workflows/build_cmake.yml` diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.10.1-QTBUG-142331.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.10.1-QTBUG-142331.patch new file mode 100644 index 000000000000..7109559a29a2 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-6.10.1-QTBUG-142331.patch @@ -0,0 +1,66 @@ +https://qt-project.atlassian.net/browse/QTBUG-142331 +https://mail.kde.org/pipermail/distributions/2025-December/001648.html +https://bugs.kde.org/show_bug.cgi?id=512754 +https://codereview.qt-project.org/c/qt/qtdeclarative/+/696524 +--- a/src/qml/jsruntime/qv4lookup_p.h ++++ b/src/qml/jsruntime/qv4lookup_p.h +@@ -160,4 +160,8 @@ + } qobjectMethodLookup; + struct { ++ // NB: None of this is actually cache-able. The metaobject may change at any time. ++ // We invalidate this data every time the lookup is invoked and thereby force a ++ // re-initialization next time. ++ + quintptr isConstant; // This is a bool, encoded as 0 or 1. Both values are ignored by gc + quintptr metaObject; // a (const QMetaObject* & 1) or nullptr +--- a/src/qml/qml/qqml.cpp ++++ b/src/qml/qml/qqml.cpp +@@ -1378,14 +1378,14 @@ + static FallbackPropertyQmlData findFallbackPropertyQmlData(QV4::Lookup *lookup, QObject *object) + { ++ // We've just initialized the lookup. So everything must be fine here. ++ + QQmlData *qmlData = QQmlData::get(object); +- if (qmlData && qmlData->isQueuedForDeletion) +- return {qmlData, nullptr, PropertyResult::Deleted}; + ++ Q_ASSERT(!qmlData || !qmlData->isQueuedForDeletion); + Q_ASSERT(!QQmlData::wasDeleted(object)); + + const QMetaObject *metaObject + = reinterpret_cast<const QMetaObject *>(lookup->qobjectFallbackLookup.metaObject - 1); +- if (!metaObject || metaObject != object->metaObject()) +- return {qmlData, nullptr, PropertyResult::NeedsInit}; ++ Q_ASSERT(metaObject == object->metaObject()); + + return {qmlData, metaObject, PropertyResult::OK}; +@@ -2577,4 +2577,5 @@ + case QV4::Lookup::Call::ContextGetterScopeObjectPropertyFallback: + result = loadFallbackProperty(lookup, qmlScopeObject, target, this); ++ lookup->call = QV4::Lookup::Call::ContextGetterGeneric; + break; + default: +@@ -2608,4 +2609,5 @@ + case QV4::Lookup::Call::ContextGetterScopeObjectPropertyFallback: + result = writeBackFallbackProperty(lookup, qmlScopeObject, source); ++ lookup->call = QV4::Lookup::Call::ContextGetterGeneric; + break; + default: +@@ -2808,4 +2810,5 @@ + ? loadFallbackAsVariant(lookup, object, target, this) + : loadFallbackProperty(lookup, object, target, this); ++ lookup->call = QV4::Lookup::Call::GetterGeneric; + break; + default: +@@ -2842,4 +2845,5 @@ + ? writeBackFallbackAsVariant(lookup, object, source) + : writeBackFallbackProperty(lookup, object, source); ++ lookup->call = QV4::Lookup::Call::GetterGeneric; + break; + default: +@@ -3002,4 +3006,5 @@ + ? storeFallbackAsVariant(engine->handle(), lookup, object, value) + : storeFallbackProperty(lookup, object, value); ++ lookup->call = QV4::Lookup::Call::SetterGeneric; + break; + default: diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.18-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.18-r1.ebuild index 68526eb4386e..a7e398b935ca 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.18-r1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.18-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi PYTHON_COMPAT=( python3_{11..14} ) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.18.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.18.ebuild deleted file mode 100644 index 4130b852a9b5..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.18.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2009-2025 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 x86" -fi - -PYTHON_COMPAT=( python3_{11..14} ) -inherit flag-o-matic python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -IUSE="cpu_flags_x86_sse2 gles2-only +jit localstorage vulkan +widgets" -REQUIRED_USE="jit? ( x86? ( cpu_flags_x86_sse2 ) )" - -# 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 -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.10.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.10.1-r1.ebuild index eb34cbcde726..43c9a1f694de 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.10.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.10.1-r1.ebuild @@ -32,6 +32,10 @@ BDEPEND=" ~dev-qt/qtshadertools-${PV}:6 " +PATCHES=( + "${FILESDIR}"/${PN}-6.10.1-QTBUG-142331.patch +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch b/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch new file mode 100644 index 000000000000..fb2ec7180157 --- /dev/null +++ b/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch @@ -0,0 +1,15 @@ +Seems that the '5' enforces the major version and it refuses to find +system's assimp-6.0.2 (which is perfectly usable given Qt 6.9.2 bundles +that version without it). + +We don't package older ones, so drop the check as a quick workaround. + +https://bugreports.qt.io/browse/QTBUG-137996 +--- a/src/plugins/assetimporters/configure.cmake ++++ b/src/plugins/assetimporters/configure.cmake +@@ -16 +16 @@ +-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp ++qt_find_package(WrapQuick3DAssimp PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp +@@ -43 +43 @@ +- PACKAGES PACKAGE WrapQuick3DAssimp 5.1.6) ++ PACKAGES PACKAGE WrapQuick3DAssimp) diff --git a/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild index 0ae502e79761..d9574f2c9091 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild @@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch "${FILESDIR}"/${PN}-6.6.2-x32abi.patch - "${FILESDIR}"/${PN}-6.9.2-assimp6.patch + "${FILESDIR}"/${PN}-6.11.0-assimp6.patch ) src_configure() { diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild index 0ae502e79761..d9574f2c9091 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild @@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch "${FILESDIR}"/${PN}-6.6.2-x32abi.patch - "${FILESDIR}"/${PN}-6.9.2-assimp6.patch + "${FILESDIR}"/${PN}-6.11.0-assimp6.patch ) src_configure() { |