From 91791fab8cf97a6b6b6ffb07cf8d3ba237c535fd Mon Sep 17 00:00:00 2001 From: dakkar Date: Sat, 11 Jan 2020 13:06:21 +0000 Subject: fix ancient webkit-gtk w/ newer ICU --- net-libs/webkit-gtk/Manifest | 3 +- .../webkit-gtk-random-compilation-failures.patch | 41 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 4 ++- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-random-compilation-failures.patch diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 557a5e5..bdfd0a6 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -11,5 +11,6 @@ AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 BLAKE2B 0ba241e782fb5ac415149e621f04f0db AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3d966d989ba24094fa98558ab23cb9a73df26666101ae78e41c408429eba5540f6803c564d4736a882bedba3cc7ab920c3c061 SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 BLAKE2B dd539bc80529b737d1fa613dcdbd2445e062234533df8f12c6b7ce2f4852e22f912e5199701863b8c1f947fd3dc0ce52c8c0c357af006eb6160f8ce8e3f8b52d SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc +AUX webkit-gtk-random-compilation-failures.patch 1620 BLAKE2B 6e8053fffcc56bb03760f759b73bd591d10f95c3ce4de1bb4f7779a7a1aa11a6236c18b38f61e064eb3b711cee5fd81b66513c07a475f2ff0806db19d112d410 SHA512 798b713f40251ebfe80ee366d0f1829a523575fc68955c199983458a120cc367a8a4ee42b1788ca84c559939a29284e644ddd07f375e9514d463052a1e6cd604 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb -EBUILD webkit-gtk-2.4.11-r200.ebuild 8483 BLAKE2B d3c61e04b823c11592537a107e3228bfb135a790cd62884988c9991185e7708263736d25a0b2c839970077708002c72f7fedca444aa335a51ccf555222fc415c SHA512 389f81b75985a584cb65e0ca2110727127601b1841cb660d6dcae14f282922f5813f9cce5de843d13d62d6c858c22e542f9de984ebb18dfcb289af33be194813 +EBUILD webkit-gtk-2.4.11-r200.ebuild 8546 BLAKE2B 32e2cd36e6348a6b12b670e40dce811a79f155a22e30c5e0b5a000874bd0e12c8cf263922fb269b76ac74544271c9b2d9ac7fc9d65748501f1e20574dbd1d103 SHA512 1b18cdc66f9b65a4000d5abd901f4f052bf321e47feb5cb56ee60c654cb661d5a3c546643a9adee102445397c01ab06c6103c78e4c1419d5c3dc834dc2705e80 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-random-compilation-failures.patch b/net-libs/webkit-gtk/files/webkit-gtk-random-compilation-failures.patch new file mode 100644 index 0000000..c552770 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-random-compilation-failures.patch @@ -0,0 +1,41 @@ +diff --git i/Source/WebCore/platform/graphics/SegmentedFontData.cpp w/Source/WebCore/platform/graphics/SegmentedFontData.cpp +index efb20a8..f0812e0 100644 +--- i/Source/WebCore/platform/graphics/SegmentedFontData.cpp ++++ w/Source/WebCore/platform/graphics/SegmentedFontData.cpp +@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) + { + UChar32 c; + for (int i = 0; i < length; ) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!containsCharacter(c)) + return false; + } +diff --git i/Source/WebCore/dom/Document.cpp w/Source/WebCore/dom/Document.cpp +index 1e677dc9..49fc03f0 100644 +--- i/Source/WebCore/dom/Document.cpp ++++ w/Source/WebCore/dom/Document.cpp +@@ -3912,12 +3912,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -3980,7 +3980,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S + const UChar* s = qualifiedName.deprecatedCharacters(); + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(s, i, length, c) ++ U16_NEXT(s, i, length, c); + if (c == ':') { + if (sawColon) { + ec = NAMESPACE_ERR; diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild index db194ed..153a093 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -163,6 +163,8 @@ src_prepare() { # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch + eapply "${FILESDIR}"/${PN}-random-compilation-failures.patch + AT_M4DIR=Source/autotools eautoreconf gnome2_src_prepare -- cgit v1.2.3