diff --git a/app-misc/1password/1password-8.10.82.ebuild b/app-misc/1password/1password-8.11.0.ebuild similarity index 100% rename from app-misc/1password/1password-8.10.82.ebuild rename to app-misc/1password/1password-8.11.0.ebuild diff --git a/dev-embedded/rpi-imager/rpi-imager-1.9.5.ebuild b/dev-embedded/rpi-imager/rpi-imager-1.9.6.ebuild similarity index 100% rename from dev-embedded/rpi-imager/rpi-imager-1.9.5.ebuild rename to dev-embedded/rpi-imager/rpi-imager-1.9.6.ebuild diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index adea8dbf..b2c5e2b3 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -1,6 +1,24 @@ -AUX qtwebkit-5.212.0_pre20200309-bison-3.7.patch 1613 BLAKE2B 0d2d173b5575ed5e1c52a07c5ceb14210bfb0a91e50a064df1e293451d64708822eb54d65947413efb13711d4c0c8e01441869248a4461446bd2bc122f07746b -AUX qtwebkit-5.212.0_pre20200309-glib-2.68.patch 887 BLAKE2B 1a191fd47693d70bc6ddbafcc8031bdd511c3be63121c1014471a93ebf3f1326a922277c42520a878192e0db4bb679cc007f27451ffac1aecdd86032b9d383c2 -AUX qtwebkit-5.212.0_pre20200309-icu-68.patch 4981 BLAKE2B c031aa8ec816749fa35e3876d007a02d60a3a5ff0fc57a2774a13fc23559b39cc5bfeec6fedd96cb36d7eed5d1b388049d190673afbe5b0fd2f0343f8afd5344 -AUX qtwebkit-5.212.0_pre20200309-python-3.9.patch 1100 BLAKE2B 2b44f8614a81141fd372d97cec2661b712e3cc68a01d5ed83d89c778eacc218a95a3273b7f464bbcd5380806859a40598cc166a8473fb30e76ca7e6b002b460f -DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 -EBUILD qtwebkit-5.212.0_pre20200309-r3.ebuild 4094 BLAKE2B b983b77f55525691e93f1c89060cabb3609c63effece0021136f99a91c5096b4d45425984a703ed061231de4480f541f5f9a08c6cd5e0290742aec0a356f2196 +AUX bison_3.7.diff 1349 BLAKE2B 4aaf23c18632778dcb6863a88b8530b1d66be5e34102fad9cf8b87cf70a377f72b2d9d5e6fcfc2c0accd44d0467ffe4350290614c8bf554b057e16e3fe598efe SHA512 2be063f420b9b25e2880c2cc2604092807009d39a7440dabc7e17cdeebffc378f58623a9060ec3d72e9deef1742c041c62c37c4b689c19b382671fbdca3364c8 +AUX gcc_13.diff 415 BLAKE2B 6576299b7e38532ff9e9974c072e718509476b9a5d17002529d5178e37c15cab5a93b4ae34932b89201c7c70d0d0dd06826b8bdb134ddd7f6397d0e62e037c3e SHA512 1d9b7024f10d9d2c0c7344b12054c8e285d65e613553a719cb9607b4aba98d73cca7ed3f861ec1702ad143978dc71fad9cc82385527ad3464942774138ec9e4f +AUX gcc_14.diff 881 BLAKE2B 1331f0ed9b27debc5a1cf9e24db7ee9a34148b6df3f3c04031583ef27f4b9d5234230df316be2e93fcb19ac5445fbc31d8af5f055630de0177325b259f0b7f85 SHA512 cd73a1a25351230cf911e0949fceea37607e70103f0d7d31aed0f0d14d3eb36c60f535f688a0e306b0b7ea5227c32d84d51eb4c1fd3598a98641860bfd754126 +AUX glib_2.68.diff 603 BLAKE2B 957338d13a393379ebd67a1cee235ecb93812110f14ed5704f211e1693af6649cd2ff2d0b54ff9fb6805668262a6ebf3fac5bdac0b65b16b8c35569068f1d778 SHA512 d29c8b336ab454c16a58fcbf3f7f25fdd9e392899463f2cb43b704380a5fc074d5bd3649e75776b0dbe1ce1eea16ab2e9fb7fb23e76bbea916f40834f797442c +AUX icu_68.diff 5535 BLAKE2B d9944f56de2f369bc3ce6a73f00542ab98bad5a119c6d9d8c37f67bef4a6d1835e01d3cb86248458b3ff2328fc1476fd042e8fbd8b9081de6e65bf449636d46d SHA512 1a2bf588837e23660667e0cb891d749d2c9b4aa5ec9e328d23cec01a7ce2e66b4d34c6e3f74363026f939f5b47c24d2c70e3e91034d6623678a7ffe514b15057 +AUX icu_75.1.diff 893 BLAKE2B 3c6112a17a168507ee6a70992cd26cce99643d33a2cca392249bb78c92a54c669973eec514e201549fa7d63ac4a553805da2430cdd21bcc93535656b6bcce2e7 SHA512 25835fad8637d27ab9ab4dd9ce07176e8c85e4e470a06c1aee2cec2ff93e3d836dbe92b289c1c5cc74b454dd2c5d07c1207639859383eecd262b91b00e763fe0 +AUX icu_76.diff 784 BLAKE2B 4820bced6e4f1d93673d31665b4270c8cb89cf07dc33fb83398d881fa25011f7b3e26672c3b96650feba24919e3898bc56f088a25b8faaa7c70f7d2a60f3337f SHA512 1713f485227244e53565e0cede88001678a3b9221433ec2a7e41c8793457b4265e81bac6849bf6c669cfa7a0761a67433de8695a5f976d64884fa908e09c7987 +AUX jscore_big_endian.diff 1087 BLAKE2B 12e072bc4f05c40838945b3bb1d606afc072633160973bd3c0f86b53c2417f0d6b9ecfa8b7b96107fe2b64a2a1e751af65e7ebc73abed3f83df5cbcb29ad746f SHA512 db98d710815eb68f1fb025098b04c34b33518750c193e702383ca879e145c52ba4786fa4721f384f01f90231c32be9478d507c1000eb761621751edcd071b966 +AUX libxml2_2.12.diff 1067 BLAKE2B f473574260ab95a2726944f5e473585a759678112f9fd57b982f6b7e3be8f2ebdafc0aea4adc563be979ef8b7f37dd2d194ae3705d3a6c32c7f5e4daed9f7836 SHA512 c46bad48bf52d3ce474e45b43b966016403e9b6c4f5425d75a1505ca5c67927eef9ff99b8b06bf0fe98153feb87869c472c9bc0ec3c12dea29620904640328dd +AUX loongarch64.diff 2132 BLAKE2B f8f84928786478597f712fc9cd0b9aede8cb5a54e532ded63b965cb296194d9b225b49bf987da844c664df6c9f4e30e25945ac824b9f42503bad6349273a1dee SHA512 67109261c5f053e0645d7fc23edcc8a821a76fafe6f2902bdd26d8d197fd2bb4e2bd9e506c357880c3ca58fcef7198712c828ecaed4e0290bd6e95c89fd71b6c +AUX no_pdf_image_plugin.diff 854 BLAKE2B d63627aaf83d6752a65f5660a80682a18c4ad1360d67db2d6e0a5d751d1a1793927349312af703794f927714ab9a1c79df16607037d8222120319a2e8855bcdb SHA512 7f1bd1893f30f7bc1ca789846806161c6f90ddad2b6a2e295c2d5ac2f380dbc2c5313659aac832a8efeaf92ddd44d7cfb44a92842d155893667beb3d8c512ef2 +AUX offlineasm_ruby_3.2.diff 1275 BLAKE2B 48e944220dca9527272a05f6517b66fb217e2505b0bf32c160c5ac5069e7fc1ab88dd2bbb3edcad71871753e44ea62c2f846d1489e15c5f62a1ede8af0935f11 SHA512 82004434b5f063363be3be7e550395065af7395009a148e6c0936f797889df6aa93754210a7c7bffbfdfeaa922a07bcd00437d0b90a59356be7f1fa7d8c193da +AUX path_max.diff 598 BLAKE2B 676a26a4b97996e62eaea6ef3cd6481b0a64e062c5ef346f1938f6ae9dd5b37ac264b55ed338f413b230a79258982828305b00eff905b6cc78c219225a235e29 SHA512 d8908f53a66fa5a36660145ed0de4648465f7aa90bdf20554f9cf53f4ef2b02669c0a08f2ff0627215e62dcfa31f61cae206b3bd94ca737c2c30b6db2e7c36ca +AUX python_3.9.diff 645 BLAKE2B bdad9cf9feec2b46459249affcf60ad8086dd0200cc5a3bd6eca2aabab6777d21ec526245affcaa85be77d1dd44dc123d33a19656c85bbf1901dca81a1e4cf9f SHA512 cd90c52141ff70381cc5c5f627713428dee20f33ceed66f428cc30a3a8f3c63263e26528f81de6c9bb970c6951121f48b92c681d799ee0bc651fe6f04aa0a543 +AUX qtwebkit-5.212.0_pre20200309-bison-3.7.patch 1613 BLAKE2B 0d2d173b5575ed5e1c52a07c5ceb14210bfb0a91e50a064df1e293451d64708822eb54d65947413efb13711d4c0c8e01441869248a4461446bd2bc122f07746b SHA512 cf21eff51e1026f4e506724a512b9925d4619909f5924bf01055244817ec9594e9d3ce105b510cd28ecce4772d122d1393fb7273501e20e16749f43282a3200b +AUX qtwebkit-5.212.0_pre20200309-glib-2.68.patch 887 BLAKE2B 1a191fd47693d70bc6ddbafcc8031bdd511c3be63121c1014471a93ebf3f1326a922277c42520a878192e0db4bb679cc007f27451ffac1aecdd86032b9d383c2 SHA512 7948ab8d40e954bfcafaceb69ea51991f45a684d8875d542bdf39af46266f5c312581662ea591a8199aa5e3583a6e3612e175f73a75b66ffd094e304aa7d67a9 +AUX qtwebkit-5.212.0_pre20200309-icu-68.patch 4981 BLAKE2B c031aa8ec816749fa35e3876d007a02d60a3a5ff0fc57a2774a13fc23559b39cc5bfeec6fedd96cb36d7eed5d1b388049d190673afbe5b0fd2f0343f8afd5344 SHA512 b1cf2a5c07e4876e74913687417ffd751e6dcb3fa783c545ba50064d31c9a4bb1515ce9c26b399f2b9b53b588791e4e6f571ad7cfe631087ecd3709bce675a9e +AUX qtwebkit-5.212.0_pre20200309-includes.patch 500 BLAKE2B 1b0f577679ab410126c09257215ee08708abc68fd89113c9c6f0849a76433e8487190a1890eb6bc46493f45da11b0c0bfbdc136a27c4c1d5af4ee10cf7e34b88 SHA512 0152a36c2d1193eb082dc5a71d07485764d6962f930d887bf665e9d18280a88e57c3ef07c84e04030589453829fa227faeb7fbc91a7f1c7f3b54151bedd50ddd +AUX qtwebkit-5.212.0_pre20200309-python-3.9.patch 1100 BLAKE2B 2b44f8614a81141fd372d97cec2661b712e3cc68a01d5ed83d89c778eacc218a95a3273b7f464bbcd5380806859a40598cc166a8473fb30e76ca7e6b002b460f SHA512 9bcb07cfa61684d154f9b80b231c32423a8b80820445372634ef620c11a9267e98ae0318e143e6358f0668b10f90a44b163f0eeeee5476a0b5fbd31af5c4bf9a +AUX reduce_exports.diff 946 BLAKE2B ac87fb790c16fe876b89e289a132e933e79da475a942f3e5d7473e22ea6f04062c4f5aefbb442a950dcd70dd717f86ba8b8b8e304aac949aab7a7cb29cec9eab SHA512 9240c6a9b30262715561960018ba40daf9efe19053b8b0b4817f10976ac6d837e7a32977a0c173ff7f8ed5281d3581cd7f79b3b1a2a5aa6be760a7594eb14574 +AUX series 271 BLAKE2B 647b81e820e5210edeaa5b6a01717ca22c70756862e9e073de9b7c23c4b3cd182adc858c37523f74a8f25d78a51522bdb4fa2b70a3f0c3d9a3f5d0af22d8c547 SHA512 c249c957d42beb5e3c811ac3e853ca3a0f3b05ede3e39ec4aa350df42a7d2fb83c7b45d7fa3c7a33e6ff789fd6851540074f286057b0bc1a9662159eb1d194f2 +AUX support_riscv64.diff 2131 BLAKE2B ea74709d35758e4c5662bfadef1b6e091788457e675783c7010e1e62fcfab59cc9b001b25ac373a50280fe9041423c2d7fd7d618d9e4a52a2800467bc8490b58 SHA512 0e07fb0b3dc39df14e9591706949ca0ae44d7c6433461673e9bebe927e5ec0529e1064ffc2d5e3b2a5f88a2d7016dd8f020eee6ae860bfee559f45662236c5c2 +DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 +EBUILD qtwebkit-5.212.0_pre20200309-r6.ebuild 4655 BLAKE2B ccc56ffab7d6e87b57387c3c05e49ee644da67f23a19615c9d3e27d9ce50e66a5a26d8eb399966481107a912e9be3ddbd9a3eae41dfad5b821840fb3972cbbb6 SHA512 78c9a9dc8f674b7a8ac1a430d20183e9a38dc5742cfca5b6aa5cbdf0736e4c1fa4146239615cd1fcc7b5c9a3d30f6c84c30289785b37e60a6cfb0139eec887d8 diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch b/dev-qt/qtwebkit/files/bison_3.7.diff similarity index 54% rename from dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch rename to dev-qt/qtwebkit/files/bison_3.7.diff index de3bbcfc..4237a060 100644 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch +++ b/dev-qt/qtwebkit/files/bison_3.7.diff @@ -1,23 +1,16 @@ -From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Tue, 4 Aug 2020 21:04:06 +0300 -Subject: [PATCH] Let Bison generate the header directly, to fix build with - Bison 3.7 +Description: let Bison generate the header directly + Starting with Bison 3.7, the generated C++ file #include's the header + by default, instead of duplicating it. So we should not delete it. + . + Remove the code to add #ifdef guards to the header, since Bison adds + them itself since version 2.6.3. +Author: Dmitry Shachnev +Forwarded: https://github.com/qtwebkit/qtwebkit/pull/1012 +Last-Update: 2020-08-04 -Starting with Bison 3.7, the generated C++ file #include's the header -by default, instead of duplicating it. So we should not delete it. - -Remove the code to add #ifdef guards to the header, since Bison adds -them itself since version 2.6.3. ---- - Source/WebCore/css/makegrammar.pl | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) - -diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 5d63b08102eb..9435701c7061 100644 --- a/Source/WebCore/css/makegrammar.pl +++ b/Source/WebCore/css/makegrammar.pl -@@ -73,25 +73,6 @@ +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { } my $fileBase = File::Spec->join($outputDir, $filename); diff --git a/dev-qt/qtwebkit/files/gcc_13.diff b/dev-qt/qtwebkit/files/gcc_13.diff new file mode 100644 index 00000000..e83010d4 --- /dev/null +++ b/dev-qt/qtwebkit/files/gcc_13.diff @@ -0,0 +1,14 @@ +Description: ANGLE: add missing include to fix build with GCC 13 +Origin: upstream, https://chromium.googlesource.com/angle/angle/+/cdfa8f504d83c2a3 +Last-Update: 2023-06-18 + +--- a/Source/ThirdParty/ANGLE/src/common/mathutil.h ++++ b/Source/ThirdParty/ANGLE/src/common/mathutil.h +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + + namespace gl diff --git a/dev-qt/qtwebkit/files/gcc_14.diff b/dev-qt/qtwebkit/files/gcc_14.diff new file mode 100644 index 00000000..b5be4607 --- /dev/null +++ b/dev-qt/qtwebkit/files/gcc_14.diff @@ -0,0 +1,18 @@ +Description: fix build with GCC 14 +Origin: Fedora, https://src.fedoraproject.org/rpms/qt5-qtwebkit/blob/rawhide/f/qtwebkit-fix-build-gcc14.patch +Forwarded: no +Last-Update: 2024-07-04 + +--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp ++++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +@@ -231,8 +231,9 @@ bool isAllowedByAllWithHashFromContent(c + auto cryptoDigest = CryptoDigest::create(toCryptoDigestAlgorithm(algorithm)); + cryptoDigest->addBytes(contentCString.data(), contentCString.length()); + Vector digest = cryptoDigest->computeHash(); ++ ContentSecurityPolicyHash hash = std::make_pair(algorithm, digest); + for (auto& policy : policies) { +- if ((policy.get()->*allowed)(std::make_pair(algorithm, digest))) ++ if ((policy.get()->*allowed)(hash)) + return true; + } + } diff --git a/dev-qt/qtwebkit/files/glib_2.68.diff b/dev-qt/qtwebkit/files/glib_2.68.diff new file mode 100644 index 00000000..3112b4c3 --- /dev/null +++ b/dev-qt/qtwebkit/files/glib_2.68.diff @@ -0,0 +1,18 @@ +Description: remove invalid g_object declarations to fix build with glib ≥ 2.68 +Origin: https://build.opensuse.org/package/view_file/KDE:Qt5/libqt5-qtwebkit/0001-Remove-invalid-g_object-declarations-to-fix-build-wi.patch +Forwarded: https://github.com/qtwebkit/qtwebkit/pull/1058 +Last-Update: 2021-04-07 + +--- a/Source/WTF/wtf/glib/GRefPtr.h ++++ b/Source/WTF/wtf/glib/GRefPtr.h +@@ -28,9 +28,7 @@ + #include + #include + #include +- +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); ++#include + + namespace WTF { + diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch b/dev-qt/qtwebkit/files/icu_68.diff similarity index 86% rename from dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch rename to dev-qt/qtwebkit/files/icu_68.diff index 7de72ea6..94464f9b 100644 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch +++ b/dev-qt/qtwebkit/files/icu_68.diff @@ -1,6 +1,22 @@ +Description: fix macro definitions TRUE, FALSE +Origin: Fedora, https://src.fedoraproject.org/rpms/qt5-qtwebkit/blob/rawhide/f/qtwebkit-icu68.patch +Forwarded: no +Last-Update: 2022-03-13 + +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) --- a/Source/WebCore/platform/text/icu/UTextProvider.h +++ b/Source/WebCore/platform/text/icu/UTextProvider.h -@@ -80,12 +80,12 @@ +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRan // Ensure chunk offset is well formed if computed offset exceeds int32_t range. ASSERT(offset < std::numeric_limits::max()); text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; @@ -15,7 +31,7 @@ return true; } } else { -@@ -94,12 +94,12 @@ +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRan // Ensure chunk offset is well formed if computed offset exceeds int32_t range. ASSERT(offset < std::numeric_limits::max()); text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; @@ -32,7 +48,7 @@ } --- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uT if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { // Already inside the buffer. Set the new offset. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); @@ -60,7 +76,7 @@ } } -@@ -144,7 +144,7 @@ +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uT uText->nativeIndexingLimit = uText->chunkLength; @@ -69,7 +85,7 @@ } static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -336,7 +336,7 @@ +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNa static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) { if (!text->context) @@ -78,7 +94,7 @@ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); UBool isAccessible; if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -356,7 +356,7 @@ +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAcce ASSERT(newContext == UTextProviderContext::PriorContext); textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); } @@ -89,7 +105,7 @@ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) --- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextA static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) { if (!text->context) @@ -98,7 +114,7 @@ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); UBool isAccessible; if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -145,7 +145,7 @@ +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAcces ASSERT(newContext == UTextProviderContext::PriorContext); textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); } @@ -107,14 +123,3 @@ } static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -308,7 +308,7 @@ - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) diff --git a/dev-qt/qtwebkit/files/icu_75.1.diff b/dev-qt/qtwebkit/files/icu_75.1.diff new file mode 100644 index 00000000..941b6735 --- /dev/null +++ b/dev-qt/qtwebkit/files/icu_75.1.diff @@ -0,0 +1,22 @@ +Description: partial backport of r260554 (79fe19caf) + In particular, we need -DU_SHOW_CPLUSPLUS_API=0 to avoid compilation + errors in C++ parts of ICU headers which we are not using anyway. +Origin: upstream, https://github.com/qtwebkit/qtwebkit/commit/756e1c8f23dc2720 +Last-Update: 2024-05-28 + +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -1137,6 +1137,13 @@ + #define ENABLE_PLATFORM_FONT_LOOKUP 1 + #endif + ++/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */ ++/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */ ++#define U_SHOW_CPLUSPLUS_API 0 ++#ifdef __cplusplus ++#define UCHAR_TYPE char16_t ++#endif ++ + #if COMPILER(MSVC) + #undef __STDC_LIMIT_MACROS + #define __STDC_LIMIT_MACROS diff --git a/dev-qt/qtwebkit/files/icu_76.diff b/dev-qt/qtwebkit/files/icu_76.diff new file mode 100644 index 00000000..2ede4d9a --- /dev/null +++ b/dev-qt/qtwebkit/files/icu_76.diff @@ -0,0 +1,16 @@ +Description: also disable ICU C++ header-only APIs, introduced in ICU 76 + They require C++17 which we do not have, but we do not need them anyway. +Author: Dmitry Shachnev +Forwarded: https://github.com/qtwebkit/qtwebkit/pull/1107 +Last-Update: 2025-01-09 + +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -1140,6 +1140,7 @@ + /* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */ + /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */ + #define U_SHOW_CPLUSPLUS_API 0 ++#define U_SHOW_CPLUSPLUS_HEADER_API 0 + #ifdef __cplusplus + #define UCHAR_TYPE char16_t + #endif diff --git a/dev-qt/qtwebkit/files/jscore_big_endian.diff b/dev-qt/qtwebkit/files/jscore_big_endian.diff new file mode 100644 index 00000000..802c00ae --- /dev/null +++ b/dev-qt/qtwebkit/files/jscore_big_endian.diff @@ -0,0 +1,28 @@ +Description: fix JSCore segmentation fault on 64-bit big endian systems + In CodeBlock.cpp the code preparing the operands of op_get_from_scope writes + the property offset as pointer size (hence 64 bit) value: + . + 2141: instructions[i + 6].u.pointer = reinterpret_cast(op.operand); + . + while the same slot is accessed later by the jitted code as 32 bit integer: + . + macro getProperty(slow) + loadisFromInstruction(6, t1) + . + This fails on big endian targets since the integer access takes the higher + part of the 64 bit value. +Origin: backport, https://github.com/webkit/webkit/commit/3fdde71c7d95d758 +Reviewed-by: Frank Heimes +Last-Update: 2021-11-24 + +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm +@@ -2020,7 +2020,7 @@ macro loadWithStructureCheck(operand, sl + end + + macro getProperty(slow) +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + loadPropertyAtVariableOffset(t1, t0, t2, slow) + valueProfile(t2, 7, t0) + loadisFromInstruction(1, t0) diff --git a/dev-qt/qtwebkit/files/libxml2_2.12.diff b/dev-qt/qtwebkit/files/libxml2_2.12.diff new file mode 100644 index 00000000..6974bec1 --- /dev/null +++ b/dev-qt/qtwebkit/files/libxml2_2.12.diff @@ -0,0 +1,32 @@ +Description: fix build with libxml2 version 2.12.0 +Origin: upstream, https://commits.webkit.org/270977@main +Last-Update: 2024-01-22 + +--- a/Source/WebCore/xml/XSLTProcessor.h ++++ b/Source/WebCore/xml/XSLTProcessor.h +@@ -64,7 +64,11 @@ public: + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void parseErrorFunc(void* userData, const xmlError*); ++#else + static void parseErrorFunc(void* userData, xmlError*); ++#endif + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks +--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp ++++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +@@ -78,7 +78,11 @@ void XSLTProcessor::genericErrorFunc(voi + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) ++#else + void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++#endif + { + PageConsoleClient* console = static_cast(userData); + if (!console) diff --git a/dev-qt/qtwebkit/files/loongarch64.diff b/dev-qt/qtwebkit/files/loongarch64.diff new file mode 100644 index 00000000..28e12153 --- /dev/null +++ b/dev-qt/qtwebkit/files/loongarch64.diff @@ -0,0 +1,59 @@ +Description: add loongarch64 support +Author: Dandan Zhang +Forwarded: https://github.com/qtwebkit/qtwebkit/pull/1096 +Last-Update: 2024-03-09 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,6 +85,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR + set(WTF_CPU_S390X 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") + set(WTF_CPU_RISCV64 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64") ++ set(WTF_CPU_LOONGARCH64 1) + else () + message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'") + endif () +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1280,6 +1280,7 @@ if (WTF_CPU_ARM) + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) ++elseif (WTF_CPU_LOONGARCH64) + elseif (WTF_CPU_PPC) + elseif (WTF_CPU_PPC64) + elseif (WTF_CPU_PPC64LE) +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -103,6 +103,11 @@ + #define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1 + #endif /* MIPS */ + ++/* CPU(LOONGARCH64) - LoongArch 64-bit */ ++#if defined(__loongarch64) ++#define WTF_CPU_LOONGARCH64 1 ++#endif ++ + /* CPU(PPC64) - PowerPC 64-bit Big Endian */ + #if ( defined(__ppc64__) \ + || defined(__PPC64__)) \ +@@ -711,6 +716,7 @@ + || CPU(ARM64) \ + || CPU(S390X) \ + || CPU(MIPS64) \ ++ || CPU(LOONGARCH64) \ + || CPU(PPC64) \ + || CPU(PPC64LE) \ + || CPU(RISCV64) +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(RISCV64) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(RISCV64) || CPU(LOONGARCH64) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) diff --git a/dev-qt/qtwebkit/files/no_pdf_image_plugin.diff b/dev-qt/qtwebkit/files/no_pdf_image_plugin.diff new file mode 100644 index 00000000..f0409271 --- /dev/null +++ b/dev-qt/qtwebkit/files/no_pdf_image_plugin.diff @@ -0,0 +1,18 @@ +Description: do not attempt rendering PDF with Qt image plugin + Qt 5.15 added Qt PDF module which comes with imageformat plugin, which + allows rendering first page of PDF document as image. +Origin: upstream, https://github.com/qtwebkit/qtwebkit/commit/0443d42b04e0f99c +Last-Update: 2020-09-13 + +--- a/Source/WebCore/platform/MIMETypeRegistry.cpp ++++ b/Source/WebCore/platform/MIMETypeRegistry.cpp +@@ -254,6 +254,9 @@ static void initializeSupportedImageMIME + // Do not treat SVG as images directly because WebKit can handle them. + supportedImageMIMETypes->remove("image/svg+xml"); + supportedImageResourceMIMETypes->remove("image/svg+xml"); ++ // Do not treat PDF as images ++ supportedImageMIMETypes->remove("application/pdf"); ++ supportedImageResourceMIMETypes->remove("application/pdf"); + #endif // PLATFORM(QT) + #endif // USE(CG) + } diff --git a/dev-qt/qtwebkit/files/offlineasm_ruby_3.2.diff b/dev-qt/qtwebkit/files/offlineasm_ruby_3.2.diff new file mode 100644 index 00000000..ec251b28 --- /dev/null +++ b/dev-qt/qtwebkit/files/offlineasm_ruby_3.2.diff @@ -0,0 +1,28 @@ +Description: fix offlineasm error with Ruby 3.2 + Swap checks to prevent applying the =~ operator to Annotation instances, + which do not define it. +Origin: upstream, https://commits.webkit.org/219400@main +Last-Update: 2024-03-28 + +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -584,9 +584,7 @@ class Parser + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -600,6 +598,8 @@ class Parser + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 diff --git a/dev-qt/qtwebkit/files/path_max.diff b/dev-qt/qtwebkit/files/path_max.diff new file mode 100644 index 00000000..3b761455 --- /dev/null +++ b/dev-qt/qtwebkit/files/path_max.diff @@ -0,0 +1,21 @@ +Author: Pino Toscano +Description: Locally define PATH_MAX is not available + The code unconditionally uses PATH_MAX, which is POSIX-optional. + . + This fixes the build on platforms without it, such as GNU/Hurd. +Forwarded: no +Last-Update: 2017-11-20 + +--- a/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp ++++ b/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp +@@ -45,6 +45,10 @@ + #include + #endif + ++#if !defined(PATH_MAX) ++#define PATH_MAX 4096 ++#endif ++ + namespace WebCore { + + static const char* const gDictionaryDirectories[] = { diff --git a/dev-qt/qtwebkit/files/python_3.9.diff b/dev-qt/qtwebkit/files/python_3.9.diff new file mode 100644 index 00000000..7081e978 --- /dev/null +++ b/dev-qt/qtwebkit/files/python_3.9.diff @@ -0,0 +1,15 @@ +Description: fix compilation with Python 3.9: avoid passing encoding to json.load() +Origin: upstream, https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b626 +Last-Update: 2020-11-23 + +--- a/Source/JavaScriptCore/generate-bytecode-files ++++ b/Source/JavaScriptCore/generate-bytecode-files +@@ -163,7 +163,7 @@ if __name__ == "__main__": + initBytecodesFile = openOrExit(initASMFileName, "w") + + try: +- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") ++ bytecodeSections = json.load(bytecodeFile) + except: + print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) + diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch deleted file mode 100644 index f377a311..00000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/qtwebkit/qtwebkit/pull/1058 - -From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Wed, 7 Apr 2021 13:38:09 +0200 -Subject: [PATCH] Remove invalid g_object declarations to fix build with glib - >= 2.68 - -g_object_ref_sink is defined as a macro meanwhile and so the build fails. -Just remove the declarations, glib.h is included anyway. ---- - Source/WTF/wtf/glib/GRefPtr.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h -index 06133d82cb35..d9a1d2f145f5 100644 ---- a/Source/WTF/wtf/glib/GRefPtr.h -+++ b/Source/WTF/wtf/glib/GRefPtr.h -@@ -29,9 +29,6 @@ - #include - #include - --extern "C" void g_object_unref(gpointer); --extern "C" gpointer g_object_ref_sink(gpointer); -- - namespace WTF { - - enum GRefPtrAdoptType { GRefPtrAdopt }; diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch deleted file mode 100644 index a3b677b7..00000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Wed, 3 Jun 2020 15:01:42 +0300 -Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to - json.load() - -In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument -is not supported. - -Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 ---- - Source/JavaScriptCore/generate-bytecode-files | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files -index c5dab429c7b0..af3431275ecf 100644 ---- a/Source/JavaScriptCore/generate-bytecode-files -+++ b/Source/JavaScriptCore/generate-bytecode-files -@@ -163,7 +163,7 @@ if __name__ == "__main__": - initBytecodesFile = openOrExit(initASMFileName, "w") - - try: -- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") -+ bytecodeSections = json.load(bytecodeFile) - except: - print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) - diff --git a/dev-qt/qtwebkit/files/reduce_exports.diff b/dev-qt/qtwebkit/files/reduce_exports.diff new file mode 100644 index 00000000..7a28760f --- /dev/null +++ b/dev-qt/qtwebkit/files/reduce_exports.diff @@ -0,0 +1,26 @@ +Description: reduce the number of exported symbols in libQt5WebKit.so.5 +Author: Dmitry Shachnev +Forwarded: not-needed +Last-Update: 2017-08-27 + +--- a/Source/WTF/wtf/ExportMacros.h ++++ b/Source/WTF/wtf/ExportMacros.h +@@ -56,7 +56,7 @@ + + #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) + +-#define WTF_EXPORT_DECLARATION __attribute__((visibility("default"))) ++#define WTF_EXPORT_DECLARATION + #define WTF_IMPORT_DECLARATION WTF_EXPORT_DECLARATION + #define WTF_HIDDEN_DECLARATION __attribute__((visibility("hidden"))) + +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -706,6 +706,7 @@ if (COMPILER_IS_GCC_OR_CLANG AND UNIX) + if (NOT SHARED_CORE) + set(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden ${CMAKE_CXX_FLAGS}") ++ add_definitions(-DJS_NO_EXPORT) + endif () + endif () + diff --git a/dev-qt/qtwebkit/files/series b/dev-qt/qtwebkit/files/series new file mode 100644 index 00000000..d456d795 --- /dev/null +++ b/dev-qt/qtwebkit/files/series @@ -0,0 +1,16 @@ +reduce_exports.diff +path_max.diff +support_riscv64.diff +bison_3.7.diff +no_pdf_image_plugin.diff +python_3.9.diff +glib_2.68.diff +jscore_big_endian.diff +icu_68.diff +gcc_13.diff +libxml2_2.12.diff +loongarch64.diff +offlineasm_ruby_3.2.diff +icu_75.1.diff +gcc_14.diff +icu_76.diff diff --git a/dev-qt/qtwebkit/files/support_riscv64.diff b/dev-qt/qtwebkit/files/support_riscv64.diff new file mode 100644 index 00000000..0838efa1 --- /dev/null +++ b/dev-qt/qtwebkit/files/support_riscv64.diff @@ -0,0 +1,61 @@ +Description: add support for riscv64 architecture +Author: William Grant +Forwarded: https://github.com/qtwebkit/qtwebkit/pull/982 +Last-Update: 2020-04-28 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,6 +83,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR + set(WTF_CPU_S390 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") + set(WTF_CPU_S390X 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") ++ set(WTF_CPU_RISCV64 1) + else () + message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'") + endif () +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390) + elseif (WTF_CPU_S390X) + elseif (WTF_CPU_MIPS) + elseif (WTF_CPU_SH4) ++elseif (WTF_CPU_RISCV64) + elseif (WTF_CPU_X86) + elseif (WTF_CPU_X86_64) + if (MSVC AND ENABLE_JIT) +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -176,6 +176,11 @@ + #define WTF_CPU_X86_SSE2 1 + #endif + ++/* CPU(RISCV64) - RISCV64 */ ++#if defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 ++#define WTF_CPU_RISCV64 1 ++#endif ++ + /* CPU(ARM64) - Apple */ + #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) + #define WTF_CPU_ARM64 1 +@@ -707,7 +712,8 @@ + || CPU(S390X) \ + || CPU(MIPS64) \ + || CPU(PPC64) \ +- || CPU(PPC64LE) ++ || CPU(PPC64LE) \ ++ || CPU(RISCV64) + #define USE_JSVALUE64 1 + #else + #define USE_JSVALUE32_64 1 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(RISCV64) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r3.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r6.ebuild similarity index 81% rename from dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r3.ebuild rename to dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r6.ebuild index 9b3420aa..edd3cae1 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r3.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} = *9999 ]]; then EGIT_BRANCH="qtwebkit-5.212" @@ -14,8 +14,8 @@ else S="${WORKDIR}/${MY_P}" fi -PYTHON_COMPAT=( python3_{7..13} ) -USE_RUBY="ruby25 ruby26 ruby27 ruby30 ruby31" +PYTHON_COMPAT=( python3_{10..13} ) +USE_RUBY="ruby27 ruby30 ruby31 ruby32" inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" @@ -84,11 +84,31 @@ RDEPEND="${DEPEND}" CHECKREQS_DISK_BUILD="16G" # bug 417307 +#PATCHES=( +# "${FILESDIR}/${P}-bison-3.7.patch" # bug 736499 +# "${FILESDIR}/${P}-icu-68.patch" # bug 753260 +# "${FILESDIR}/${P}-python-3.9.patch" # bug 766303 +# "${FILESDIR}/${P}-glib-2.68.patch" # bug 777759 +# "${FILESDIR}/${P}-includes.patch" +#) + PATCHES=( - "${FILESDIR}/${P}-bison-3.7.patch" # bug 736499 - "${FILESDIR}/${P}-icu-68.patch" # bug 753260 - "${FILESDIR}/${P}-python-3.9.patch" # bug 766303 - "${FILESDIR}/${P}-glib-2.68.patch" # bug 777759 + "${FILESDIR}/reduce_exports.diff" + "${FILESDIR}/path_max.diff" + "${FILESDIR}/support_riscv64.diff" + "${FILESDIR}/bison_3.7.diff" + "${FILESDIR}/no_pdf_image_plugin.diff" + "${FILESDIR}/python_3.9.diff" + "${FILESDIR}/glib_2.68.diff" + "${FILESDIR}/jscore_big_endian.diff" + "${FILESDIR}/icu_68.diff" + "${FILESDIR}/gcc_13.diff" + "${FILESDIR}/libxml2_2.12.diff" + "${FILESDIR}/loongarch64.diff" + "${FILESDIR}/offlineasm_ruby_3.2.diff" + "${FILESDIR}/icu_75.1.diff" + "${FILESDIR}/gcc_14.diff" + "${FILESDIR}/icu_76.diff" ) _check_reqs() { diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20250730-r0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20250730-r0.ebuild new file mode 100644 index 00000000..15c59d49 --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20250730-r0.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = *9999 ]]; then + EGIT_BRANCH="qtwebkit-5.212" + EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git" + inherit git-r3 +else + #MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot + MY_PV="2022-09-07" # present as upgrade over previous snapshot + MY_P="${PN}-${MY_PV}" # present as upgrade over previous snapshot + #SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz" + SRC_URI="https://github.com/movableink/webkit/releases/download/${MY_PV}/${MY_P}-src.tar.xz -> ${P}.tar.xz" + KEYWORDS="amd64 arm arm64 ppc64 x86" + S="${WORKDIR}/${MY_P}" +fi + +PYTHON_COMPAT=( python3_{10..13} ) +USE_RUBY="ruby27 ruby30 ruby31 ruby32" +inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs + +DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" +HOMEPAGE="https://www.qt.io/" + +LICENSE="BSD LGPL-2+" +SLOT="5/5.212" +IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml X" + +REQUIRED_USE=" + nsplugin? ( X ) + qml? ( opengl ) + ?? ( gstreamer multimedia ) +" + +# Dependencies found at Source/cmake/OptionsQt.cmake +QT_MIN_VER="5.12.3:5" +BDEPEND=" + ${PYTHON_DEPS} + ${RUBY_DEPS} + dev-lang/perl + dev-util/gperf + >=sys-devel/bison-2.4.3 + sys-devel/flex + sys-devel/dwz + media-libs/woff2 + virtual/pkgconfig +" +DEPEND=" + dev-db/sqlite:3 + dev-libs/icu:= + dev-libs/libxml2 + dev-libs/libxslt + >=dev-qt/qtcore-${QT_MIN_VER} + >=dev-qt/qtgui-${QT_MIN_VER} + >=dev-qt/qtnetwork-${QT_MIN_VER} + >=dev-qt/qtwidgets-${QT_MIN_VER}= + media-libs/libpng:0= + media-libs/woff2 + virtual/jpeg:0 + geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + hyphen? ( dev-libs/hyphen ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) + opengl? ( + >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=] + >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=] + ) + orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) + printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) + qml? ( + >=dev-qt/qtdeclarative-${QT_MIN_VER} + >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] + ) + media-libs/libwebp:= + X? ( + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXrender + ) +" +RDEPEND="${DEPEND}" + +CHECKREQS_DISK_BUILD="16G" # bug 417307 + +#PATCHES=( +# #"${FILESDIR}/${P}-bison-3.7.patch" # bug 736499 +# "${FILESDIR}/${P}-icu-68.patch" # bug 753260 +# "${FILESDIR}/${P}-python-3.9.patch" # bug 766303 +# "${FILESDIR}/${P}-glib-2.68.patch" # bug 777759 +#) + +_check_reqs() { + if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then + einfo "Checking for sufficient disk space to build ${PN} with debugging flags" + check-reqs_$1 + fi +} + +pkg_pretend() { + _check_reqs pkg_pretend +} + +pkg_setup() { + _check_reqs pkg_setup + python-any-r1_pkg_setup +} + +src_unpack() { + mkdir -p ${S} + cd ${S} + unpack ${P}.tar.xz +} + + +src_configure() { + # Respect CC, otherwise fails on prefix, bug #395875 + tc-export CC + + # Multiple rendering bugs on youtube, github, etc without this, bug #547224 + append-flags $(test-flags -fno-strict-aliasing) + + local mycmakeargs=( + -DPORT=Qt + -DENABLE_API_TESTS=OFF + -DENABLE_TOOLS=OFF + -DENABLE_GEOLOCATION=$(usex geolocation) + -DUSE_GSTREAMER=$(usex gstreamer) + -DUSE_LIBHYPHEN=$(usex hyphen) + -DENABLE_JIT=$(usex jit) + -DUSE_QT_MULTIMEDIA=$(usex multimedia) + -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin) + -DENABLE_OPENGL=$(usex opengl) + -DENABLE_PRINT_SUPPORT=$(usex printsupport) + -DENABLE_DEVICE_ORIENTATION=$(usex orientation) + -DENABLE_WEBKIT2=$(usex qml) + -DENABLE_X11_TARGET=$(usex X) + ) + + if has_version "virtual/rubygems[ruby_targets_ruby27]"; then + mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) ) + elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then + mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) + else + mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # bug 572056 + if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then + eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." + die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' + fi +} diff --git a/dev-util/xpipe/xpipe-1.7.16.ebuild b/dev-util/xpipe/xpipe-1.7.16.ebuild deleted file mode 100644 index dbac8849..00000000 --- a/dev-util/xpipe/xpipe-1.7.16.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop unpacker xdg - -DESCRIPTION="Your entire server infrastructure at your fingertips" -HOMEPAGE="https://xpipe.io/" -#SRC_URI="https://github.com/${PN}-io/${PN}/releases/download/${PV}/${PN}-installer-linux-x86_64.deb -> ${PN}-installer-linux-${PV}-x86_64.deb" -SRC_URI="https://github.com/${PN}-io/${PN}/releases/download/${PV}/${PN}-portable-linux-x86_64.tar.gz -> ${PN}-portable-linux-${PV}-x86_64.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="bindist mirror splitdebug test" -#IUSE="swiftshader system-ffmpeg" -IUSE="" - -QA_PREBUILT="*" - -RDEPEND=" -" - -S="${WORKDIR}" - -src_install() { - - mv xpipe-${PV} xpipe - dodir /opt - cp -a xpipe "${ED}"/opt || die - - dosym ../../opt/xpipe/cli/bin/xpipe usr/bin/xpipe - - dosym ../../opt/xpipe/cli/xpipe_completion etc/bash_completion.d/xpipe - - domenu ${FILESDIR}/${PN}.desktop - - doman xpipe/cli/man/* - -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/dev-util/xpipe/xpipe-16.5.ebuild b/dev-util/xpipe/xpipe-17.1.ebuild similarity index 100% rename from dev-util/xpipe/xpipe-16.5.ebuild rename to dev-util/xpipe/xpipe-17.1.ebuild diff --git a/dev-util/xpipe/xpipe-8.3.ebuild b/dev-util/xpipe/xpipe-8.3.ebuild deleted file mode 100644 index 29566fee..00000000 --- a/dev-util/xpipe/xpipe-8.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop unpacker xdg - -DESCRIPTION="Your entire server infrastructure at your fingertips" -HOMEPAGE="https://xpipe.io/" -#SRC_URI="https://github.com/${PN}-io/${PN}/releases/download/${PV}/${PN}-installer-linux-x86_64.deb -> ${PN}-installer-linux-${PV}-x86_64.deb" -SRC_URI="https://github.com/${PN}-io/${PN}/releases/download/${PV}/${PN}-portable-linux-x86_64.tar.gz -> ${PN}-portable-linux-${PV}-x86_64.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="bindist mirror splitdebug test" -#IUSE="swiftshader system-ffmpeg" -IUSE="" - -QA_PREBUILT="*" - -RDEPEND=" -" - -S="${WORKDIR}" - -src_install() { - - mv xpipe-${PV} xpipe - dodir /opt - cp -a xpipe "${ED}"/opt || die - - dosym ../../opt/xpipe/cli/bin/xpipe usr/bin/xpipe - - dosym ../../opt/xpipe/cli/xpipe_completion etc/bash_completion.d/xpipe - - domenu ${FILESDIR}/${PN}.desktop - doicon ${FILESDIR}/${PN}.png - - doman xpipe/cli/man/* - -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/net-im/teams-for-linux/teams-for-linux-2.0.17.ebuild b/net-im/teams-for-linux/teams-for-linux-2.2.1.ebuild similarity index 100% rename from net-im/teams-for-linux/teams-for-linux-2.0.17.ebuild rename to net-im/teams-for-linux/teams-for-linux-2.2.1.ebuild