summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/Manifest.gzbin11423 -> 11425 bytes
-rw-r--r--dev-qt/qtconnectivity/Manifest6
-rw-r--r--dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild8
-rw-r--r--dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild8
-rw-r--r--dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild8
-rw-r--r--dev-qt/qtwebengine/Manifest5
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch83
-rw-r--r--dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild1
-rw-r--r--dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild1
9 files changed, 112 insertions, 8 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index b4481cfe9949..0996eda2caf9 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
Binary files differ
diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index 89c70f1a3a58..8c719eedab2c 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -1,5 +1,5 @@
DIST qtconnectivity-everywhere-src-6.5.2.tar.xz 985972 BLAKE2B e7f3d8ad3580336d7eaff50e8ac2af3b291462544ebc5ca3d049d045a8388668d5e54a075375aaa9c99b3232ec07063dc4b7288bdc9fee83843fe57909e5e35b SHA512 76d9569ecfbbb4355587779a9aa0abf20f7d08484a2634e6c3b49a71b057451c54fd5fd344b4c376206384e5f1e9264a6bbbcd85ee44f15637c116f411d4aa30
-EBUILD qtconnectivity-6.5.2.ebuild 1411 BLAKE2B 147fd7843a6566d3f80018c04130a9018736482f38f7269cedb3eb4bb2201cd204621e9f5cb456db6d1838374aca8a66033181ff04b23c5ebe056b37d2dc4347 SHA512 46220e5e4349a18d494923b6550ba088b63c69b962c62afdae9eb60cf97c2cd48aec73b3b0d29667581d00143332ab2ec51059474ac2f4a1a1fd71e160727199
-EBUILD qtconnectivity-6.5.9999.ebuild 1411 BLAKE2B 147fd7843a6566d3f80018c04130a9018736482f38f7269cedb3eb4bb2201cd204621e9f5cb456db6d1838374aca8a66033181ff04b23c5ebe056b37d2dc4347 SHA512 46220e5e4349a18d494923b6550ba088b63c69b962c62afdae9eb60cf97c2cd48aec73b3b0d29667581d00143332ab2ec51059474ac2f4a1a1fd71e160727199
-EBUILD qtconnectivity-6.9999.ebuild 1411 BLAKE2B 147fd7843a6566d3f80018c04130a9018736482f38f7269cedb3eb4bb2201cd204621e9f5cb456db6d1838374aca8a66033181ff04b23c5ebe056b37d2dc4347 SHA512 46220e5e4349a18d494923b6550ba088b63c69b962c62afdae9eb60cf97c2cd48aec73b3b0d29667581d00143332ab2ec51059474ac2f4a1a1fd71e160727199
+EBUILD qtconnectivity-6.5.2.ebuild 1647 BLAKE2B d890151be30c6195e874e420a27ae3bc096d8818f09bf838881690a931001c83731a3c2545c955580fd0bcfda56b4c4e8b61784d99df724a669d6036d87d1fc5 SHA512 55b2000fff9cb30feb13e230fc1e0678c61e66fe020870f64f0c86fee9c45b34591240db264c108991bc5793d2216cd629769b6c040b481b115f0871d923bf98
+EBUILD qtconnectivity-6.5.9999.ebuild 1647 BLAKE2B d890151be30c6195e874e420a27ae3bc096d8818f09bf838881690a931001c83731a3c2545c955580fd0bcfda56b4c4e8b61784d99df724a669d6036d87d1fc5 SHA512 55b2000fff9cb30feb13e230fc1e0678c61e66fe020870f64f0c86fee9c45b34591240db264c108991bc5793d2216cd629769b6c040b481b115f0871d923bf98
+EBUILD qtconnectivity-6.9999.ebuild 1647 BLAKE2B d890151be30c6195e874e420a27ae3bc096d8818f09bf838881690a931001c83731a3c2545c955580fd0bcfda56b4c4e8b61784d99df724a669d6036d87d1fc5 SHA512 55b2000fff9cb30feb13e230fc1e0678c61e66fe020870f64f0c86fee9c45b34591240db264c108991bc5793d2216cd629769b6c040b481b115f0871d923bf98
MISC metadata.xml 637 BLAKE2B 5e9bcc7a56c93b58d09022effcbef407532e6248bda88bd0eb6a2d1c0094b9715b867025e464870bf9c6ee644c020538d8210ae742fcb55be1b795f50bfadbce SHA512 f9a9ebe77ba29217437d2afa9b05a13d421683feef94f1c64d861d9a1e081ed2ab1716453ddd66a0b93c6fecccfd11642ab69f297efbfe23baf3ad8f232197d5
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild
index ed231522887f..47506d7b4b09 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild
@@ -27,7 +27,13 @@ RDEPEND="
DEPEND="${RDEPEND}"
CMAKE_SKIP_TESTS=(
- # most hardware tests are skipped, but seems(?) this one detects and fails
+ # 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_qbluetoothlocaldevice
+ tst_qbluetoothserver
+ tst_qbluetoothservicediscoveryagent
+ tst_qbluetoothserviceinfo
tst_qlowenergycontroller
)
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild
index ed231522887f..47506d7b4b09 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild
@@ -27,7 +27,13 @@ RDEPEND="
DEPEND="${RDEPEND}"
CMAKE_SKIP_TESTS=(
- # most hardware tests are skipped, but seems(?) this one detects and fails
+ # 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_qbluetoothlocaldevice
+ tst_qbluetoothserver
+ tst_qbluetoothservicediscoveryagent
+ tst_qbluetoothserviceinfo
tst_qlowenergycontroller
)
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
index ed231522887f..47506d7b4b09 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
@@ -27,7 +27,13 @@ RDEPEND="
DEPEND="${RDEPEND}"
CMAKE_SKIP_TESTS=(
- # most hardware tests are skipped, but seems(?) this one detects and fails
+ # 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_qbluetoothlocaldevice
+ tst_qbluetoothserver
+ tst_qbluetoothservicediscoveryagent
+ tst_qbluetoothserviceinfo
tst_qlowenergycontroller
)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index fd6300fabe81..bcf9efa1daa3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,7 @@ AUX qtwebengine-5.15.10_p20230623-clang16.patch 594 BLAKE2B bedc481394382d3ba80f
AUX qtwebengine-5.15.10_p20230623-ffmpeg-binutils-2.41.patch 2319 BLAKE2B dad3b5af16377f15cf16e0ee5ef9424439a20bb863bbbe705a59cd7d5afffcfdac09c71f5e713883654ce1ffdfe8bd75df12c8be3d4b531118c79c1d70d2fed4 SHA512 a02ea0f7d2ae99db587ae2d74024802c8d2e1da90838df374b3e3e74f8009f1c4059ff72569ed051b86ab1fa5b7ff58bc5079251232b3e1b80ab3631a70aa1a8
AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
+AUX qtwebengine-6.5.2-libcxx17.patch 2548 BLAKE2B bd2ebe5f51505dd20d0fd65a0ad90b7afb106719f5f531c2de95fccc7720255e13dfa7161dda1284fa9da668e81c7df00a59136ed8e355c6ac0f8d335ad76220 SHA512 ec2f96691bd739ad4f3f4d7c0909491ea3a0942e33d701210b368c49c24e99d09c8ea29afeddf6d24678b92d985022dd39e8d05defece0e6a624d794c5f412d8
DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc58123831d0555a60d28428b93d32e185c21eb25401dfeeeee727ca20fc0ba3bda4ff2a298950e081a2eadcaeea095261941fe0d56b0d668 SHA512 9027899474d9d9dec5a5ca1e80e49404a0df2e23fe1666a437c07e99cbbbf787afd619eccf3d901545ed0a865c5fb439dce64f8339cbeb09213a0d4404456543
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B 9c64f09d982086d51af7d4134f174db9c23162bc3317ea4f19e44d91a52ad63aff56bacc7ae64a2bf693d900ef3ef5231c7333eb56237123799066055fc49450 SHA512 4e6abd825d124fddc63bc8ff92e94940b829289277aa17423403c6ce168c12fff1d52b604ae127c1a0fdbca852e3795482acefbe6e506a3059c0d32bec45a709
@@ -11,8 +12,8 @@ DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf2
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c042117186201da9c006982eb99efc1da72d1d339e90f9c6e9a60371a25d314f3372234e9d976d2cd292d0abcc08a4442a699a95495 SHA512 95138584a3644d86b9835288446dd2d01997379f894a38f101bbf899e853235600c9c80b571ed8380a15d179cb72fb0b68324e83b1b230847325ff476fa992e3
EBUILD qtwebengine-5.15.10_p20230815.ebuild 8258 BLAKE2B 766d6ad760f73e66d9a7f0ee52c3916e14b7f640e26784abf0866b039aecbf809c9e21a00b13d030311fa1ab91360aacd837e1257474800732a5598c3910c646 SHA512 c2d9534d452db6f53238faa05f6b454c4daeb6fcf683997d5095f4a9b777248e8d7f67ba4203a4b26457782817b887ca0cce36fb8d14f887e1b9772e78173140
-EBUILD qtwebengine-6.5.2-r1.ebuild 8041 BLAKE2B f348d951ffef684bd9e052324807b36838cbb7cc1bf9e2f25ce4bc886b7e85a046c053552a2f607609428e2b5cdc3a6da173f3f55eb2e3d0acfafda430517e88 SHA512 8827bd1ed39e63db6be134766c71e9b5befc6559dd1df5d0979895ecea5c9375dcf9368a1956d119133db901bac5adc7e7391d364d83468a94f7ecedffb0bae6
+EBUILD qtwebengine-6.5.2-r1.ebuild 8083 BLAKE2B 3c16c2ee3141c8fe6be62f1bd25923dc851430d30b4ce0760e1b4fd0a857cd498f1aab4c1e04293af6d6eea48f5c7fa88e18ef8d9e7fb153de6cfff16f5c013a SHA512 c9e2ca65cf4961ae4e9cb9cba649705a28b5d705fbce46cfa2aa07232e1a5948857db03964be85f0fe3c2cccb85980c5642a22d222dd9b69f5cb614e9c12dd3d
EBUILD qtwebengine-6.5.2.ebuild 8559 BLAKE2B afcca72bb25aab65e617a033bc7b4eb47241c86307184417151522da586fe38e9485151f139fed68b365061dbfd6d19a99ae8296507109e8ab71b8879da2d9de SHA512 4e53155411b17bd1ba2800b2a265a2d117d64d62b20a7c5f275cb08d1a6a3da3aa5646933a386020bfd09b6ef82763e4cae48644db0e6b5123a0314fa904a0ba
-EBUILD qtwebengine-6.5.9999.ebuild 8041 BLAKE2B f348d951ffef684bd9e052324807b36838cbb7cc1bf9e2f25ce4bc886b7e85a046c053552a2f607609428e2b5cdc3a6da173f3f55eb2e3d0acfafda430517e88 SHA512 8827bd1ed39e63db6be134766c71e9b5befc6559dd1df5d0979895ecea5c9375dcf9368a1956d119133db901bac5adc7e7391d364d83468a94f7ecedffb0bae6
+EBUILD qtwebengine-6.5.9999.ebuild 8083 BLAKE2B 3c16c2ee3141c8fe6be62f1bd25923dc851430d30b4ce0760e1b4fd0a857cd498f1aab4c1e04293af6d6eea48f5c7fa88e18ef8d9e7fb153de6cfff16f5c013a SHA512 c9e2ca65cf4961ae4e9cb9cba649705a28b5d705fbce46cfa2aa07232e1a5948857db03964be85f0fe3c2cccb85980c5642a22d222dd9b69f5cb614e9c12dd3d
EBUILD qtwebengine-6.9999.ebuild 8041 BLAKE2B f348d951ffef684bd9e052324807b36838cbb7cc1bf9e2f25ce4bc886b7e85a046c053552a2f607609428e2b5cdc3a6da173f3f55eb2e3d0acfafda430517e88 SHA512 8827bd1ed39e63db6be134766c71e9b5befc6559dd1df5d0979895ecea5c9375dcf9368a1956d119133db901bac5adc7e7391d364d83468a94f7ecedffb0bae6
MISC metadata.xml 1225 BLAKE2B e98ba2a05a516ebdb11d2b669532ba64d2ec3e517a347a77fc9d15f2e9c0671ff521ce13d3e296149c0cfee6b484fa3cbd6013ef20fdbccdce18d38c96b7aa7c SHA512 3aad326e75587e160340740cf9feadbeffac22b7bb064112e67f9750251587d60fc2fdb8256a98ac0b4156cfaf0cac0e01334628ed76dee31de0c5fd65d9a66f
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch
new file mode 100644
index 000000000000..8acbbf4463ce
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch
@@ -0,0 +1,83 @@
+Patch status: fixed in >=chromium-116.0.5809.0
+
+Backport of [2][3] in order to fix building with libcxx-17
+(and hopefully runtime if upgrade from 16->17 without rebuilding).
+
+In order to apply cleanly, also needed [4] which seems fine to have.
+
+[1] https://crbug.com/1449299
+[2] https://crrev.com/9bfbbffdba73668fdb483e5a850911d2b64c35d7
+[3] https://crrev.com/4878976cd7391fbc02f87af4b7fb539b5c1f3817
+[4] https://crrev.com/5b5551edd3961481e617e510276b9f015a35b861
+--- a/src/3rdparty/chromium/base/containers/checked_iterators.h
++++ b/src/3rdparty/chromium/base/containers/checked_iterators.h
+@@ -24,4 +24,7 @@
+ using reference = T&;
+ using iterator_category = std::random_access_iterator_tag;
++#if defined(__cpp_lib_ranges)
++ using iterator_concept = std::contiguous_iterator_tag;
++#endif
+
+ // Required for converting constructor below.
+@@ -31,8 +34,6 @@
+ // Required for certain libc++ algorithm optimizations that are not available
+ // for NaCl.
+-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL)
+ template <typename Ptr>
+ friend struct std::pointer_traits;
+-#endif
+
+ constexpr CheckedContiguousIterator() = default;
+@@ -147,4 +148,10 @@
+ }
+
++ constexpr friend CheckedContiguousIterator operator+(
++ difference_type lhs,
++ const CheckedContiguousIterator& rhs) {
++ return rhs + lhs;
++ }
++
+ constexpr CheckedContiguousIterator& operator-=(difference_type rhs) {
+ if (rhs < 0) {
+@@ -218,5 +225,4 @@
+ } // namespace base
+
+-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL)
+ // Specialize both std::__is_cpp17_contiguous_iterator and std::pointer_traits
+ // for CCI in case we compile with libc++ outside of NaCl. The former is
+@@ -236,11 +242,28 @@
+ // [2] https://wg21.link/std.iterator.tags
+ // [3] https://wg21.link/pointer.traits.optmem
+-namespace std {
++
++#if defined(_LIBCPP_VERSION)
++
++_LIBCPP_BEGIN_NAMESPACE_STD
+
+ template <typename T>
++struct __is_cpp17_contiguous_iterator;
++template <typename T>
+ struct __is_cpp17_contiguous_iterator<::base::CheckedContiguousIterator<T>>
+ : true_type {};
+
+ template <typename T>
++struct __libcpp_is_contiguous_iterator;
++template <typename T>
++struct __libcpp_is_contiguous_iterator<::base::CheckedContiguousIterator<T>>
++ : true_type {};
++
++_LIBCPP_END_NAMESPACE_STD
++
++#endif
++
++namespace std {
++
++template <typename T>
+ struct pointer_traits<::base::CheckedContiguousIterator<T>> {
+ using pointer = ::base::CheckedContiguousIterator<T>;
+@@ -261,5 +284,4 @@
+
+ } // namespace std
+-#endif
+
+ #endif // BASE_CONTAINERS_CHECKED_ITERATORS_H_
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 45ffa95a789a..4f2f7fbf799d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -101,6 +101,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
)
python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 45ffa95a789a..4f2f7fbf799d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -101,6 +101,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
)
python_check_deps() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 10:43:14 +0000