diff options
Diffstat (limited to 'dev-qt')
-rw-r--r-- | dev-qt/Manifest.gz | bin | 11717 -> 11722 bytes | |||
-rw-r--r-- | dev-qt/qt-creator/Manifest | 8 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch | 24 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch | 18 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 268 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-14.0.0.ebuild | 268 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-14.0.1.ebuild | 2 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/Manifest | 5 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch | 42 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 9 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.2-musl-cstdint.patch | 12 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 1 |
17 files changed, 115 insertions, 547 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 0b238e69748a..977d88fee862 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 9aad7dfb1671..705a66d1016c 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,10 +1,8 @@ AUX qt-creator-11.0.2-musl-no-execinfo.patch 1305 BLAKE2B 14fba3e72188403cf457de46c50960bb69336023e74173a2a67c0e3101cbf8367cc0d0a31118efdaf715a184e558b6f2277fe8025035de482f6913e139660792 SHA512 707d09268cff8981d1baf7fa08c48a2c02edf044a7a76594d545a2a020616090c8b61851dff8d8a8350c024b39be932c9f7bc266e01b87680c7982759b1d96c4 AUX qt-creator-12.0.0-musl-no-malloc-trim.patch 343 BLAKE2B 9c4b87a0de20616dc8cf5da4523c347f963c3459efdd9a716387690775f96abe0bb60bf0e147dd01ded79a110d1222b4009b17cece71998b46d62dd8b83eeac6 SHA512 6a0807bab971a795a156f974dab2b12699a4c90a6c7380e2dd0a136ba44354791ef7a178f79e61100c3165ec7667a72d6ca7f3c43f4958ccf9e8611995ca191d -DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac -DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db SHA512 75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc +AUX qt-creator-14.0.1-clang19.patch 1046 BLAKE2B 2d1fefe8c48d448d51ca5c25e5f91cc178300312e8f420055a15e0bfecf5d916244460bbc6d9acff738116f3a2e272a7ab758bd6cf5884286e5e8013a2801656 SHA512 39e164ba1efe0b6fea70ec8ff62f0f46fa376f1ee85e450c67da1f6ba5ed00d571f94b4976be4b4f1e87ffcf56a5585761a5a1a319df67d17a56a13061e1303f +AUX qt-creator-14.0.1-sol2-clang19-gcc15.patch 741 BLAKE2B 237b4e1f0bf1c02bd05fe4d146a029aa98ffd1f95407f806c7b917732afedc4615c73b75e07d773597717acbbe97dc1760a320e3dca7b9a919fad988ca1dae0d SHA512 9dd50273c0410d95f9324bd83147426cfaf37c792cb563d39a9c1b6db2afd5021c4c52b69c61de4640a5dc45c71b625e8906ace9ca1aeaeed61eb0bcbd39b53d DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176 SHA512 5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a -EBUILD qt-creator-13.0.2.ebuild 7583 BLAKE2B eb914c0c2310d2e304e73e6317343e70b27100a9ffd362e88c85708f2cd3569f32e1c64a0e965266562e1438f0a530c5081a2c6d1a0a5d9c40bdd10a457c1e29 SHA512 cda7869d9ebf7bbe19cc335c36b3a3b03d00c0df66f665f2130b42f468ab078185581c2a0f470f9047f5c1e8e3f6f1db4868a149b335e9e67991f9b064d54f63 -EBUILD qt-creator-14.0.0.ebuild 7552 BLAKE2B 1db97625d669b81e1d1618dd32270ebcfcb5ad09c9668bab056881db69c997e444775af9823f0777da8faaf337d12b2bf53509123bbcdc637b09733e695d6f52 SHA512 d8ff5c9b4b0911e6ba4fbf10c07da9031da029a0fcfa1c069533e78dde2c57d93178d3fe4a373bf76c3106800773e129b3d4203d4be678fba9996fecc72f66b7 -EBUILD qt-creator-14.0.1.ebuild 7551 BLAKE2B 9429a4ca8d23af6504009337cb5613c2233289139f5d6f30678d46b50164f7b504623dc8872901140e75f02474a70b0d89f7b508667d87e261e864145e805f28 SHA512 c3ccb5d0d9fe29dda2748de9576d8ce61bd7e82c80fdffde360a1bf31cae0bd35525ac8f3cb4becb524c3ae43b8f0b9c449af4c12a78e06611caf99cbc382951 +EBUILD qt-creator-14.0.1.ebuild 7646 BLAKE2B c5d0aba46ea7177fb3428902b5164cb1bcd51bba3e78cdc93fcfe115157722f0a5124104abb6414bee5ddb533d4ce9f6a59dcfb2565c6807bec4c49b28e83615 SHA512 1c0b78608cad3668701766c344e9cd92c80c2e59ee8c48c10f71875b9360dd778a534fb5caf81779ed7b8a853951837aa87d285721d0266d9401bea6fef6b00d EBUILD qt-creator-9999.ebuild 8166 BLAKE2B e2a5f7590996e392acbce720df7cee0f17036188457be31856989fd5e50944c8506f50e6f94500265f6ce9c07075895b831ccd144c2ed705b65cf8c730661e79 SHA512 8918c474f45a8cdb3f2a79aa3e2e149eca6fbc0491a018acd6ad5fef3de4f1c1d536099c4e9b2d1eeebc02994f7aed6e1b5f8116d95ac46d2407f0696f4c5dac MISC metadata.xml 1241 BLAKE2B 0d68bad4f8bdf857a44107e1b22299ce2e1ac84c2b2197f33e5f3c99562e4cd1d68982a2048961bd1d469a497f4cf4942005cdfb7876a6cdc720ed19e81e7a6d SHA512 33e3e7021d07f83f2ddd39120ac695394963978c80acdd8e2f0713e7cd485ac705ba11168276bb43f3f80b9c1122dd98a5359f342c2c075c2fd8ebddb93084b6 diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch new file mode 100644 index 000000000000..e296f5bf68be --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/937600 + +qt-creator has a workaround for clang (formerly) lacking an implementation +for __cpp_template_template_args, but the workaround causes issues now that +it is available. + +https://github.com/llvm/llvm-project/pull/89807 +https://github.com/qt-creator/qt-creator/commit/d400dce35d817afd719ffadf8c8f43c8814c05c1 +--- a/src/libs/utils/algorithm.h ++++ b/src/libs/utils/algorithm.h +@@ -259,5 +259,5 @@ + typename ResultContainer = C<Result>> + Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function); +-#ifdef Q_CC_CLANG ++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args) + // "Matching of template template-arguments excludes compatible templates" + // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html (P0522R0) +@@ -810,5 +810,5 @@ + } + +-#ifdef Q_CC_CLANG ++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args) + template<template<typename, typename> class C, // result container type + typename SC, // input container type diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch new file mode 100644 index 000000000000..29e600ca33ef --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/938486 +https://bugs.gentoo.org/937600 +https://bugs.gentoo.org/936924 +https://bugreports.qt.io/browse/QTCREATORBUG-31517 +https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f +https://codereview.qt-project.org/c/qt-creator/qt-creator/+/587620 +--- a/src/libs/3rdparty/sol2/include/sol/sol.hpp ++++ b/src/libs/3rdparty/sol2/include/sol/sol.hpp +@@ -6818,7 +6818,8 @@ + static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args"); + + *this = nullopt; +- this->construct(std::forward<Args>(args)...); ++ new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...); ++ return **this; + } + + /// Swaps this optional with the other. diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild deleted file mode 100644 index ee0fcd198e6e..000000000000 --- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( {15..18} ) -LLVM_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI=( - "https://code.qt.io/qt-creator/qt-creator.git" - "https://github.com/qt-creator/qt-creator.git" - ) - EGIT_SUBMODULES=( - perfparser - src/libs/qlitehtml - src/libs/qlitehtml/src/3rdparty/litehtml - ) -else - QTC_PV=${PV/_/-} - QTC_P=${PN}-opensource-src-${QTC_PV} - [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development - SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" - S=${WORKDIR}/${QTC_P} - KEYWORDS="amd64" -fi - -DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" -HOMEPAGE="https://www.qt.io/product/development-tools" - -LICENSE="GPL-3" -SLOT="0" -IUSE=" - +clang designer doc +help keyring plugin-dev qmldesigner - serialterminal +svg test +tracing webengine -" -REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN - -# := is used where Qt's private APIs are used for safety -COMMON_DEPEND=" - dev-cpp/yaml-cpp:= - >=dev-qt/qt5compat-${QT_PV} - >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QT_PV}= - clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') ) - designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) - help? ( - >=dev-qt/qttools-${QT_PV}[assistant] - webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) - ) - keyring? ( - app-crypt/libsecret - dev-libs/glib:2 - ) - qmldesigner? ( - >=dev-qt/qtquick3d-${QT_PV}= - >=dev-qt/qtsvg-${QT_PV} - ) - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - tracing? ( - app-arch/zstd:= - dev-libs/elfutils - >=dev-qt/qtshadertools-${QT_PV} - ) -" -# qtimageformats for .webp in examples, semi-optfeature but useful in general -RDEPEND=" - ${COMMON_DEPEND} - help? ( >=dev-qt/qtimageformats-${QT_PV} ) - qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-qt/qttools-${QT_PV}[linguist] - doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch - "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch -) - -pkg_setup() { - python-any-r1_pkg_setup - use clang && llvm-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # needed for finding docs at runtime in PF - sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ - -i cmake/QtCreatorAPIInternal.cmake || die - - if use plugin-dev; then #928423 - # cmake --install --component integrates poorly with the cmake - # eclass and the install targets are otherwise missing, so strip - # out EXCLUDE_FROM_ALL until figure out a better solution - find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ - 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die - fi -} - -src_configure() { - # -Werror=lto-type-mismatch issues, needs looking into - filter-lto - - # temporary workaround for musl-1.2.4 (bug #903611), this ideally - # needs fixing in qtbase as *64 usage comes from its headers' macros - use elibc_musl && append-lfs-flags - - local mycmakeargs=( - -DBUILD_WITH_PCH=no - -DWITH_DOCS=$(usex doc) - -DBUILD_DEVELOPER_DOCS=$(usex doc) - -DWITH_TESTS=$(usex test) - - # TODO: try unbundling now that slot 6 exists+unmasked (bug #934462) - -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes - - # Much can be optional, but do not want to flood users (or maintainers) - # with too many flags. Not to mention that many plugins are merely - # wrappers around still optional tools (e.g. cvs) and any unwanted - # plugins can be disabled at runtime. So optional flags are limited - # to plugins with additional build-time dependencies. - -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual - -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) - - -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) - -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) - -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) - -DCLANGTOOLING_LINK_CLANG_DYLIB=yes - - -DBUILD_PLUGIN_DESIGNER=$(usex designer) - - -DBUILD_PLUGIN_HELP=$(usex help) - -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) - -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) - - -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) - - -DENABLE_SVG_SUPPORT=$(usex svg) - - -DWITH_QMLDESIGNER=$(usex qmldesigner) - - # meant to be in sync with qtbase[journald], but think(?) not worth - # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays - -Djournald=no - - # not packaged, but allow using if found - #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes - - # for bundled qtkeychain (no switch to unbundle right now) - # reminder: if ever unbundled/optional, qtbase[dbus] can be removed - -DLIBSECRET_SUPPORT=$(usex keyring) - ) - - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - - local CMAKE_SKIP_TESTS=( - # skipping same tests+label as upstream's CI by default - # `grep ctest .github/workflows/build_cmake.yml` - tst_perfdata - ) - - cmake_src_test --label-exclude exclude_from_precheck -} - -src_compile() { - cmake_src_compile - - use doc && cmake_build {qch,html}_docs -} - -src_install() { - cmake_src_install - - if use doc; then - dodoc -r "${BUILD_DIR}"/doc/html - dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch - fi - - local DISABLE_AUTOFORMATTING=yes - local DOC_CONTENTS="\ -Some plugins (if used) may need optional extra dependencies/USE. - -This list provides associations with Gentoo's packages (if exists) -ordered as in Qt Creator's Help -> About Plugins (not exhaustive). - -dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or -else the example tab will be empty alongside missing documentation. - -Build Systems: -- CMakeProjectManager (dev-build/cmake) -- MesonProjectManager (dev-build/meson) -- QbsProjectManager (dev-util/qbs) - -C++: -- Beautifier (dev-util/astyle and/or dev-util/uncrustify) -- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) -- ClangFormat (USE=clang) - -Code Analyzer: -- ClangTools (USE=clang) -- Cppcheck (dev-util/cppcheck) -- CtfVisualizer (USE=tracing) -- PerfProfiler (USE=tracing) -- Valgrind (dev-debug/valgrind) - -Core: -- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") - -Device Support: -- Android (virtual/jdk, will also want the unpackaged Qt for Android) - -Other Languages: -- Nim (dev-lang/nim) -- Python (dev-lang/python) - -Qt Creator: -- Designer (USE=designer) - -Qt Quick: -- Insight (USE=qmldesigner) -- QmlDesigner (USE=qmldesigner) -- QmlProfiler (USE=tracing) - -Utilities: -- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) -- Conan (dev-util/conan) -- Docker (app-containers/docker) -- Haskell (dev-lang/ghc) -- ScreenRecorder (media-video/ffmpeg) -- SerialTerminal (USE=serialterminal) -- SilverSearcher (sys-apps/the_silver_searcher) -- StudioWelcome (USE=qmldesigner) - -Version Control: -- CVS (dev-vcs/cvs) -- Fossil (dev-vcs/fossil) -- Git (dev-vcs/git) -- Mercurial (dev-vcs/mercurial) -- Subversion (dev-vcs/subversion)" - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - readme.gentoo_print_elog -} diff --git a/dev-qt/qt-creator/qt-creator-14.0.0.ebuild b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild deleted file mode 100644 index a04b85dcdd48..000000000000 --- a/dev-qt/qt-creator/qt-creator-14.0.0.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( {15..18} ) -LLVM_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI=( - "https://code.qt.io/qt-creator/qt-creator.git" - "https://github.com/qt-creator/qt-creator.git" - ) - EGIT_SUBMODULES=( - perfparser - src/libs/qlitehtml - src/libs/qlitehtml/src/3rdparty/litehtml - ) -else - QTC_PV=${PV/_/-} - QTC_P=${PN}-opensource-src-${QTC_PV} - [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development - SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" - S=${WORKDIR}/${QTC_P} - KEYWORDS="~amd64" -fi - -DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" -HOMEPAGE="https://www.qt.io/product/development-tools" - -LICENSE="GPL-3" -SLOT="0" -IUSE=" - +clang designer doc +help keyring plugin-dev qmldesigner - serialterminal +svg test +tracing webengine -" -REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -QT_PV=6.5.4:6 - -# := is used where Qt's private APIs are used for safety -COMMON_DEPEND=" - dev-cpp/yaml-cpp:= - >=dev-qt/qt5compat-${QT_PV} - >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QT_PV}= - clang? ( - $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= - sys-devel/llvm:${LLVM_SLOT}= - ') - ) - designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) - help? ( - >=dev-qt/qttools-${QT_PV}[assistant] - webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) - ) - keyring? ( - app-crypt/libsecret - dev-libs/glib:2 - ) - qmldesigner? ( - >=dev-qt/qtquick3d-${QT_PV}= - >=dev-qt/qtsvg-${QT_PV} - ) - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - tracing? ( - app-arch/zstd:= - dev-libs/elfutils - >=dev-qt/qtshadertools-${QT_PV} - ) -" -# qtimageformats for .webp in examples, semi-optfeature but useful in general -RDEPEND=" - ${COMMON_DEPEND} - help? ( >=dev-qt/qtimageformats-${QT_PV} ) - qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-qt/qttools-${QT_PV}[linguist] - doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch - "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch -) - -pkg_setup() { - python-any-r1_pkg_setup - use clang && llvm-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # needed for finding docs at runtime in PF - sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ - -i cmake/QtCreatorAPIInternal.cmake || die - - if use plugin-dev; then #928423 - # cmake --install --component integrates poorly with the cmake - # eclass and the install targets are otherwise missing, so strip - # out EXCLUDE_FROM_ALL until figure out a better solution - find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ - 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die - fi -} - -src_configure() { - # -Werror=lto-type-mismatch issues, needs looking into - filter-lto - - # temporary workaround for musl-1.2.4 (bug #903611), this ideally - # needs fixing in qtbase as *64 usage comes from its headers' macros - use elibc_musl && append-lfs-flags - - local mycmakeargs=( - -DBUILD_DEVELOPER_DOCS=$(usex doc) - -DBUILD_DOCS_BY_DEFAULT=$(usex doc) - -DBUILD_WITH_PCH=no - -DWITH_DOCS=$(usex doc) - -DWITH_TESTS=$(usex test) - - # sticking to bundled for now until it switches to KF6's - -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes - - # Much can be optional, but do not want to flood users (or maintainers) - # with too many flags. Not to mention that many plugins are merely - # wrappers around still optional tools (e.g. cvs) and any unwanted - # plugins can be disabled at runtime. So optional flags are limited - # to plugins with additional build-time dependencies. - -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual - -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) - - -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) - -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) - -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) - -DCLANGTOOLING_LINK_CLANG_DYLIB=yes - - -DBUILD_PLUGIN_DESIGNER=$(usex designer) - - -DBUILD_PLUGIN_HELP=$(usex help) - -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) - -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) - - -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) - - -DENABLE_SVG_SUPPORT=$(usex svg) - - -DWITH_QMLDESIGNER=$(usex qmldesigner) - - # meant to be in sync with qtbase[journald], but think(?) not worth - # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays - -Djournald=no - - # not packaged, but allow using if found - #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes - - # for bundled qtkeychain (no switch to unbundle right now) - # reminder: if ever unbundled/optional, qtbase[dbus] can be removed - -DLIBSECRET_SUPPORT=$(usex keyring) - ) - - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - - local CMAKE_SKIP_TESTS=( - # skipping same tests+label as upstream's CI by default - # `grep ctest .github/workflows/build_cmake.yml` - tst_perfdata - ) - - cmake_src_test --label-exclude exclude_from_precheck -} - -src_install() { - cmake_src_install - - if use doc; then - dodoc -r "${BUILD_DIR}"/doc/html - dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch - fi - - local DISABLE_AUTOFORMATTING=yes - local DOC_CONTENTS="\ -Some plugins (if used) may need optional extra dependencies/USE. - -This list provides associations with Gentoo's packages (if exists) -ordered as in Qt Creator's Help -> About Plugins (not exhaustive). - -dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or -else the example tab will be empty alongside missing documentation. - -Build Systems: -- CMakeProjectManager (dev-build/cmake) -- MesonProjectManager (dev-build/meson) -- QbsProjectManager (dev-util/qbs) - -C++: -- Beautifier (dev-util/astyle and/or dev-util/uncrustify) -- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) -- ClangFormat (USE=clang) - -Code Analyzer: -- ClangTools (USE=clang) -- Cppcheck (dev-util/cppcheck) -- CtfVisualizer (USE=tracing) -- PerfProfiler (USE=tracing) -- Valgrind (dev-debug/valgrind) - -Core: -- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") - -Device Support: -- Android (virtual/jdk, will also want the unpackaged Qt for Android) - -Other Languages: -- Nim (dev-lang/nim) -- Python (dev-lang/python) - -Qt Creator: -- Designer (USE=designer) - -Qt Quick: -- Insight (USE=qmldesigner) -- QmlDesigner (USE=qmldesigner) -- QmlProfiler (USE=tracing) - -Utilities: -- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) -- Conan (dev-util/conan) -- Docker (app-containers/docker) -- Haskell (dev-lang/ghc) -- ScreenRecorder (media-video/ffmpeg) -- SerialTerminal (USE=serialterminal) -- SilverSearcher (sys-apps/the_silver_searcher) -- StudioWelcome (USE=qmldesigner) - -Version Control: -- CVS (dev-vcs/cvs) -- Fossil (dev-vcs/fossil) -- Git (dev-vcs/git) -- Mercurial (dev-vcs/mercurial) -- Subversion (dev-vcs/subversion)" - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - readme.gentoo_print_elog -} diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild index 78c4cd5ea7ef..57312a5304e4 100644 --- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild @@ -91,6 +91,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch + "${FILESDIR}"/${PN}-14.0.1-clang19.patch + "${FILESDIR}"/${PN}-14.0.1-sol2-clang19-gcc15.patch ) pkg_setup() { diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 9a238c6bdcb9..92d4090dcdef 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,10 +1,11 @@ +AUX qtmultimedia-6.7.2-ffmpeg-6.1.2.patch 2059 BLAKE2B 67af9cb2b860b46dd643b5677a9c50bde9d2f58db9262283b4de8a3708e1a1e7a23063dbdbf14ff6952a4150a9d716d22089535adbd611a2340c7fe1f780a6ec SHA512 33815330435ff9f21659161c1be3085bbb5b3ddd0449748bb962cd1f64ca4a4349b2a26e0615affb56250172e5fefe21fac4e569bab6a832cc563127ef2bb328 AUX qtmultimedia-6.7.2-gstreamer-no-v4l.patch 567 BLAKE2B e7adab12e4823370677e0c466058cf4966b8384937edb7759ecb84062fcd43f205944835bbf9885a99bf117d310a7e6d23b05a167cab3be2ef994c21a7ebc07e SHA512 dc41e9e82ef2a740bba967cc6430f0e72c88810b978bb61e78b6f19fc980de9744cf9f05f7d787bc2c5807c54fb630b83b58c805d693d7c2306588773c1db481 DIST qtmultimedia-5.15.14-gentoo-kde-1.tar.xz 1492 BLAKE2B e2474990d9efc327f35a979c1f317cb213c6121b4e1285294c132a1266eaeb559e7239c7cd58da072e50dc85dd9aa0c1b6aa493f95fe31268171780cd3346883 SHA512 5427c7a5e06f8296b091b2bb3fc67e678ac01bd1179de5a11c38cfe9f87ba8e3ac87a1395c2c3044ad31fc5c040230e35a1e71e173e12109c24cd97da70d9e9d DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c95b4f14e566c667e16c4eb264e466174a9548c6a4bd39dbab9cf14ddad444cc3318ecdf18ca9e3999a3f95a669fd121937287d466a6b9a9c14af74ff686 SHA512 6059bd9aec65888ed6f3a1f87506a94ea567f9e064bb4a586859bc8f76ee4dca573eb256623452ddd9daf2305f49c707673425ea08edca9cd2db7b56bf5cab9c DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91 -EBUILD qtmultimedia-6.7.2-r2.ebuild 3247 BLAKE2B cf452a84f0b696c23d1e01261292284b019c1f8331684b27f24e5cc0e6d12a759ab8af62823aecbcf76359ec1f81863ff469cf0239c92c959ccfd8cb388c0a55 SHA512 e69f82784a2ad6416b98b630ce01c7f76df6c6d56c3ac968bd6ccccadc8270c1d614af2b524663b53fb6cf7a84bba1f3e613217a5607bbe5e63d34a6b30570a2 -EBUILD qtmultimedia-6.7.9999.ebuild 3579 BLAKE2B 5ae33052c36f731ec01f34fdc059360351b108c85f86054a6620a5f014f8c12db302fabab8ac16779b4993c19633a57dc91d89e9febfff272c074f512f0d2762 SHA512 d958f74a47e59417dab96104e4154d73af7c00d4c49601b06173ef306019f09d38fef31bc28fb364a9f888477fb6cb8d767b0924638183cbdd00c38ee8b9eb3b +EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84 +EBUILD qtmultimedia-6.7.9999.ebuild 3608 BLAKE2B 1ee127fe1352a46e26f487800599baf10a7317362921a31a09721738e007236c3382b7223b90a345aab40a627db6213e5bc3a424c8437796159eec5082d5b2cd SHA512 713a37bde7cd80849d350b054df8e9f466397025d368e1b466948079d0cc50d7a46dcc03d1b7c1125bfc61219b905a48f274244972c31c296e504c78a4fd9967 EBUILD qtmultimedia-6.8.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f EBUILD qtmultimedia-6.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch new file mode 100644 index 000000000000..d364699fc401 --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch @@ -0,0 +1,42 @@ +Fix was for ffmpeg-7.0.1 (masked) but the change was backported to 6.1.2. + +Should hardly be an issue but it does cause a test failure when it +attempts to compare the return error when reading a (intentionally) +corrupted file (aborts either way, just differently). Still some time +until 6.7.3, and prefer to keep tests in a working state meanwhile. + +https://bugreports.qt.io/browse/QTBUG-126687 +https://github.com/qt/qtmultimedia/commit/8d809d56697f8d23669a9b1476ac0b0748e32e0d +From: Pavel Dubsky <pavel.dubsky@qt.io> +Date: Wed, 10 Jul 2024 14:42:51 +0200 +Subject: [PATCH] Process FFmpeg AVERROR_INVALIDDATA from avformat_open_input + +FFmpeg version n7.0.1 changed the error code that is returned from +function mp3_read_header: AVERROR(EINVAL) -> AVERROR_INVALIDDATA. + +Task-number: QTBUG-126687 +Pick-to: 6.8 6.7 6.5 +Change-Id: I6aee7771a9d1f80ea459376711d5264bed9a7bac +Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> +--- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp ++++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp +@@ -194,7 +194,7 @@ loadMedia(const QUrl &mediaUrl, QIODevice *stream, const std::shared_ptr<ICancel + auto code = QMediaPlayer::ResourceError; + if (ret == AVERROR(EACCES)) + code = QMediaPlayer::AccessDeniedError; +- else if (ret == AVERROR(EINVAL)) ++ else if (ret == AVERROR(EINVAL) || ret == AVERROR_INVALIDDATA) + code = QMediaPlayer::FormatError; + + return MediaDataHolder::ContextError{ code, QMediaPlayer::tr("Could not open file") }; +--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp ++++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +@@ -962,7 +962,7 @@ void tst_QMediaPlayerBackend::setSource_emitsError_whenSdpFileIsLoaded() + }); + + m_fixture->player.setSource(sdpUrl); +- QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::ResourceError); ++ QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::FormatError); + #endif // QT_CONFIG(process) + } + diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild index 74869683aa32..75aefa2fa156 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild @@ -57,6 +57,7 @@ BDEPEND="~dev-qt/qtshadertools-${PV}:6" PATCHES=( "${FILESDIR}"/${P}-gstreamer-no-v4l.patch + "${FILESDIR}"/${P}-ffmpeg-6.1.2.patch ) CMAKE_SKIP_TESTS=( diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild index 4aefaf7a465a..2921a408326e 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild @@ -70,6 +70,7 @@ CMAKE_SKIP_TESTS=( # tries to use real alsa or pulseaudio and fails in sandbox tst_qaudiosink tst_qaudiosource + tst_qmediacapture_gstreamer tst_qmediacapturesession tst_qmediaplayerbackend tst_qsoundeffect diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index c4df77bef8b5..847f693d0197 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -2,6 +2,7 @@ AUX qtwebengine-5.15.13_p20240510-gcc15.patch 1308 BLAKE2B d206c6df9b88f706ade2f AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610afe5af8ed60a90f94a248c0aa16b94f6df96e239e9c1cfe1fc40da487d3a25fc600a798b33c5bf8384c6d6cfcd0ff9446c20aae5f8f84 SHA512 b812dc26e6135cd69df9ef3b9049509be9888e012394af3c496b03666e80c63f4c827916398d94f7499f73739ca70829108b60705d5b2329f3134dd695a029eb AUX qtwebengine-5.15.14_p20240510-re2.patch 915 BLAKE2B a29abbec923f78dd7baafdc36b42ed9e0467885ecc04349cbbcec6727628627e84e0172f01e24b34c231d437b75f992b7a173532695085773d899dc94085c66b SHA512 45af510bafc1c838fe273652813d4130ecdef30152f57506b5b6580131cdbcf510acc5ae7bb8d44ac90072c8be7d75b4e0c187240a6522e184db8a11a204f2fc AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da +AUX qtwebengine-6.7.2-musl-cstdint.patch 463 BLAKE2B ebc2d97974e960d295a6f5d908b7af68faee59715580bf23bca367f982411686d6667706ed1e75aebb4fc2f0253c3b935e830b96cb6947760c190de5d9023ddf SHA512 677865bcc626a0adfc7e992115dfdb276bb0fbbe6f0a69e97331aa422210008ea4039654bc483901facd3f40e2f800316325f516299939922bf59adaa0053161 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474 DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f @@ -9,8 +10,8 @@ DIST qtwebengine-6.7-patchset-12.tar.xz 9788 BLAKE2B 2465c43fe859ea6edbb1c14d82f DIST qtwebengine-6.8-patchset-3.tar.xz 9260 BLAKE2B 6d4e0bcc24ecc16ce92f6d4483268e81f0d9a9cb2a351a46cd93b9103a6cedd478f3004a67380f364523db9c7c152eb4b5cb39046edaf52b223490e32d9022a2 SHA512 10982a896e61b18153fd8b38431cfba6956dacda2efd3d08d89e9617a2c1fb2d1286d32213b50ccc25046bf539862b3ba4379824526e021a5e793df986888881 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7758 BLAKE2B f1c2e30680f12164b8a1a55ecaecc6b7a786cd173ae3500825c7ef04ebd53bd579d2c74a7648ff65c3c302a0f2955313814e0fd1223d564fde76ff7e0039d6d5 SHA512 37591ca47d0df49df995be8af07da94f32ee3d5e03bf9acf987b9966092e48e481d8fac5c3af920265a4736e95f8200be24cf75683e577ef135249555ad6efa1 -EBUILD qtwebengine-6.7.2.ebuild 10336 BLAKE2B 1345fddaace77254f82ea205e093032f8667b6b0ff4614c15393d34cc5100c035e13103a7edf4a705c5d0e442e0a0d14a6b2c302b7bef93ca45ea0c2d12e90fc SHA512 635c6cab34d3b3bfd17a3773697146b72a5530a856027a11d52b8eba2bfbddf662bfae6197720acd4783c75a4e59d005ccf3dda12fbdcc8975814854a2398827 -EBUILD qtwebengine-6.7.9999.ebuild 9876 BLAKE2B f904bc7d9c44b86873766d505c6952f655917c59a255cb864712aa89d86724e0549699f6091a296be4ff53c7b212ff7037660c269319c65cbd0310a9546a5c9c SHA512 dff38c5c58a93de6fdc3a0a0c71d42e19699ab0d0826a2aa1e160f76f9e5fb28ef8e088e684487a43e596f4aa71d369d4076805e8201ac6f54076212403d5db2 -EBUILD qtwebengine-6.8.9999.ebuild 9961 BLAKE2B c259b87e0bee2cee73d86d630017747a37489fe3c6f717f62de30da2558589e3ab4d65099a5dce85b610b0f4eb131885720febd91c3662c862118607bfdc2e9e SHA512 90d57411fba88de7b0512a296ebd3e4288d042e837f5bc7e26e933291b9c37978e6cb05b84ce0e5cee3a9a3cd5c1aeb71e85586e35c9b7730f27fc1a62a22e1a -EBUILD qtwebengine-6.9999.ebuild 9961 BLAKE2B c259b87e0bee2cee73d86d630017747a37489fe3c6f717f62de30da2558589e3ab4d65099a5dce85b610b0f4eb131885720febd91c3662c862118607bfdc2e9e SHA512 90d57411fba88de7b0512a296ebd3e4288d042e837f5bc7e26e933291b9c37978e6cb05b84ce0e5cee3a9a3cd5c1aeb71e85586e35c9b7730f27fc1a62a22e1a +EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 6f20f921189366edc8f501ee0e1d3811fb1e57dfa75b2ff4ac80a50028e6394068415f65ae1bfb84dd9ae7d08a546fdb13050a4c42035dbe0ce6baa1c753534f SHA512 2292f3a7e9b24cdb312b6e9c725d8ad1ed33ee160038bd15d8fac568e53473ef18fe3f4f8bf484009221521325933b7e568b90546a157d10c74faa119c6bf44d +EBUILD qtwebengine-6.7.9999.ebuild 9922 BLAKE2B 9b9b5f474bbc1773c078d801a0a3abe24a8128426e77cc1d532e9d4f854d08a68b339206533f18a574482eb49781c53c3378ded85d91266fbbc93ecb3d55727e SHA512 5549656b0ff936f2765e6f1b7b498e259857c496dff089b4b180df2197b4b51f71da1528514f4fd5faf4d6b99cfbb5067fc2a9ad6e7026e0528d6aa3d501e0c6 +EBUILD qtwebengine-6.8.9999.ebuild 10007 BLAKE2B 4b52bac4f0e3a6c98f1e1cdc868818e969a7aa3a42dd9d66fa53e4d54b02ad14b4e7d2f6b8a475e74868a38707d7cd3ba6edea2a95962e641233e5d708e07616 SHA512 45d5d4fa66283b0bd237d756942a7d1ea0874b51a43474db5674771c53bd75b9830aea293b3ac3318b652b5e19f7a3d0f925087834d7442604f07aa8565ab296 +EBUILD qtwebengine-6.9999.ebuild 10007 BLAKE2B 4b52bac4f0e3a6c98f1e1cdc868818e969a7aa3a42dd9d66fa53e4d54b02ad14b4e7d2f6b8a475e74868a38707d7cd3ba6edea2a95962e641233e5d708e07616 SHA512 45d5d4fa66283b0bd237d756942a7d1ea0874b51a43474db5674771c53bd75b9830aea293b3ac3318b652b5e19f7a3d0f925087834d7442604f07aa8565ab296 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-musl-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-musl-cstdint.patch new file mode 100644 index 000000000000..c654e68fa2fc --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-musl-cstdint.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/939519 + +Just one more of these, should be merged with the cstdint patch +in patchset next update & ideally upstreamed eventually. +--- a/src/3rdparty/chromium/third_party/blink/public/common/page_state/page_state.h ++++ b/src/3rdparty/chromium/third_party/blink/public/common/page_state/page_state.h +@@ -6,4 +6,5 @@ + #define THIRD_PARTY_BLINK_PUBLIC_COMMON_PAGE_STATE_PAGE_STATE_H_ + ++#include <cstdint> + #include <string> + #include <vector> diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index a18dca6881d4..225a90310783 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild @@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index 49de5422603a..a6e9836f4ad9 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index fec93a911d24..2fc66a0cfb03 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -109,6 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index fec93a911d24..2fc66a0cfb03 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -109,6 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch ) python_check_deps() { |