From eb857d0c576747c92d2f96d16362cb2ec6db3822 Mon Sep 17 00:00:00 2001 From: layman Date: Sun, 24 Nov 2019 23:53:34 +0100 Subject: [PATCH] webkit-gtk gcc 9 compatibility --- net-libs/webkit-gtk/Manifest | 3 +- .../files/webkit-gtk-2.4.11-U16_NEXT.patch | 39 +++++++++++++++++++ .../webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 2 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.11-U16_NEXT.patch diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index b0d2ae2..77a9a94 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -4,6 +4,7 @@ AUX webkit-gtk-2.2.5-hppa-platform.patch 530 BLAKE2B 0326e813a0b732eafd569db4eb4 AUX webkit-gtk-2.2.5-ia64-platform.patch 331 BLAKE2B 6793b3cddfdfcdb859cd19b33968bd1da2c4bd9958fe69341f83476d5918cbde2dbbc0a2e191f887265e51ad0ab3ee290f2e2de2bf48752e4c8b9dacd245d5cf SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 BLAKE2B 240c2f978f2b2cba7fc1d5e2c3c597a462cf28d9dc7d31dcde1db4d64c7cc0a98558bb6bd2ce0f28cb07a74bc333ca01b1ec817674c18a71d1622a821c2a8681 SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 AUX webkit-gtk-2.4.11-JSStringRef-typedef.patch 526 BLAKE2B e517d4b52ea3440b901f83b2c040a60229ff1aa6d94e7537e95fd0c2274f56c8a89c95db1cf0e2d8bbce4bb7c887f75534a1957a2b230046237224c70b931db3 SHA512 cc06d3bfdd958e9e5304cbb77cefe94e22e60769cbf91441d55b12832650d065c712654760f79d38ce1ebf662788484c5bb553205da4997e5890d9c6961b5c04 +AUX webkit-gtk-2.4.11-U16_NEXT.patch 1605 BLAKE2B 99a684d560d427f319339e4c760f9ef2f64a4cc30f9aec6080ac63791428cb6ea592cf3c97321e49de97f0b0b9dc65c80799bf06d46e432e0ce90e3197436c99 SHA512 7d01836fbdb304912c07e2efd01766b71135e83ba9ddb6b978bf0f9c80a8ff1bd069f1716db22367bf730e659bd8936c775ff017170475137956b44fba440db8 AUX webkit-gtk-2.4.11-WKString-typedef.patch 589 BLAKE2B 552facb401b26fa769f402c8038e9b1903f1f041ffe7cba2c0f7196ecedd3719bd8e105ebb9af46007bbfcb834df94ccddabc81f1b0a44e025ffa450fc4b5315 SHA512 d33b9a5cc36b46d9027e798cb4fb0bc1a8cbdc18d89908f9694154723230f41c8205a1b0e0d899282a5b8846ee36073b6964a07c34ed0b44863d192abb9b366f AUX webkit-gtk-2.4.11-video-web-audio.patch 520 BLAKE2B f7af9601ad10920aea28f000b5457a5bea3d50ffe8cd873138fae1ffcd5ca191e3517452e748295ddb16ab6ac46d22074d9bf475aa69d2b1772ed44ecb427722 SHA512 df7b54fed95d0132bbed22fa90f3523b94a70940ac33acefc46aa0c59b604ee36d3350035fe8bca78ba9a7ab45527d0c1afde8160e4d408eb8a7ee07048bd8d1 AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 BLAKE2B 05d62a79aaa66eeae5d80d5aa25747fcf021c8416a1db8f60b46f7164d3e4648089af99fcc8062d3f543b2b9dd6819efa82a4d54c193cf15465cbaa4d23d2beb SHA512 80c5c158eba950e56e6a3c046cc3325efcdeab0ad1add140bae1b08a9620553e2166f5df7b0a586814cd49add430dfd15b6675f1467532f294120bdd8852d067 @@ -12,5 +13,5 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3 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 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb -EBUILD webkit-gtk-2.4.11-r200.ebuild 8534 BLAKE2B d3d290edb609a7215e8dc84196a965c6dc009b052a6e2fac59c1d3640e8f0f1423041918f0e2acbe06cb944fe6551b716f2525e1b08eceb84e59f75cc9b813e6 SHA512 6809919b3204a29def37607d1f32160758e28e1a90f908b2fc09a8eb07e0b1ac68764401ad3092cb1430604863c1385b9e966583321b2981b38ecfcaccb589d7 +EBUILD webkit-gtk-2.4.11-r200.ebuild 8577 BLAKE2B 0a0ef7e30a0cbb4d6aa02114fdbbd2809a78dd6b6af3e5e2f8459c92adf6d70ad5893f79a88f2c0fce6fd50793e2df83bc1ba4ac5b511a6ba8beeb0701fed0e6 SHA512 cb42e5584c8c8386f3f21a223a4cd402c79876de409fe0f945d86939180683c89ec99a99dc937aae4db523e8b9e96ced497f7f75299c24b96bf6af128be62748 MISC metadata.xml 771 BLAKE2B 219d1c257311262d452b02b19b387cca0fc17cdc675cb4c790277c2c4f2ae9863a6039738a9151a3d6912ca024bc1d2348f5ca786f50412295fa8455c90fc8b4 SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-U16_NEXT.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-U16_NEXT.patch new file mode 100644 index 0000000..b6e9d96 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-U16_NEXT.patch @@ -0,0 +1,39 @@ +diff -urN webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp +--- webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp 2016-04-10 08:48:37.000000000 +0200 ++++ webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp 2019-11-24 22:46:14.220007526 +0100 +@@ -3912,12 +3912,12 @@ + 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 @@ + 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 -urN webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp +--- webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2016-04-10 08:48:37.000000000 +0200 ++++ webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-11-24 22:45:54.017763168 +0100 +@@ -61,7 +61,7 @@ + { + 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 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 1cb40ed..c08c6d6 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 @@ -164,6 +164,8 @@ src_prepare() { # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch + eapply "${FILESDIR}"/${P}-U16_NEXT.patch + AT_M4DIR=Source/autotools eautoreconf gnome2_src_prepare