From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- dev-qt/qtwebengine/Manifest | 3 +- .../qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch | 170 +++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild | 3 +- 3 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 342cdb894374..157182746c92 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,10 +1,11 @@ AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680 AUX qtwebengine-5.15.1-icu-68.patch 11095 BLAKE2B e493a91a340a18a485eae80e65e74086ec708b72cc8aea4dcb9deebd3722128c7c5e68a9eef7c405912112d6fc29e187df9c8b9a95c5ab0827dc21beba072c1e SHA512 2f3ea6491575faa9af290392ddb5e03687819c424556def82c70a7a4b7bb2e4e099293aab347790035bcf40391789caaea4af7db9cf6733f64f26fdba51288e4 +AUX qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch 6264 BLAKE2B 18a5bc35ddf7fc120dde8adcb0bd3f450f2422695dec698ad65f133e51018bc0e84bbcf8e3c85c6003dca114a11083903e05ea7348316b4aa90d415f1fd539c1 SHA512 e505c98cb777fb353529810e59acb0976403924a18ad8336d0ff4cf76df024e54f354efbac35322f0cf135d38a7340bc26e9a709435bf0f96d21344d8fecaa99 AUX qtwebengine-5.15.2-icu-68.patch 15373 BLAKE2B 3b7ef4b096f8a593e711c74c64a0a770c0a2bd0fc3af0a2bc4b28fd9999358b06affce062ececf0b0c6f5092a4f6cb243ecc3decd00eb3f69292ad6393bf1bca SHA512 159c1553702b505a1e59ff18b3ac0340c7e0534a98b45ef2a70ab645d10bbb569c47bccb9d5a58d0f413b86abf29f9706af0ff5800029617a0575d6a759edbc3 DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc DIST qtwebengine-everywhere-src-5.15.1.tar.xz 278488056 BLAKE2B f369e435510644b36a7305a1a2b907f09f533f995c0c1a367a801cb9f277f66914f4511f20926ed4c865e9e5ec921c12d4406191706d263320a861250cebb3a0 SHA512 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4 DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756 EBUILD qtwebengine-5.15.1.ebuild 4699 BLAKE2B e9f480e98756f802987a7befeb2aafa0651416786586f6d6f4cf130e5bf02e3df894db02d599b86f5bd5aec55262632ec9873c59bd4e7977b441bec44c6a7ef0 SHA512 0ee21b4ca87663c14a7e1f3804c972a0374de3089df265235bad839bec234d476c102173bfb1889f2acf21d49407c5eb47e8fe3c15d7b7558a850490fc4261df -EBUILD qtwebengine-5.15.2.ebuild 5227 BLAKE2B 94cf7fe699a1fcc61b29379574318635e06ec86b15884addfd86e6a583432caa48b4a0695316e93201b0e4441249f9ec87f227595efe3546afbed817de5291fb SHA512 76afdc713f3835e0336fb79ffbbf9dd98f73ee11dfab9d0c219a835f864a0e40337fea49db307cf69d81ca20cc22ae5b2f0e4168582919de69abf69b0d07a627 +EBUILD qtwebengine-5.15.2.ebuild 5275 BLAKE2B 3c985d98f4d1738e965bc967c38fa0789212cf5cf7b744b883897eec2b64fdc965f566c53de3687326f66529db709e90176daec7cdc80ca5e8a9711833cde6f3 SHA512 63c970db218efa5693ed8fcd20103a553812803959db7eeaea931e67a08245d2425d766d2ab8d6d6c212493c9379344cd10edf719561827b6a6a2af9ffac7ed1 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch new file mode 100644 index 000000000000..7d6401759a78 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch @@ -0,0 +1,170 @@ +From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001 +From: Frank Tang +Date: Tue, 03 Nov 2020 23:20:37 -0800 +Subject: [PATCH] Update to ICU68-1 + +ICU68-1 change the output skeleton format. So we need to change +resolvedOptions code for 68 migration. + +Chromium roll +https://chromium-review.googlesource.com/c/chromium/src/+/2474093 + +Bug: v8:10945 +Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431 +Commit-Queue: Frank Tang +Reviewed-by: Jakob Kummerow +Reviewed-by: Shu-yu Guo +Cr-Commit-Position: refs/heads/master@{#70972} + +(ported to work with CurrencySignString(Isolate* isolate, + Handle UnitDisplayString(Isolate* isolate, + const icu::UnicodeString& skeleton) { + // Ex: skeleton as +- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name" ++ // =ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name" + if (skeleton.indexOf("unit-width-full-name") >= 0) { + return ReadOnlyRoots(isolate).long_string_handle(); + } + // Ex: skeleton as +- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow". ++ // =ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow". + if (skeleton.indexOf("unit-width-narrow") >= 0) { + return ReadOnlyRoots(isolate).narrow_string_handle(); + } + // Ex: skeleton as +- // "measure-unit/length-foot .### rounding-mode-half-up" ++ // =ICU-68.1: "unit/length-foot .### rounding-mode-half-up" + return ReadOnlyRoots(isolate).short_string_handle(); + } + +@@ -423,7 +426,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) { + return Notation::COMPACT; + } + // Ex: skeleton as +- // "measure-unit/length-foot .### rounding-mode-half-up" ++ // =ICU-68.1: "unit/length-foot .### rounding-mode-half-up" + return Notation::STANDARD; + } + +@@ -563,14 +567,23 @@ namespace { + + // Ex: percent .### rounding-mode-half-up + // Special case for "percent" +-// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .### +-// rounding-mode-half-up" should return "kilometer-per-unit". +-// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return +-// "year". ++// =ICU-68.1: ++// Ex: "unit/milliliter-per-acre .### rounding-mode-half-up" ++// should return "milliliter-per-acre". ++// Ex: "unit/year .### rounding-mode-half-up" should return ++// "year". + std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { + std::string str; + str = skeleton.toUTF8String(str); ++#if U_ICU_VERSION_MAJOR_NUM < 68 + std::string search("measure-unit/"); ++#else ++ std::string search("unit/"); ++#endif + size_t begin = str.find(search); + if (begin == str.npos) { + // Special case for "percent". +@@ -579,20 +592,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { + } + return ""; + } ++#if U_ICU_VERSION_MAJOR_NUM < 68 + // Skip the type (ex: "length"). + // "measure-unit/length-kilometer per-measure-unit/duration-hour" + // b + begin = str.find("-", begin + search.size()); ++#else ++ // Ex: ++ // "unit/acre .### rounding-mode-half-up" ++ // b ++ // Ex: ++ // "unit/milliliter-per-acre .### rounding-mode-half-up" ++ // b ++ begin += search.size(); ++#endif + if (begin == str.npos) { + return ""; + } ++#if U_ICU_VERSION_MAJOR_NUM < 68 + begin++; // Skip the '-'. ++#endif + // Find the end of the subtype. + size_t end = str.find(" ", begin); +- // "measure-unit/length-kilometer per-measure-unit/duration-hour" +- // b e ++ // =ICU-68.1: ++ // Ex: ++ // "unit/acre .### rounding-mode-half-up" ++ // b e ++ // Ex: ++ // "unit/milliliter-per-acre .### rounding-mode-half-up" ++ // b e + if (end == str.npos) { + end = str.size(); ++#if U_ICU_VERSION_MAJOR_NUM < 68 + return str.substr(begin, end - begin); + } + // "measure-unit/length-kilometer per-measure-unit/duration-hour" +@@ -626,18 +660,37 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { + // "measure-unit/length-kilometer per-measure-unit/duration-hour" + // [result ] b e + return result + "-per-" + str.substr(begin, end - begin); ++#else ++ } ++ return str.substr(begin, end - begin); ++#endif + } + + Style StyleFromSkeleton(const icu::UnicodeString& skeleton) { + if (skeleton.indexOf("currency/") >= 0) { + return Style::CURRENCY; + } ++#if U_ICU_VERSION_MAJOR_NUM < 68 + if (skeleton.indexOf("measure-unit/") >= 0) { ++#else ++ if (skeleton.indexOf("unit/") >= 0) { ++#endif + return Style::UNIT; + } ++#if U_ICU_VERSION_MAJOR_NUM < 68 + if (skeleton.indexOf("percent ") >= 0) { + return Style::PERCENT; + } ++#else ++ if (skeleton.indexOf("percent") >= 0) { ++ // percent precision-integer rounding-mode-half-up scale/100 ++ if (skeleton.indexOf("scale/100") >= 0) { ++ return Style::PERCENT; ++ } else { ++ return Style::UNIT; ++ } ++ } ++#endif + return Style::DECIMAL; + } + diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild index ae2669805a14..b0f613093dd3 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -84,6 +84,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 "${FILESDIR}/${P}-icu-68.patch" # bug 751997, QTBUG-88116 + "${FILESDIR}/${P}-icu-68-v8-runtime-fix.patch" ) src_prepare() { -- cgit v1.2.3