diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-11-24 03:02:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-24 03:02:55 +0000 |
| commit | 530a5a826feeb71085fb8a01927f4d775a0b131b (patch) | |
| tree | b7669c45ea3f2a3a37b2437817a370226bb1c819 /dev-qt/qtwebengine | |
| parent | 71dd9d29cdaf7cc0ecdb9ea37d128726a941c630 (diff) | |
gentoo auto-resync : 24:11:2024 - 03:02:54
Diffstat (limited to 'dev-qt/qtwebengine')
5 files changed, 39 insertions, 6 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 09ee7e7b88df..6cbc8e0f5a1f 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,8 +1,9 @@ AUX qtwebengine-5.15.13_p20240510-gcc15.patch 1308 BLAKE2B d206c6df9b88f706ade2f501548d880692ac032dd4767a279faf90e546eca9390f7a4c89f2fd23cc7d9e865bc27b0da398c60de2440ba1cd0a10cb5ccfb86e28 SHA512 fb5162c3ea8865fc81762c5571ddc63efac89dbcb6029a1b749a07f5944cf9007d92a24b764459301a1292ccbc057bee415f5dd86c75ae2a53981bad31e4e148 -AUX qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch 5255 BLAKE2B 9337df359e7b63fa24c4d0c454be77c7f8d4ab9d626dfb9fee372a4fb8d72075d251ff4a493d5343d487797c110251bb0cd04d5edbc6e6f70efaebb0358579b5 SHA512 5a2ce8dfaf1026fd18a730e90173b9465a7f9c12e46c0aa813ac2939178d5008eb96c57468c39f6dae683c39d89d11e3b7df8ccab851f33760516eb37648ee34 +AUX qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch 5506 BLAKE2B 2e31854e3beef5f25300a9b12158e9eabb674d54c07b563a4a7ffafe5c06dabdd808a776d4155f23ee7f0a917970d614f9060428ba8613d6cf15228bfc9d6b4c SHA512 e536d79f8841816858b5bd92adba6a862bce7149cc66c010885b82c8c92502a81e3fdb0038b21eafbdf046432a3b2c4c95b0352a608c0a99d0868813d56f00aa AUX qtwebengine-5.15.14_p20240510-gcc15-template-id-cdtor.patch 3299 BLAKE2B 2809e25858ac17f776bd20fdcbc4c8b658b7f2587390dfbce133939ddd11134a71b6f139f39b9bf46a5e99a7d8335d5242d3a2caad832e6252d817504b6e6e12 SHA512 cbef06092de6337b4559d44443947e9578d127f4d319027550de7c4289665e0d516e5229cc0f9a0855691ceb62cdd32fb5a5fb88ff6cfbe28e1985aae9828ed7 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.16_p20241115-py3.13-pipes.patch 848 BLAKE2B 7696eaf565511adcac5e74f7788633d1e83a88079548f1069c840da40e3ec5fef5fbfa0c019234a40dde14f6f43249792ad1bfc3d2ee8e5669d7fde7234a7ad2 SHA512 79588891105d8dce27e273d4113c31352c6b1035762ea6b1211be5f58299d9e2852b0b98bad34492d9af85e3ae1ca87407ffbf190159d64b0c6d7ba49e842bf8 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 AUX qtwebengine-6.7.3-missing-gn-deps-blink.patch 1677 BLAKE2B 6081d8e60712e50b6cd043ed4db645727f38676d91ec3b05e2bcf9acf790273a95e9f67adda7bda573cc73b331b0b565a6b485f91c1a34bbb20b1c4814ce16de SHA512 5e059420feaba3fa3fdf9ac1aabfc655550e4a47f2416d009a5e79643052511f14fe9758dde42026932e1f10976cea2f5d9129c807011eae5efe1d823253a0cc @@ -17,8 +18,8 @@ DIST qtwebengine-6.8-patchset-5.tar.xz 7540 BLAKE2B afb0bdeffeb5c83237e1bf72c092 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe DIST qtwebengine-everywhere-src-6.8.0.tar.xz 566569136 BLAKE2B af2ccc4900ff96d36900bfd4bcb370017231776e211af512e73944dc47b62e6517e85658c436e91f904efae013c4a9035122f78694b4a3fc696f0790725862e0 SHA512 80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4 -EBUILD qtwebengine-5.15.14_p20240510.ebuild 7886 BLAKE2B ec9b228c2c8952415a6a8ea7a693642bf09625ae084279e5992580084006a25bf77b0ebe2176e406b3a32356269302b48cb8dd16fbe573ce3817fc7d91d42b62 SHA512 3c6686561b36d59aa07473ff73cf5642f203d37a59f7496c04a656b60e03151471b79c965f065cd9f492e87e7fa398cd5f71b17059bdc6e9a4f0bd451edf088d -EBUILD qtwebengine-5.15.16_p20241115.ebuild 7831 BLAKE2B af362c23b9fc42e84a733b6797fd9a3aa0f45b584b39986e82f60468748378041edaf97ed1a2d0c224d9a4baf7f2f5afcfe95eaeb80ed341ac9ff7d78c6d999f SHA512 b8f59b46aa2c1f9f8ba3cde6bdbef0148071c05b40d37fcd9e686e3dd5d193abc98e9d06ebc19c80a960336fc9278a196d1abb40fc09e7005fbd0b35e17fa3df +EBUILD qtwebengine-5.15.14_p20240510.ebuild 7881 BLAKE2B aa91baabae24be838cfe8f201f3f6756f822fe67a6071cfdb553badf6ac44171b06d7598b186331446dacec210786067b54d13ba4f8395b43e72546ff8782cfb SHA512 40e27195ad0d7804fbaf1c3909256e2dea50f13a1841749f3d5bdb447615a68512870cea091fc6dbd755264401d0554dd1db94d0395bfeaae421720a134d2574 +EBUILD qtwebengine-5.15.16_p20241115.ebuild 7881 BLAKE2B bf0e536936ff8e3995edf6812f3bb4a250b2cb26a9f1e78eb3cb80d46e95896a0fef41c65f81748fa04bc727aea3f417aaf99172428dc165b6858149692ee461 SHA512 cc7d6e29900e2909b460b4e1645e45452a002e4b143cfb831a798f9aaa7a7dc5e96b232e9726c18cfd46015c7c88a26be011358877f6d9e64792afef561af90d EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 6f20f921189366edc8f501ee0e1d3811fb1e57dfa75b2ff4ac80a50028e6394068415f65ae1bfb84dd9ae7d08a546fdb13050a4c42035dbe0ce6baa1c753534f SHA512 2292f3a7e9b24cdb312b6e9c725d8ad1ed33ee160038bd15d8fac568e53473ef18fe3f4f8bf484009221521325933b7e568b90546a157d10c74faa119c6bf44d EBUILD qtwebengine-6.7.3.ebuild 9979 BLAKE2B 17fb965f42ceba78dea107944b68141281c164dd4a86d06cbe8f8a62281af044b84d9e249944aa9f0995610010a97ec55b152fda255545f48440be9852fa01c3 SHA512 b08934fba065e79143b804511e871eb32359290b8156343ebc27e019e65c36a4e6eeb1699f57b5b96980a5c52591e11386113913b900fddbb22a53357fccdf62 EBUILD qtwebengine-6.8.0.ebuild 10076 BLAKE2B 55baf539b02042fbfcf1a831be96f3d693cc7f240ef0a2e5c0565fbe220ab0c413f292c08f9bdbccf55bd49506e0fccc81845f8a79bff5beb65a4bb5bea09c83 SHA512 f6dd74dbf9b010b035465f4457f32ae52c4df13018243926f31f99e53792be500c4b4d3dde7e381f3c91b628ebfc0855af451face4b4ba502591d20f4b02a969 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch index 75c3bae60905..13dd63d7b9f6 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch @@ -158,3 +158,13 @@ #include <cstring> #include <memory> #include <string> +--- a/src/3rdparty/chromium/base/task/thread_pool.h ++++ b/src/3rdparty/chromium/base/task/thread_pool.h +@@ -5,6 +5,7 @@ + #ifndef BASE_TASK_THREAD_POOL_H_ + #define BASE_TASK_THREAD_POOL_H_ + ++#include <cstdint> + #include <memory> + #include <utility> + diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch new file mode 100644 index 000000000000..b04f6a4667bb --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch @@ -0,0 +1,21 @@ +diff --git a/src/3rdparty/chromium/build/android/gyp/util/build_utils.py b/src/3rdparty/chromium/build/android/gyp/util/build_utils.py +index 022980517..e3f82704a 100644 +--- a/src/3rdparty/chromium/build/android/gyp/util/build_utils.py ++++ b/src/3rdparty/chromium/build/android/gyp/util/build_utils.py +@@ -12,7 +12,6 @@ import fnmatch + import json + import logging + import os +-import pipes + import re + import shutil + import stat +@@ -198,7 +197,7 @@ class CalledProcessError(Exception): + # A user should be able to simply copy and paste the command that failed + # into their shell. + copyable_command = '( cd {}; {} )'.format(os.path.abspath(self.cwd), +- ' '.join(map(pipes.quote, self.args))) ++ printed_cmd) + return 'Command failed: {}\n{}'.format(copyable_command, self.output) + + diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild index 1f2a9c188291..e2cc3c8e0ee9 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic HOMEPAGE="https://www.qt.io/" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 ~x86" + KEYWORDS="amd64 arm64" if [[ ${PV} == ${QT5_PV}_p* ]]; then SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.13_p20240510.tar.xz" S="${WORKDIR}/${PN}-5.15.13_p20240510" diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild index eb2dc1c56445..41918caa7224 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild @@ -4,7 +4,7 @@ EAPI=8 PATCHSET="${PN}-5.15.14_p20240510-patchset" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="xml(+)" inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs @@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic HOMEPAGE="https://www.qt.io/" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64" if [[ ${PV} == ${QT5_PV}_p* ]]; then SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" S="${WORKDIR}/${P}" @@ -103,6 +103,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.15.14_p20240510-re2.patch" # bug 913923 "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-cstdint.patch" "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-template-id-cdtor.patch" + "${FILESDIR}/${P}-py3.13-pipes.patch" # thx to Fedora ) python_check_deps() { |