From f02872f51f3d7ebb9d922b0e60f71bd0d99fe1da Mon Sep 17 00:00:00 2001 From: dakkar Date: Thu, 8 Feb 2018 19:30:47 +0000 Subject: patch for newer ICU patches from https://bugs.gentoo.org/621532 --- net-libs/webkit-gtk/Manifest | 4 +++- .../files/webkit-gtk-2.4.11-JSStringRef-typedef.patch | 19 +++++++++++++++++++ .../files/webkit-gtk-2.4.11-WKString-typedef.patch | 19 +++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 5 ++++- 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.11-JSStringRef-typedef.patch create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch (limited to 'net-libs') diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index ffaa380..a90b93b 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -3,6 +3,8 @@ AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92 AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925 +AUX webkit-gtk-2.4.11-JSStringRef-typedef.patch 526 SHA256 ddc6cd5af30e1998e3289894be7d7fa4c48fa14d3d381bfdbadee6fc7932e9ba SHA512 cc06d3bfdd958e9e5304cbb77cefe94e22e60769cbf91441d55b12832650d065c712654760f79d38ce1ebf662788484c5bb553205da4997e5890d9c6961b5c04 WHIRLPOOL aba30621bf6b779b26dcf68575d457beb55dc0425377932e122318d553048ba48e0a61876eea09f3093ba9122aa534120d7114c145b6f558f18a948e35c4f5a2 +AUX webkit-gtk-2.4.11-WKString-typedef.patch 589 SHA256 45df335cee9653f92c15c8d29fecce38a86694de6c54c41a6546353ce68b936b SHA512 d33b9a5cc36b46d9027e798cb4fb0bc1a8cbdc18d89908f9694154723230f41c8205a1b0e0d899282a5b8846ee36073b6964a07c34ed0b44863d192abb9b366f WHIRLPOOL 199b5f1b13ba8dff5cac182f684568fdad6ef065d067b1fc669878f3817eb53c7f6e4d8fa0f785ab9760bb635105f7eb50dbb8fd6c34ff1539e93312fc5503ed AUX webkit-gtk-2.4.11-video-web-audio.patch 520 SHA256 103db2178fb3bc6db9706dc2874c1a68d748133082330a6f6cca909d26fa0dac SHA512 df7b54fed95d0132bbed22fa90f3523b94a70940ac33acefc46aa0c59b604ee36d3350035fe8bca78ba9a7ab45527d0c1afde8160e4d408eb8a7ee07048bd8d1 WHIRLPOOL af4cad5c7da3fca085e588dadf093ae3155351b81dbf2cfe8201c93515b4e23af08e62049f836dec960fe25297a786e379cd51c386ca9c605a8812cc9e5a6506 AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 SHA256 64fc5b9e019fb759cfcf2dc65d7bf0dfcd2cff6469049098d84e180bcf4fbfcc SHA512 80c5c158eba950e56e6a3c046cc3325efcdeab0ad1add140bae1b08a9620553e2166f5df7b0a586814cd49add430dfd15b6675f1467532f294120bdd8852d067 WHIRLPOOL 310ac0d0d04156f681e9039634c2f3ca02c358f70dec091f4c1c221653eef97dcea8c454ac64d3c3b326c47687c3b4e7d168d2fba6813b28ae6c450891849723 AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 SHA256 b442a8021ec5bfc751708fe6409baff6ae8576d7fb49da95245b6ba2c1557536 SHA512 8bfc1255f083b7d4cdbe5e03d7a006efae976988847f36c27758589a2410cf6b84e0c81a3c9673ec9b552e34af92e6d833a8db5413c03d0c85c3d82f4628c583 WHIRLPOOL 25e62e4c95b99bad82a45a82091c6ac7a7cbe02391b4873d383649413fa6eea236130a62aef7ba1f0a24f172554e9b6d650f7bfeb41abb96b8387ef85f807932 @@ -10,4 +12,4 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e62 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d7297acf378e715820202e48d4088e SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c WHIRLPOOL 1ebbeb9564978b3ddf4488c9fe72113da0ff10a0ba8c3bcd418b913a936ebe09da907e86714b7419f2746af1648ab786850559c4a5c6a0f1b51ed98e9aab0334 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 -EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 SHA256 fd9192efa1b99815a456576fb1c2546747b7d4ebe07bbba2a79df26db0aee254 SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca WHIRLPOOL 49a2b920b0fdc7b0bc4846279060ab842494ca04a6748617b54d3ee7ec6622225c6405097c797402bf208b495802588fb1e08ef659ce3393c762821b1745bbaa +EBUILD webkit-gtk-2.4.11-r200.ebuild 8493 SHA256 9db16caeb3f6e8992217ed18d37ec780dfd874bb2964b5dc5f8a034bd4936142 SHA512 a137d3e09a5b7ded0ef76bf432e5fce07d06b5e3531701640db2167734e305cc96e2f55ea8dfbbecce8fce6bc66248b18e690c531da37e77517fedebf10ffdba WHIRLPOOL 4dc72822909779afb8022bb8324406ee305d0f158aa721e967d616638206f1255ba28aa850402f4c08e83eaa27c8bf564261c75963895e90ecfb0f5c17937aaa diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-JSStringRef-typedef.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-JSStringRef-typedef.patch new file mode 100644 index 0000000..395c1d5 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-JSStringRef-typedef.patch @@ -0,0 +1,19 @@ +--- webkitgtk-2.4.11.orig/Source/JavaScriptCore/API/JSStringRef.h 2016-04-10 08:48:36.000000000 +0200 ++++ webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.h 2017-12-20 23:04:55.000000000 +0100 +@@ -27,6 +27,7 @@ + #define JSStringRef_h + + #include ++#include + + #ifndef __cplusplus + #include +@@ -43,7 +44,7 @@ + @typedef JSChar + @abstract A Unicode character. + */ +- typedef unsigned short JSChar; ++ typedef char16_t JSChar; + #else + typedef wchar_t JSChar; + #endif diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch new file mode 100644 index 0000000..d83ed6d --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch @@ -0,0 +1,19 @@ +--- webkitgtk-2.4.11.orig/Source/WebKit2/Shared/API/c/WKString.h 2016-04-10 08:48:37.000000000 +0200 ++++ webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.h 2017-12-20 22:14:19.097225121 +0100 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #ifndef __cplusplus + #include +@@ -39,7 +40,7 @@ + + #if !defined(WIN32) && !defined(_WIN32) \ + && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ +- typedef unsigned short WKChar; ++ typedef char16_t WKChar; + #else + typedef wchar_t WKChar; + #endif 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 1c3cf3c..769f4ff 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-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -157,6 +157,9 @@ src_prepare() { # https://bugs.webkit.org/show_bug.cgi?id=156510 eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch + eapply "${FILESDIR}"/${PN}-2.4.11-WKString-typedef.patch + eapply "${FILESDIR}"/${PN}-2.4.11-JSStringRef-typedef.patch + # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch -- cgit v1.2.3