diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-08-07 12:37:21 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-07 12:37:21 +0100 |
| commit | b8c7370a682e4e29cda623222d17a790c01c3642 (patch) | |
| tree | f6caa14689bd00a5760eadaa381ff41e50ef3c1b /dev-qt | |
| parent | 8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff) | |
gentoo auto-resync : 07:08:2024 - 12:37:20
Diffstat (limited to 'dev-qt')
41 files changed, 266 insertions, 206 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 506a003ad66f..415d759c314c 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/kdsingleapplication/Manifest b/dev-qt/kdsingleapplication/Manifest deleted file mode 100644 index b3af5416f518..000000000000 --- a/dev-qt/kdsingleapplication/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST kdsingleapplication-1.1.0.tar.gz 73558 BLAKE2B 26eda1d7a9a48f6167db9d2d7cd143ab45a08e96eef277cf1099c1ed24528f56ec54e8ab44671e7584937dc21d3437b15c033991e48fafd8b9fab10473e07864 SHA512 61b34a36b05c58ede881f38d78c767726f8e23dc230e292568013fa428f50ff674f7eb12bc4d76ceaa9ef444264b2e86d95ab14cc41c6a275bf917edb8832c1f -EBUILD kdsingleapplication-1.1.0.ebuild 2067 BLAKE2B b7d0fe48d4b4bc072f4c22676ca2db90ef14901d0cc52c4a83022afe0323e0fabb3eeeb15c791add97316e6d5515b184b42b55bb9f3a4995de55c3fa65415ef6 SHA512 68a700b624a5d252206aaad8f8414584663863bb26e8b7219d64775b4522399ef1e49989dbb5abe97aebe727bdc194519177fe29ed85974491dddc7bd4da6734 -MISC metadata.xml 342 BLAKE2B 9ecf17f92c2336c8059191f759d29d72ed4b8685387749198e6f3586f032f85c6254787b510037289cd29c90ae7c63cdf9f1eead23c649dceb53897edc16a62b SHA512 335f04722822a3030141ad5f00ed42176d243f0414cb7c9d94f9856261125147b87b38647eb8bd42596470800fefdcaca5af4b1c57a215264810624bfb43e468 diff --git a/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild b/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild deleted file mode 100644 index 67fef37a2e74..000000000000 --- a/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake multibuild - -DESCRIPTION="KDAB's helper class for single-instance policy applications" -HOMEPAGE="https://github.com/KDAB/KDSingleApplication" -SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kdsingleapplication-${PV}.tar.gz" - -LICENSE="BSD MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -IUSE="doc examples test qt6" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - qt6? ( - dev-qt/qtbase:6[network,widgets] - ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - doc? ( - app-text/doxygen[dot] - dev-qt/qthelp:5 - qt6? ( - dev-qt/qttools:6[assistant] - ) - ) - examples? ( - dev-util/patchelf - ) - dev-qt/qttest:5 -" - -pkg_setup() { - MULTIBUILD_VARIANTS=( qt5 $(usev qt6) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - ) - if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then - mycmakeargs+=( - -DKDSingleApplication_DOCS=OFF - -DKDSingleApplication_EXAMPLES=OFF - -DKDSingleApplication_QT6=ON - -DKDSingleApplication_TESTS=OFF - ) - else - mycmakeargs+=( - -DKDSingleApplication_DOCS=$(usex doc) - -DKDSingleApplication_EXAMPLES=$(usex examples) - -DKDSingleApplication_QT6=OFF - -DKDSingleApplication_TESTS=$(usex test) - ) - fi - cmake_src_configure - } - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake_src_compile -} - -src_test() { - mytest() { - [[ ${MULTIBUILD_VARIANT} == qt5 ]] && cmake_src_test - } - multibuild_foreach_variant mytest -} - -src_install() { - myinstall() { - cmake_src_install - if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then - rm -rf "${BUILD_DIR}"/docs/api/html/examples || die - use doc && HTML_DOCS="${BUILD_DIR}/docs/api/html/*" - if use examples; then - patchelf --remove-rpath "${BUILD_DIR}"/bin/widgetsingleapplication || die - dobin "${BUILD_DIR}"/bin/widgetsingleapplication - fi - fi - } - multibuild_foreach_variant myinstall - einstalldocs -} diff --git a/dev-qt/kdsingleapplication/metadata.xml b/dev-qt/kdsingleapplication/metadata.xml deleted file mode 100644 index a67b9dc76920..000000000000 --- a/dev-qt/kdsingleapplication/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> - </maintainer> - <upstream> - <remote-id type="github">KDAB/KDSingleApplication</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 64d90c611656..bf57ecb5fb4f 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,8 +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.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a SHA512 8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac -EBUILD qt-creator-13.0.1.ebuild 7500 BLAKE2B 4c45f30ac0f69b4dc816949df0d3433af3162e9f3fc25ee5cdbfce2be07e84c8066f0f9e70ca4cdbdb16b494a4af6d248c1d7ae997d2ad4c9c84c6a39c78518c SHA512 1fad52764ead14f568196c64ec4ce543f1327c60a7dbc3fbdf42c8b9af684c240398ab4056e9cfb8f07978c4c430ed69dbbcd76a8fdd5e2e4981783735937fa4 -EBUILD qt-creator-13.0.2.ebuild 7496 BLAKE2B 4f6b29f04047ab1fa6e6c33a5750e1f88ea4ce567b5952029feb7c5f883cebcb847c11190df2ca436b56cb7cc83d0a0dfea4b4acc53800f0d64fd2437045ad4e SHA512 f286b55f174a4ed678e1d3ef6bda09676f4aeaf0472b0796043c782777b00448a6a4eaa8b6c8e72dcdc937b15ea5bd2cbef76f41a017c72b5796644df54a0978 -EBUILD qt-creator-9999.ebuild 8111 BLAKE2B e00ee649e9b9f719c5a928bd197f8d013749c825a8f961cfe934c12844c8d8d20b743ad323595496e4d2240507bc0b40049a3f11fc787584d3cefa9d49cebb02 SHA512 a8d83d0261064188ee145da02147da179f0c6790cd75b47e881f3c571fb3428568f9feb4a558535729050bbc845d76bf546ef105fb732c8b2d6c60148c65eb92 +DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db SHA512 75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc +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-9999.ebuild 8166 BLAKE2B e2a5f7590996e392acbce720df7cee0f17036188457be31856989fd5e50944c8506f50e6f94500265f6ce9c07075895b831ccd144c2ed705b65cf8c730661e79 SHA512 8918c474f45a8cdb3f2a79aa3e2e149eca6fbc0491a018acd6ad5fef3de4f1c1d536099c4e9b2d1eeebc02994f7aed6e1b5f8116d95ac46d2407f0696f4c5dac MISC metadata.xml 1241 BLAKE2B 0d68bad4f8bdf857a44107e1b22299ce2e1ac84c2b2197f33e5f3c99562e4cd1d68982a2048961bd1d469a497f4cf4942005cdfb7876a6cdc720ed19e81e7a6d SHA512 33e3e7021d07f83f2ddd39120ac695394963978c80acdd8e2f0713e7cd485ac705ba11168276bb43f3f80b9c1122dd98a5359f342c2c075c2fd8ebddb93084b6 diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild index 972b24abebe5..ee0fcd198e6e 100644 --- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild +++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild @@ -155,7 +155,9 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) - -Djournald=no # not really useful unless match qtbase (needs systemd) + # 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 diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild index 25ae3358d8dc..a04b85dcdd48 100644 --- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild @@ -25,7 +25,7 @@ else [[ ${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" + KEYWORDS="~amd64" fi DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" @@ -40,16 +40,19 @@ IUSE=" REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" -QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN +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? ( - dev-cpp/yaml-cpp:= - $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') ) designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) help? ( @@ -120,12 +123,13 @@ src_configure() { 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) - -DBUILD_DEVELOPER_DOCS=$(usex doc) -DWITH_TESTS=$(usex test) - # TODO: try unbundling now that slot 6 exists+unmasked (bug #934462) + # 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) @@ -157,7 +161,9 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) - -Djournald=no # not really useful unless match qtbase (needs systemd) + # 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 @@ -183,12 +189,6 @@ src_test() { 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 diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 69822c51bc74..23836162a90d 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -45,7 +45,7 @@ IUSE=" REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" -QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN +QT_PV=6.5.4:6 # := is used where Qt's private APIs are used for safety COMMON_DEPEND=" @@ -53,7 +53,12 @@ COMMON_DEPEND=" >=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}=') ) + 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] @@ -141,12 +146,13 @@ src_configure() { 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) - -DBUILD_DEVELOPER_DOCS=$(usex doc) -DWITH_TESTS=$(usex test) - # TODO: try unbundling now that slot 6 exists+unmasked (bug #934462) + # 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) @@ -178,7 +184,9 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) - -Djournald=no # not really useful unless match qtbase (needs systemd) + # 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 @@ -204,12 +212,6 @@ src_test() { 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 diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 65ad56bd180a..817b2d85bf01 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -4,8 +4,8 @@ AUX qtbase-6.6.1-forkfd-childstack-size.patch 1003 BLAKE2B abc1bc5633032fc55fca9 AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f7524e0df00e13912e2e28d5c204d1a3e2bc351b9cdc212b9169e4d84e2884df76d9722a73f29734c18fe50cc8e6583e41a5cc2 SHA512 1effa903d5d3c65ffc6af5fb2f9896346b4b90cd1f8a54f0a697f23f1c118dd1803b5f4fa9b4959cf4ba1c433d36ca21a6abe6cb3bfae84a811297566388e907 AUX qtbase-6.7.2-CVE-2024-39936.patch 7171 BLAKE2B d1b6e9a35e35f1e6b3e7a7c975fb6719b8594ee5f3212bc18bfe4a1990d70424a682071551c5971d62d6351a38e36b6f4c4acb9241af1ad2e64ec604ca440394 SHA512 cd6b48ebe7c1dc1224a54f0d32845e598223a3c40c6da11b4639646fb073c6b5a2e54d9625ba0413afb876a83c2d50bdf616f4876154fb33fa941d6cbf053291 DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b -EBUILD qtbase-6.7.2-r1.ebuild 9601 BLAKE2B bb3b5fd887874ff289da3660b64823d8fbfc1bb523189c1f3d94c26d74825bb219ffe6836b42ceb8589015ad61feb1b820816830b0fcb02aeb237ecc38f70737 SHA512 4cdf5627cf82e1c9d1f8442efe9257cef3b20dfdf160ee707cce8d1e8c6db22f8ee1a863ed0d743bb6b8e4b011472ea6b16e4829c47240b96366ab6ff3a03668 -EBUILD qtbase-6.7.9999.ebuild 9559 BLAKE2B 5963ad805fab54ad09255d5fa42ee6f7abdba38aa2caf211138b3df78abb4f714d54122aaf66b7455a0740e40002ee77b0bb67a5bdba307ec02ae69a92607362 SHA512 4924e009671bfc94d8c2da05ea884ce8043d77adcbd2cc403c3badbf5034e1ea511bfb4df6d343a531471d472cb865e49bcc7f7028b195647f50bab4aa6f164f -EBUILD qtbase-6.8.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a -EBUILD qtbase-6.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a -MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351 +EBUILD qtbase-6.7.2-r1.ebuild 9791 BLAKE2B f65954646f705dc3263d711a447c9803e7b967c3c8b35cb4148726aedcfd14edeb2c6b0a408b226c9e58ea26e0304d69a2908fe1b95c9c0e92a11da6736b5165 SHA512 e9cb9a522776e4904d0e715b17385f93f37fa41c309083593d0a0e005fad0f449eebd7a444cabb0c7d0dc82dd59f4d4af2e029090b5de546b2147b81e89cbd81 +EBUILD qtbase-6.7.9999.ebuild 9749 BLAKE2B c9416e34473869963c79ad6b79316d82c7a69256e7f3eb37c6c16ef9388880dbaa1541b2cf333db9d050d3c8067d5469adab7c786c8332d98648c7b151c1a147 SHA512 3a8ba5819a4d0dab097b13726cbd63b82f4ac15a112f6ce07a79d46005ecb09414a48a6763bc95253ac38280cd78179c7f1478e818e34eb99edd10b4d2042489 +EBUILD qtbase-6.8.9999.ebuild 10188 BLAKE2B e11f0819a5fd5b4669cbc20ff54db471709b5ff2cdede20169f2068dae57790e1346bddeb3615ea693417abe0f945860053aa56db5d06d00f441456937c7fe7f SHA512 382447cfd0f81f2de3543cc0bfa62f80de9a124b59d96707e538d44e9db1be6244888fb3d4ef683fc99f09669eb253449ec1036fae2cba563053c3f207d2a301 +EBUILD qtbase-6.9999.ebuild 10188 BLAKE2B e11f0819a5fd5b4669cbc20ff54db471709b5ff2cdede20169f2068dae57790e1346bddeb3615ea693417abe0f945860053aa56db5d06d00f441456937c7fe7f SHA512 382447cfd0f81f2de3543cc0bfa62f80de9a124b59d96707e538d44e9db1be6244888fb3d4ef683fc99f09669eb253449ec1036fae2cba563053c3f207d2a301 +MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531 diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml index 61564794deab..ceb3786524f7 100644 --- a/dev-qt/qtbase/metadata.xml +++ b/dev-qt/qtbase/metadata.xml @@ -14,11 +14,13 @@ <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> <flag name="gtk">Build the GTK platform theme plugin</flag> <flag name="gui">Build Qt6Gui module</flag> + <flag name="journald">Log messages using <pkg>sys-apps/systemd</pkg>'s journald rather than output to stderr (override with the QT_FORCE_STDERR_LOGGING=1 env var)</flag> <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag> <flag name="network">Build Qt6Network module</flag> <flag name="renderdoc">Enable support for capturing graphic's API calls using <pkg>media-gfx/renderdoc</pkg></flag> <flag name="sql">Build Qt6Sql module</flag> + <flag name="syslog">Log messages using syslog rather than output to stderr (override with the QT_FORCE_STDERR_LOGGING=1 env var)</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="widgets">Build Qt6Widgets module</flag> </use> diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild index 428654198862..37e0b5c51a97 100644 --- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild @@ -13,7 +13,7 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -28,6 +28,7 @@ declare -A QT6_IUSE=( ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,8 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -# dlopen: renderdoc -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -62,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -115,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -187,6 +193,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -275,6 +283,7 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary @@ -309,7 +318,6 @@ src_test() { tst_qicoimageformat tst_qimagereader tst_qimage - tst_qprocess ') # fails due to hppa's NaN handling, needs looking into (bug #914371) $(usev hppa ' @@ -319,7 +327,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild index 435584eeecbe..66720e44d615 100644 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild @@ -13,7 +13,7 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -28,6 +28,7 @@ declare -A QT6_IUSE=( ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,8 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -# dlopen: renderdoc -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -62,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -115,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -186,6 +192,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -274,6 +282,7 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary @@ -308,7 +317,6 @@ src_test() { tst_qicoimageformat tst_qimagereader tst_qimage - tst_qprocess ') # fails due to hppa's NaN handling, needs looking into (bug #914371) $(usev hppa ' @@ -318,7 +326,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild index 04fb1a0aaefe..0f0f5cc3cd3a 100644 --- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild @@ -13,7 +13,7 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -28,6 +28,7 @@ declare -A QT6_IUSE=( ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,8 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -# dlopen: renderdoc -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -62,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -115,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -186,6 +192,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -286,6 +294,7 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary @@ -320,7 +329,6 @@ src_test() { tst_qicoimageformat tst_qimagereader tst_qimage - tst_qprocess ') # fails due to hppa's NaN handling, needs looking into (bug #914371) $(usev hppa ' @@ -330,7 +338,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 04fb1a0aaefe..0f0f5cc3cd3a 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -13,7 +13,7 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -28,6 +28,7 @@ declare -A QT6_IUSE=( ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,8 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -# dlopen: renderdoc -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -62,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -115,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -186,6 +192,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -286,6 +294,7 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary @@ -320,7 +329,6 @@ src_test() { tst_qicoimageformat tst_qimagereader tst_qimage - tst_qprocess ') # fails due to hppa's NaN handling, needs looking into (bug #914371) $(usev hppa ' @@ -330,7 +338,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest index bd15f64dbbc8..2705eccf8435 100644 --- a/dev-qt/qtconnectivity/Manifest +++ b/dev-qt/qtconnectivity/Manifest @@ -1,6 +1,6 @@ DIST qtconnectivity-everywhere-src-6.7.2.tar.xz 1061952 BLAKE2B 2b46b255f5ca5ab7b5363f6e3584dd4318a4e4d120c8595b309fba1354d9e1c763d9fa8e84b22f5c342204b2849b27d08a7f5dbd9d00533e150c2b8fb6561db3 SHA512 381098e406ac18d87d34eb9087d1655c16e604059d69b77c04df9d444cefc77630a212f52b0fc2a1573c524044aa1837379d70460e152cd353731e52c4bd0e67 -EBUILD qtconnectivity-6.7.2.ebuild 1685 BLAKE2B a3fdf1c88eca294f3823151412e033fe0b7100e8eb9f800d974d47e7959a52f113eb86cc61c0e618b7a2fb04ca2dbb2a203ecae3917131fea1088de0d04fa118 SHA512 8ce8078e09b33b343c22e10ed763408498a76300d091ad0c9cd557a8771d8a5a11ffe7e0a4c236e57d7c2377faedb031b6094a6e0834b9fb1d83c19617ebf994 -EBUILD qtconnectivity-6.7.9999.ebuild 1690 BLAKE2B c3f5d45d6a30e68bf4a79b6a24ce3accf595e402b2bdfbced65b360c6e1604914a8eb4bcb4d1463c2d70ee89d66f6e7bfc9bd38f2315d6e06b3ffabd15fc1478 SHA512 b8068aef0100f7922cdfe4f43b9ad666ea60267bd1881a32e17f04a9e3b74ea180cc444a37cd3b936962731ca991417abb338f66c914b8765ca8fd3e4df44b49 -EBUILD qtconnectivity-6.8.9999.ebuild 1851 BLAKE2B a4202162aed20d4428e91ef19d20c42fffce688152d40aae7c330c189458e0fb995fe487ba22391558ada8384faeaa80d2a8504eca63b62cb7339ce5e4bc71e9 SHA512 efc949600e1df81120bcc0e5e5f626e99709fc20e08a55d6d34b0bce98488c8e4b13d3ea5b991d961b8798d6a635e31369952a72233437b54c4f371dad05cb95 -EBUILD qtconnectivity-6.9999.ebuild 1851 BLAKE2B a4202162aed20d4428e91ef19d20c42fffce688152d40aae7c330c189458e0fb995fe487ba22391558ada8384faeaa80d2a8504eca63b62cb7339ce5e4bc71e9 SHA512 efc949600e1df81120bcc0e5e5f626e99709fc20e08a55d6d34b0bce98488c8e4b13d3ea5b991d961b8798d6a635e31369952a72233437b54c4f371dad05cb95 +EBUILD qtconnectivity-6.7.2.ebuild 1729 BLAKE2B 3583ea54d20ea328acd372c25c4b979669704d2dd927545ac2a07df6b6ea4450309573bb5c5facba3b99d28849adb36fd40d99fb1ea225e459138364a76cbf5b SHA512 b6b2a580e718108dba2df8507b3ef09ebb43b1c31c04e08e9177c104023ccb7b93872e25e7cb59dbe64c5170bdb0c7734a796f9f7bf600508a9f827f92f5e1bf +EBUILD qtconnectivity-6.7.9999.ebuild 1734 BLAKE2B d164b5e96a0d191090f030d10f74024b8d79924b45cf20df9736b0e036a86dd8f30b87521105e6be8d18cc402c209eb0430611da502472d7ad3191b8a53b956c SHA512 70fc092b946fb5ade32de076169722184e7707ea1c7315fd328936870363fe277f70724a944110c7d2e6059fb1a0d4a21b2a54e03732209f516312f419de7838 +EBUILD qtconnectivity-6.8.9999.ebuild 1895 BLAKE2B 782530ba9f6eef2143b44bf2538d3ab059dc733c8d8a3a60f683589f49fe07cf103861ca153357662399c87051a856a207b76b49b24ba2dc50e4473474bf5c91 SHA512 cdd850f365293541f00b35be88ccb5fcd10bfc14e6aa5d6bfad6e976fd7ec6f4d25b3c9a4c0a5b9fd94af949006ed7854a6c20b4e5a47684fa852e733b315d25 +EBUILD qtconnectivity-6.9999.ebuild 1895 BLAKE2B 782530ba9f6eef2143b44bf2538d3ab059dc733c8d8a3a60f683589f49fe07cf103861ca153357662399c87051a856a207b76b49b24ba2dc50e4473474bf5c91 SHA512 cdd850f365293541f00b35be88ccb5fcd10bfc14e6aa5d6bfad6e976fd7ec6f4d25b3c9a4c0a5b9fd94af949006ed7854a6c20b4e5a47684fa852e733b315d25 MISC metadata.xml 721 BLAKE2B 4c2d1448a532b27910627b3fa1b8912b9048434058ee6f7b14276913ad5d77e55a6f2200002953863aa76ef5d66c04126995e0746cfaf208fa6dbd6e9b622ce1 SHA512 17808c1ab2c7a8e36f6f20801ac288abfd3b390d67ae55212d0d6b890aa7bb49ad8c7d3899cade2d8515faee76a5e02b3cfc582e3f5dde744371592e6d8dfb67 diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild index b9c695138870..3f4404399c47 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild @@ -30,6 +30,7 @@ CMAKE_SKIP_TESTS=( # most hardware tests are auto-skipped, but some still misbehave # if bluez/hardware is available (generally tests here may not be # very relevant without hardware, lists may need to be extended) + tst_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild index 718408e17903..da4242aa89dc 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild @@ -30,6 +30,7 @@ CMAKE_SKIP_TESTS=( # most hardware tests are auto-skipped, but some still misbehave # if bluez/hardware is available (generally tests here may not be # very relevant without hardware, lists may need to be extended) + tst_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild index b4f6fa98e1c8..9f8e25a38f2c 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild @@ -39,6 +39,7 @@ CMAKE_SKIP_TESTS=( # most hardware tests are auto-skipped, but some still misbehave # if bluez/hardware is available (generally tests here may not be # very relevant without hardware, lists may need to be extended) + tst_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild index b4f6fa98e1c8..9f8e25a38f2c 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild @@ -39,6 +39,7 @@ CMAKE_SKIP_TESTS=( # most hardware tests are auto-skipped, but some still misbehave # if bluez/hardware is available (generally tests here may not be # very relevant without hardware, lists may need to be extended) + tst_qbluetoothdevicediscoveryagent #936485 tst_qbluetoothlocaldevice tst_qbluetoothserver tst_qbluetoothservicediscoveryagent diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index fb3af2cec603..0329603e2f62 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -5,6 +5,6 @@ DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910f EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91 EBUILD qtmultimedia-6.7.2-r1.ebuild 3243 BLAKE2B 33b3027b45a188cdf255de400a73f2eae5b1baa707f499b5f4809ef392cc6d708818445bb1d14e535f71092380693323a0807babb3afc591eeade74f922ee044 SHA512 b1d23276920b596cf3dda2b3f2bdd7d1ab9beb6e73b5ec2784c2e1a1235a6e263a104d0768e69dce8ef7ccd8b7344b80cf7fb7a76ea6c230cad084a6d57b4326 EBUILD qtmultimedia-6.7.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667 -EBUILD qtmultimedia-6.8.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667 -EBUILD qtmultimedia-6.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667 +EBUILD qtmultimedia-6.8.9999.ebuild 3834 BLAKE2B 20cb0f0218058e53d0fa8210fb6bfa96458cc53cabe3a186623de043edaa1e3cfa9900dcb7182efc6881ebf26a76a77e233750d2abfa53b0dfe5cf9373cf45c3 SHA512 3c37270cb928afcab7cd01a476ae5b74467d4b00e551911bec8b124b9d6f83a36e1db8c389a1118c0be04d66d5a65152a241be62260c10c9cdec7c2b4674cc1c +EBUILD qtmultimedia-6.9999.ebuild 3834 BLAKE2B 20cb0f0218058e53d0fa8210fb6bfa96458cc53cabe3a186623de043edaa1e3cfa9900dcb7182efc6881ebf26a76a77e233750d2abfa53b0dfe5cf9373cf45c3 SHA512 3c37270cb928afcab7cd01a476ae5b74467d4b00e551911bec8b124b9d6f83a36e1db8c389a1118c0be04d66d5a65152a241be62260c10c9cdec7c2b4674cc1c MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild index 3b8589664575..fe60a09af174 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild @@ -11,15 +11,22 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" fi -IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +IUSE=" + +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio + qml screencast v4l vaapi vulkan wayland +" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl ) - vaapi? ( ffmpeg opengl ) + screencast? ( ffmpeg ) test? ( qml ) + vaapi? ( ffmpeg opengl ) " +# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto +# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto) +# := skipped on pipewire due to only being used through dbus RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( @@ -37,8 +44,12 @@ RDEPEND=" gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=,opengl?] + media-libs/gst-plugins-base:1.0[X=] media-libs/gstreamer:1.0 + opengl? ( + ~dev-qt/qtbase-${PV}:6[X?,wayland?] + media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?] + ) ) opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) @@ -46,6 +57,10 @@ RDEPEND=" ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquick3d-${PV}:6 ) + screencast? ( + ~dev-qt/qtbase-${PV}:6[dbus] + media-video/pipewire + ) " DEPEND=" ${RDEPEND} @@ -81,10 +96,18 @@ src_configure() { $(cmake_use_find_package qml Qt6Qml) $(qt_feature ffmpeg) $(qt_feature gstreamer) - $(usev gstreamer $(qt_feature opengl gstreamer_gl)) + $(usev gstreamer " + $(qt_feature opengl gstreamer_gl) + $(usev opengl " + $(qt_feature X gstreamer_gl_x11) + $(qt_feature wayland gstreamer_gl_wayland) + ") + ") $(qt_feature pulseaudio) + $(qt_feature screencast pipewire) $(qt_feature v4l linux_v4l) $(qt_feature vaapi) + -DQT_UNITY_BUILD=OFF # currently fails to build with ) # ALSA backend is experimental off-by-default and can take priority diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index 3b8589664575..fe60a09af174 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -11,15 +11,22 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" fi -IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +IUSE=" + +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio + qml screencast v4l vaapi vulkan wayland +" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl ) - vaapi? ( ffmpeg opengl ) + screencast? ( ffmpeg ) test? ( qml ) + vaapi? ( ffmpeg opengl ) " +# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto +# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto) +# := skipped on pipewire due to only being used through dbus RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( @@ -37,8 +44,12 @@ RDEPEND=" gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=,opengl?] + media-libs/gst-plugins-base:1.0[X=] media-libs/gstreamer:1.0 + opengl? ( + ~dev-qt/qtbase-${PV}:6[X?,wayland?] + media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?] + ) ) opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) @@ -46,6 +57,10 @@ RDEPEND=" ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquick3d-${PV}:6 ) + screencast? ( + ~dev-qt/qtbase-${PV}:6[dbus] + media-video/pipewire + ) " DEPEND=" ${RDEPEND} @@ -81,10 +96,18 @@ src_configure() { $(cmake_use_find_package qml Qt6Qml) $(qt_feature ffmpeg) $(qt_feature gstreamer) - $(usev gstreamer $(qt_feature opengl gstreamer_gl)) + $(usev gstreamer " + $(qt_feature opengl gstreamer_gl) + $(usev opengl " + $(qt_feature X gstreamer_gl_x11) + $(qt_feature wayland gstreamer_gl_wayland) + ") + ") $(qt_feature pulseaudio) + $(qt_feature screencast pipewire) $(qt_feature v4l linux_v4l) $(qt_feature vaapi) + -DQT_UNITY_BUILD=OFF # currently fails to build with ) # ALSA backend is experimental off-by-default and can take priority diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest index 5e39bcd9e338..07c4e5519a52 100644 --- a/dev-qt/qtquick3d/Manifest +++ b/dev-qt/qtquick3d/Manifest @@ -4,6 +4,6 @@ AUX qtquick3d-6.7.2-gcc15.patch 1365 BLAKE2B 574cf06f28c4ff2c8415f302bf2061b1b38 DIST qtquick3d-everywhere-src-6.7.2.tar.xz 66202160 BLAKE2B 1f3741bb11d21804ec56aa5bfa00b590d94258cb119b4284aa2757fa00785a69aba243e06bf68ca625355a8e8a392249be2ac9679226c8d250320aeb6c4ccf0f SHA512 d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2 EBUILD qtquick3d-6.7.2.ebuild 1081 BLAKE2B 8a505568442fdcee697baecae2cd545ab213da2a1f3fc426052f3d24e1e235cf53f9852cb454a7b03943e863a049b376ac80c3edfadb49b68a136f6e176e482b SHA512 60b53323dbbc48d8f2c41f91f805fda4d85c86d6a9467a0b97a31c4698b5249682e0eb3d0a57e2d79de6012f4151cc9b96d91d6c09c38d9aa0089ef17393c612 EBUILD qtquick3d-6.7.9999.ebuild 1086 BLAKE2B ec9e9a80e9607210074d4f2bb1dd3bbb2848b6df3f4e384c911a4d4d6125bfdd6cb93a525c0c483f00017f0e6b3fa3bde6cb92b5a19330a3f07211e61134cfe7 SHA512 abda722ed0932fd45e83ff776c0f21197bc96b5f763092cf7f82b33e297787d558ebb704939944808a58dce99a0d7b697793c7ef1155eb8c77456478d073fded -EBUILD qtquick3d-6.8.9999.ebuild 1277 BLAKE2B 781dab7439add58a402d324fb9ad42872867dd1d2c752251bee23c48c4b23eaf738168d05a731a9da63cb285b620c38bf0553b394a65ae8da07fff7d6232f5f4 SHA512 2f8d2c279578e255644d4b7cadafce3d67862f95c0b95428c48d33c8baad3866c7178e10f10473de97e718d85a4aa4b2680a9d75d5804f0ff5ed0ead39ace5f3 -EBUILD qtquick3d-6.9999.ebuild 1277 BLAKE2B 781dab7439add58a402d324fb9ad42872867dd1d2c752251bee23c48c4b23eaf738168d05a731a9da63cb285b620c38bf0553b394a65ae8da07fff7d6232f5f4 SHA512 2f8d2c279578e255644d4b7cadafce3d67862f95c0b95428c48d33c8baad3866c7178e10f10473de97e718d85a4aa4b2680a9d75d5804f0ff5ed0ead39ace5f3 +EBUILD qtquick3d-6.8.9999.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868 +EBUILD qtquick3d-6.9999.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08 diff --git a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild index ff9c71b3433b..aba06df17246 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild @@ -42,8 +42,8 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( - # using bundled OpenXR failed when last tried, and either way - # it would be better to package it if someone needs this + # TODO: if someone wants it, openxr should likely have its own + # USE and be packaged rather than use the bundled copy -DQT_FEATURE_quick3dxr_openxr=OFF -DQT_FEATURE_system_assimp=ON -DQT_FEATURE_system_openxr=ON diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild index ff9c71b3433b..aba06df17246 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild @@ -42,8 +42,8 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( - # using bundled OpenXR failed when last tried, and either way - # it would be better to package it if someone needs this + # TODO: if someone wants it, openxr should likely have its own + # USE and be packaged rather than use the bundled copy -DQT_FEATURE_quick3dxr_openxr=OFF -DQT_FEATURE_system_assimp=ON -DQT_FEATURE_system_openxr=ON diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 5b3c6bc4299a..91372eb8e6c7 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -1,6 +1,7 @@ +AUX qtshadertools-6.7.2-gcc15.patch 249 BLAKE2B 0ab5137519e035317879755d0ada3f91f415a48e4c5c8c5050817e8178a22db60ad4df9ba69173ee599e1184c9d9eca7634e6ead97d474f1eaf3f16c330359f3 SHA512 7b94f12e2af5a9307eacd8210d0a120f4b41ce70bbe81a3ff42cdbff42a3fa0bd49d7da1561ef9a0ff1f424c9f8f9ccced3069437b3cd8da0b335ee932a2921d DIST qtshadertools-everywhere-src-6.7.2.tar.xz 1111256 BLAKE2B a0bdf6f27882a903819c580c37a3dc7f361101345b66542dda162e99adf9a62983bfa7321881d6dac7e662178a125674606b08973bd55b77743fee19cbad8737 SHA512 b33e55f81d6878518dfe05db8ea3b319614dda10e215784496a61daaf8415fdeed1a3d802efc3cddc4fbca6c9894faf13475b35b3bb7d9a215b91238f9b38233 -EBUILD qtshadertools-6.7.2.ebuild 366 BLAKE2B 3bd5c942084732411b0c2249cd2bb83a81f8b46e27461cc3ef347abf63d1e2027baff3e0ace38bc48982bb1f8ae9e75a46f1ef95b699645b10e3b951d6d12e3a SHA512 1352e69d418bb3b926a84883f1831c94190d8563944a45c63361d8ea40ed6d22dcef8550ed62411e559c36204befee5f1d13aa67b5f6332de53a3225a1285098 -EBUILD qtshadertools-6.7.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084 -EBUILD qtshadertools-6.8.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084 -EBUILD qtshadertools-6.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084 +EBUILD qtshadertools-6.7.2.ebuild 418 BLAKE2B aa94ccc444eb43698df85a293053c4a6b50cb628dc15106bc819b3b61e3870f981c212e242422434a28844fa2d8cf153fbada062a9e498033e38da642edc0be7 SHA512 e8c60de397498f70975efa9294b5d6f8dff796287bbdf0062e725cc37f45d202b576b68daa726fe8eb8a111e1931fde56348b154297b178edd0f3bd0d369d0c8 +EBUILD qtshadertools-6.7.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 +EBUILD qtshadertools-6.8.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 +EBUILD qtshadertools-6.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 MISC metadata.xml 538 BLAKE2B 59f8b1a838f1fadf78bc2d9f1c65fde2c7fdc306730671b16297ff19308186907744bcbd0924074001e1cdb43c1dde29486368bb0d2533b3cb12f7befa53d2dc SHA512 dfe1c793f5525ce4d4353d9131749247163021ec3d995d2cc95df53d214d2e0b24468a026df0dd6403cad41990ab5e8c5e801efa346a06a2d962f29990b16ddf diff --git a/dev-qt/qtshadertools/files/qtshadertools-6.7.2-gcc15.patch b/dev-qt/qtshadertools/files/qtshadertools-6.7.2-gcc15.patch new file mode 100644 index 000000000000..ceab10f4c1f6 --- /dev/null +++ b/dev-qt/qtshadertools/files/qtshadertools-6.7.2-gcc15.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/937261 +https://github.com/KhronosGroup/glslang/pull/3684 +--- a/src/3rdparty/glslang/SPIRV/SpvBuilder.h ++++ b/src/3rdparty/glslang/SPIRV/SpvBuilder.h +@@ -58,2 +58,3 @@ + #include <algorithm> ++#include <cstdint> + #include <map> diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild index e3cbab00e5f0..f136b15894c7 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild @@ -15,3 +15,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui] " DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch +) diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild index 68dae044e31f..15f54c185b88 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild @@ -15,3 +15,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui] " DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch +) diff --git a/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild index 68dae044e31f..15f54c185b88 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild @@ -15,3 +15,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui] " DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch +) diff --git a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild index 68dae044e31f..15f54c185b88 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild @@ -15,3 +15,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui] " DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.7.2-gcc15.patch +) diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 8ad1aac20df4..39c58851761d 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -8,7 +8,7 @@ DIST qtwayland-everywhere-src-6.7.2.tar.xz 1123220 BLAKE2B 70c2d8942afc4e1629d2e EBUILD qtwayland-5.15.14.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022828c9cab0fd5bc82b6c6455344fafd7a349f1f232fa62a00e32cc073cda39aead004657e7b4072f49890442baeda3252 SHA512 75966f4a890e77a29937d63ed50a8095d579fab4871f2d091bb410443a0101fabc592a6cfbe033b12d6f0663c196930a32c85a062a10de4f8dc13eee4103b86b EBUILD qtwayland-6.7.2-r1.ebuild 1527 BLAKE2B efe529b2925dc1ec8ce987a3eed243afcece1963d84345aeb1b758d5fbbe59d29c06229eaa4ee88f9fd2f776ed9f34136f9c0750b9be3bbc1fcad93fc076ec14 SHA512 001a07a9ee53545f18ca970c9dc7caece8055a1eb559d6e52fc0a1c5e6c7f9b14ff03098c203d6f1f823283b6b1143edba980258073f0eb884b82e9d570d6026 EBUILD qtwayland-6.7.2-r3.ebuild 1643 BLAKE2B 2a6e6a274173f93a4da9c8d95bb39240d57969d6b96819f85aa488ac6707729003d402d756348852c37001672fb3cf07258af84411a5610497513bd81c76fc86 SHA512 c1f133bfb32c03922b8c26cfdd9fc0120bce0f4ad02fc653615d69f3a48f62b313b8c67b2df65b8445f95574e3fdb438f00d8beb3fad5b73d46e07497b8171ed -EBUILD qtwayland-6.7.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289 +EBUILD qtwayland-6.7.9999.ebuild 1481 BLAKE2B d0762b5c9c61dbe06bcef6410d60ea27fc33b9debb8d8d80e8fa3b03de7cf8f60b5c240094d8b21518da97167ddb5acde78e11f21b2589d10a3bd8dd70044abc SHA512 e8eccc7fb2b9d6c67bdc717428b8579c8d92c1ee239de07d6bff6715aea430fbfc756fa286640b6f8d35b0a774bd4e15b404d017e1f6043e9e8d79385fea4eba EBUILD qtwayland-6.8.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800 EBUILD qtwayland-6.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800 MISC metadata.xml 888 BLAKE2B b893520d74518b0ea0d104d72545925ac37c818ef52d29a5551a2e3406ded90bc4f6c3d53b64868f2b39919cab783ed124af13f63704e7ee66c534c21dfdfb23 SHA512 9861bb9cf35100d7464d88f86614511522fc4cf7e2ef5d09b9ea95cdb168d61f645614104aacad24fcebc8ecfc2c98601b26f434059bffe169513fd097b12aec diff --git a/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild index dc3ce8575fd3..11f94d7bd709 100644 --- a/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild @@ -35,6 +35,12 @@ CMAKE_SKIP_TESTS=( # needs a compositor/opengl, skip the extra trouble tst_surface tst_xdgdecorationv1 + # known failing with wayland-1.23.0 (or at least with offscreen), not + # believed to result in critical runtime issues so skip until this is + # looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379) + tst_client + tst_compositor + tst_scaling ) src_configure() { diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 75035f2e5085..1fa758c45c91 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,14 +1,16 @@ +AUX qtwebengine-5.15.13_p20240510-gcc15.patch 1308 BLAKE2B d206c6df9b88f706ade2f501548d880692ac032dd4767a279faf90e546eca9390f7a4c89f2fd23cc7d9e865bc27b0da398c60de2440ba1cd0a10cb5ccfb86e28 SHA512 fb5162c3ea8865fc81762c5571ddc63efac89dbcb6029a1b749a07f5944cf9007d92a24b764459301a1292ccbc057bee415f5dd86c75ae2a53981bad31e4e148 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-QTBUG-113574.patch 1696 BLAKE2B 10d4bca0527636a3934ccfdf6e52fca4ca369d07624c3b63377dc899a2f0313a936347d73dccf2f35d259f43c9c76bb7519b85339468b93b49862d3d5057f23b SHA512 bb2489a41da7b7a00fe58fee963b89e6ba8ece2c1a8f29e75169db7400a475473866c71bc78825875d007cac1e98175251b1f5fb4bdfbdd4318d32fc6f7871a2 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-9.tar.xz 7440 BLAKE2B 061f39250450af3c8d4458649c80c18d0bf8448061e0bb91f8a0d7c630ff1cd2ee19a9528998c5a4a3ebab1e96ea0ba579cc0db5d879fe56a1239901942ba933 SHA512 4dabb56d6c74600f8d5a4ebb4356ffaaff1814eefe1cb268e33749fee034e9488e34043d0ce0893138ee01b023c09298c737bca3875a30be1bf862a145e244c7 -DIST qtwebengine-6.8-patchset-1.tar.xz 7512 BLAKE2B 04eee1a1008f8a193dbb719e08c61e26a78cb68f3a0b9f7cc43b442bd2d851301682009ad7cd96df13da1c0aa7e9459b1b7024193379509abd4784e2547276e7 SHA512 591e5340435a8a40b6805d3db07b440bf185c694461382051c668e41f2ea5d04d5d7ab72602f557ee91a687d6187e919d662751e32dadaea8dc19de568e2c54e +DIST qtwebengine-6.7-patchset-10.tar.xz 7940 BLAKE2B f3ed0e75731f29f37714ef7c0536f92a758bb1f204cf3b6aa3b9b32ab9baae27a7649d030bee5962964619692dd5888d089bf4437505d1c1c330cc4c05aca17e SHA512 db3a566a073daa34d678a06b51cf57e8818f2d42847dc9e606522040bbd3b75ae56fd41ce466880855cfdf558d680204dc5ccea8046749b18784e75aa12efe47 +DIST qtwebengine-6.8-patchset-2.tar.xz 7932 BLAKE2B 3642f619c66075e26703200818e833786a8686bf39258eee9bba95e234f79878f0b98680e8228a5b2cc39b02b0ecc36074ac96eb09f3bca145bb7aa9fd023310 SHA512 4a248d6e7bd052b5681a531fe503954aa519a8ed46cce2b3fafe8de603818f20e80a365e304f919817a6a0c12fdc517a0471f5c6dc499e648fd5405456c9fba3 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 -EBUILD qtwebengine-5.15.14_p20240510.ebuild 7659 BLAKE2B d930e49649e91657fbe65668a0dfe41ebd4732d4901c36f59f562094d9cb9d339157bf0f5c4e8b530270a13c8a40449ac4800ce9a17a29069be1c7177c288452 SHA512 6c621d916a502e778fb9662dba61161eb55b6ab37bd1045d5a96924bc943428b3ef28512d7838b31b4bfaa0ac43e23b10a66d67fdce2505139325cc837dd756f -EBUILD qtwebengine-6.7.2.ebuild 10381 BLAKE2B 38654e43a9c524829c8a31f9e0e6b06428a7626ff237c6022dcf9ffe2552f4239153702dbaf633bab51bb1ecb239fe3af6997ad779d8e944a0661d215719e204 SHA512 c2fb4ea75b501d5d60ca890f244115db8319949fb4af3d864c777e62154635c430d9307b0aff44d568b4d95cb6de68c0c9143ef14b0275237d3d4db7b3158bd9 -EBUILD qtwebengine-6.7.9999.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f -EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c -EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c +EBUILD qtwebengine-5.15.14_p20240510.ebuild 7758 BLAKE2B f1c2e30680f12164b8a1a55ecaecc6b7a786cd173ae3500825c7ef04ebd53bd579d2c74a7648ff65c3c302a0f2955313814e0fd1223d564fde76ff7e0039d6d5 SHA512 37591ca47d0df49df995be8af07da94f32ee3d5e03bf9acf987b9966092e48e481d8fac5c3af920265a4736e95f8200be24cf75683e577ef135249555ad6efa1 +EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 5b230dbcae1920f95410d356638af03992f24d06db10fec22b29bc86228da985a23dc28e9836d618d600dfaa94cacf119ad8c5d8179a1d0e56d56ac8044b7b67 SHA512 c87490fb23f9162a2664339f006655b3e143bf721a48865c12f5af078716f684587158cbebb68159ebfd42a60b151118ffc8ea31606268202d9d5e59fdb06b47 +EBUILD qtwebengine-6.7.9999.ebuild 10384 BLAKE2B 83ce0ea97744f21a13074b7e2901aeb88aad9c3bae7a1d01bf5339003ddaf076c320d05244eb91c79155bc1afb3337d7b2a6a1f3de136d7a47f60009cf4e374b SHA512 d94a56943c5447fbe49e16d9876b17c3367d818b792c7d791650febdc75efbc827a7dda51bcb0a987971e78c36624226b9878d0d9b9860f3103cdeef99e28a44 +EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B dd9842294ee9618e5cb73bdb3f1b6f9ea98220cbc45317fac6aaa622b15f8d29ef3c768f2ddea2d57122cc7f206474d02bb3a50cb4f0cea2710011ed00c7086b SHA512 d535577cf79ea4b4586a0fa60c0f16989e753d21b580b66a67a21582cbc0c4715a3a05f46823f6c9d45dd2d0db016392c8ce24695202422fe01332dd00406c4a +EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B dd9842294ee9618e5cb73bdb3f1b6f9ea98220cbc45317fac6aaa622b15f8d29ef3c768f2ddea2d57122cc7f206474d02bb3a50cb4f0cea2710011ed00c7086b SHA512 d535577cf79ea4b4586a0fa60c0f16989e753d21b580b66a67a21582cbc0c4715a3a05f46823f6c9d45dd2d0db016392c8ce24695202422fe01332dd00406c4a MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch new file mode 100644 index 000000000000..d3073b6c5ab6 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/936416 + +Backport of two upstream commits: +* https://chromium-review.googlesource.com/c/chromium/src/+/5512719 +* https://quiche.googlesource.com/quiche/+/c1af894e0f5c4f732a983e7c93227854e203570e%5E%21/#F0 +--- a/src/3rdparty/chromium/base/containers/id_map.h ++++ b/src/3rdparty/chromium/base/containers/id_map.h +@@ -153,8 +153,8 @@ class IDMap final { + } + + const Iterator& operator=(const Iterator& iter) { +- map_ = iter.map; +- iter_ = iter.iter; ++ map_ = iter.map_; ++ iter_ = iter.iter_; + Init(); + return *this; + } +--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h ++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h +@@ -198,12 +198,12 @@ class QUIC_NO_EXPORT QuicIntervalDeque { + Iterator operator+(difference_type amount) const { + Iterator copy = *this; + copy.index_ += amount; +- DCHECK(copy.index_ < copy.deque_->size()); ++ DCHECK(copy.index_ < copy.deque_->Size()); + return copy; + } + Iterator& operator+=(difference_type amount) { + index_ += amount; +- DCHECK(index_ < deque_->size()); ++ DCHECK(index_ < deque_->Size()); + return *this; + } + difference_type operator-(const Iterator& rhs) const { diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch new file mode 100644 index 000000000000..cbfa44edce31 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch @@ -0,0 +1,14 @@ +# https://bugs.gentoo.org/913923 + + Fix missing {-no,}-webengine-re2 command line options + +--- a/src/core/configure.json ++++ b/src/core/configure.json +@@ -16,6 +16,7 @@ + "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } }, + "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, + "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } }, ++ "webengine-re2": { "type": "enum", "name": "webengine-system-re2", "values": { "system": "yes", "qt": "no" } }, + "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } }, + "webengine-pepper-plugins": "boolean", + "webengine-printing-and-pdf": "boolean", diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild index 9eea881bc404..31ca92a14959 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild @@ -41,7 +41,6 @@ RDEPEND=" dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt - dev-libs/re2:= =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtdeclarative-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}* @@ -99,7 +98,11 @@ BDEPEND="${PYTHON_DEPS} sys-devel/flex " -PATCHES=( "${WORKDIR}/${PATCHSET}" ) +PATCHES=( + "${WORKDIR}/${PATCHSET}" + "${FILESDIR}/${PN}-5.15.13_p20240510-gcc15.patch" + "${FILESDIR}/${P}-re2.patch" +) python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" @@ -228,6 +231,7 @@ src_configure() { $(usex screencast -webengine-webrtc-pipewire '') -qt-ffmpeg # bug 831487 $(qt_use system-icu webengine-icu) + -no-webengine-re2 # bug 913923 ) qt5-build_src_configure } diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index bd95d3e001b0..558e4e9ca86c 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-9.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index 1ad6561ecc65..73f482a28fcd 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-9.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 16c70f30d158..66f2a52045b6 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-1.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 16c70f30d158..66f2a52045b6 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-1.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then |