From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-qt/qtwebengine/Manifest | 15 +++ .../qtwebengine-5.7.0-fix-system-ffmpeg.patch | 13 ++ .../files/qtwebengine-5.7.0-icu58.patch | 51 ++++++++ .../files/qtwebengine-5.7.0-undef-madv_free.patch | 33 +++++ .../qtwebengine-5.7.1-fix-audio-detection.patch | 23 ++++ .../files/qtwebengine-5.7.1-gcc-7.patch | 144 +++++++++++++++++++++ .../qtwebengine-5.9.0-paxmark-mksnapshot.patch | 46 +++++++ .../files/qtwebengine-paxmark-mksnapshot.patch | 46 +++++++ dev-qt/qtwebengine/metadata.xml | 27 ++++ dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild | 105 +++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild | 122 +++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild | 114 ++++++++++++++++ 12 files changed, 739 insertions(+) create mode 100644 dev-qt/qtwebengine/Manifest create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch create mode 100644 dev-qt/qtwebengine/metadata.xml create mode 100644 dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild create mode 100644 dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild create mode 100644 dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest new file mode 100644 index 000000000000..0ba462f4704b --- /dev/null +++ b/dev-qt/qtwebengine/Manifest @@ -0,0 +1,15 @@ +AUX qtwebengine-5.7.0-fix-system-ffmpeg.patch 953 SHA256 046d2d09cb50a5b580a445edaf4545481e3575c30c1ba3197182f1e0f71e6478 SHA512 7fe43758f0f20ce1d4952d36773fede8def13c60dc4ac01186ef0d1b79055f02151a89e94c61b6dbe5e0a0560e53e3a27c2f40aaba181704b752b3618b3f3b9f WHIRLPOOL 64a566562652e4c7754a634de5ea4f4d64fe54033223157645d5efb64a0784a0e45c00785c4fa30f95adfeb9c830189f5796465b94ee834b04b11c3f871ad1e7 +AUX qtwebengine-5.7.0-icu58.patch 3126 SHA256 0e9eaae292efd47c76a05e0380ffe8cc2f353f1a55fc1bf180a5313a529ab8cb SHA512 573741564c85dfa8df1f8b89f075214067f4892d9cc4280d986709c4438823a82ab1eb752b39fdae4e0321a0ae30479fce2ecacb4d35f197bc3699ee24583d67 WHIRLPOOL 79b02ab132b3dd56f70b6d8cb828605abbd27d33862556d1c22196c2b34ce7a9b0ff31dcc5d48b28f75a74888d96327cb572fdaca92284dd89ec4e2c23bbf6e7 +AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 SHA256 2490dcbad1ec31a7eadf872ce0e63cbf9c12f8b9fa65f2f8b030274e283c0198 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e WHIRLPOOL 0c4404fd40e5fa3fdc55c11bac0f76843fb174b1048d24b0b934d0ecbe664ff7b04f03c09a1cb08df0a30622adcd515e837cbabee77c699eeecc87785f3ec354 +AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 SHA256 3cc298a3fdeecf4a339bad39ac9bc63201c02b87fceb32e4c06e3004a6197103 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c WHIRLPOOL 41dd2c3b574939d2a3b25f1758502cb473dd29f3046360c4ff38098246c959f95d6628ab832b318874d7cbe3a088ca119e2c03cd1dd04009fab75ec3bb1f51c0 +AUX qtwebengine-5.7.1-gcc-7.patch 5612 SHA256 2afa904ea3c349e4721073a4d8325a4be69ddbf39ae18a7d4456abe09920f36f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a WHIRLPOOL 015dadbcfad837710a674ebf0fd6014878f27206262c4c61fe9c054a830555e771d5e7414bc5486b1de6409bec23a4f8f4ad6b29dd4c9e8a3acfd4d6e1d3500e +AUX qtwebengine-5.9.0-paxmark-mksnapshot.patch 1299 SHA256 eb8f97551e71b3ce1d52ab30ec74165bbef70cdc523752a7e404a502ec7d61df SHA512 80fce43f244d5ac7519eb27415bc9bbee9012cd1416abaed815e835d3057f64b0d766f8d7c0e4d58ec2ceab04fc3090223eb9a461e64235a6113bef31dd7d47b WHIRLPOOL f96ade2775582920ea6bc42aa2d193975423990c7af01df60b10889f44dbddecd61355ca2cf4c76a342661019046f826441b7055e20741c0ac9760ff3c9ea096 +AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb +DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e +DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104 +DIST qtwebengine-opensource-src-5.9.2.tar.xz 217353592 SHA256 cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108 SHA512 9139533b8b384519cb49a909ed678344c94cdeeed40048d0cf8482506defaea0ea8f06396576fae9f51e4b073a04ee63d1b1b42b8cd82a6d4592bc0db983c715 WHIRLPOOL 5435e594dc304305b8ca2b9b61a06b0477d8539df818a5fc1faefd1b6a95f11cf385391c6e3ea8e41d8e75149d1bc5b37f7ca49f14203fe2213a4f0de55a547b +EBUILD qtwebengine-5.6.2-r1.ebuild 2392 SHA256 a4dd285337fa54f85cc356b082406704264c9eb3587fbd7c3f1bd69d87705d3f SHA512 ba9f4eeec343eeb8df9d62b17e122d9f7b6f93802fbedbfbcc75297091e20a4bcd9f7b7579be98e1401d0b52f36090772bca5bb7f821e3864f5d65995b6c0c33 WHIRLPOOL b099b92df0d4a9812d95c9b5df66ca86bf4213891880d760fff502a833b745e59a4b1ed831366aeecad12f40e71914353982dbf458236f31048d66eb61b3daf8 +EBUILD qtwebengine-5.7.1-r2.ebuild 3106 SHA256 684a1ed6a02c0806e33c26a4b502903e47ca926084c6595c43aa5d19f4fbc524 SHA512 40e425233d99bf82a0595d4248597177516f4fccc7dcba1a607e4940c828b5e35de7c3b1a5ebc700d1d05e436ff885f445b1428dd6bc9f7d9395b088ada04b20 WHIRLPOOL 0e52df6f55e837f11fdf648399e632971754f2069855387a6aa9be3f42925d001555783a18c0b11b71075f1e9b0da1779c8d6f84aba8758b7a7153346e3da596 +EBUILD qtwebengine-5.9.2.ebuild 2942 SHA256 4dca83c2dec3a5495608c6df3b302a3ab2d4d3f072a04e7f51354bc189372d01 SHA512 e7878f3b7eba7afe6a2e77438f0b515b71d1e75b9a9a3e76643f91619fa65c246de14b95c6e9c74cbbafeba26b30696b250404f881275d896b23a8cd25a1a814 WHIRLPOOL bfa238a1006c2d847bd64eef6c8ad69711b3bbd4ac0443daaaca8871c4f99d68ce16150d2dc29817257c6e9a12355856238b4e3f1dd1f9d900b1ba81e0547bd4 +MISC ChangeLog 4551 SHA256 7c2f13dee42848bb8c70d31a5dae4ddef55addec4275fe5450242b9a78328bc2 SHA512 68d4182db4787200eb078de86bc25efa3fe42f9712a43a46a979667df5d3fa20f504510beb2a345d0e7a5dd50bcb6b604782c7a02827f4ec6b976069e193cdc2 WHIRLPOOL 5e23101939b342511733a3bbfe5ff5dcdea9e189a05d7ad5f8166df26dd010a852a09578cfc1e6974092853a4d49e9884d8af89cc709d84c774e8567aa66254f +MISC metadata.xml 948 SHA256 4890ca8aaf167f11623fa965dfc11f031ea777a16ce92282caa9e83a2c2f1fa4 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85 WHIRLPOOL 73f94a6f3ffc150b65a7fd3f68aaf82a536e25eeb3fde1be7f28fe601fea6674fe9b394bcd2136897fcb9cdca265280d4d085b86387714c7bd9daabde3f21e19 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch new file mode 100644 index 000000000000..71881e0f77c2 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch @@ -0,0 +1,13 @@ +diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h +--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:01:20.929772871 -0800 ++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:02:18.879462854 -0800 +@@ -24,7 +24,9 @@ + // Disable deprecated features which result in spammy compile warnings. This + // list of defines must mirror those in the 'defines' section of BUILD.gn file & + // ffmpeg.gyp file or the headers below will generate different structures! ++#if !defined(USE_SYSTEM_FFMPEG) + #define FF_API_CONVERGENCE_DURATION 0 ++#endif + // Upstream libavcodec/utils.c still uses the deprecated + // av_dup_packet(), causing deprecation warnings. + // The normal fix for such things is to disable the feature as below, diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch new file mode 100644 index 000000000000..ced5367c4826 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch @@ -0,0 +1,51 @@ +diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp +--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:07:38.680665385 -0800 ++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:12:17.564001354 -0800 +@@ -26,6 +26,9 @@ + #include "wtf/StdLibExtras.h" + #include "wtf/text/CharacterNames.h" + ++#include ++#include ++ + namespace blink { + + unsigned numGraphemeClusters(const String& string) +@@ -122,13 +125,18 @@ + { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL + }; + ++#if U_ICU_VERSION_MAJOR_NUM >= 58 ++#define BA_LB_COUNT (U_LB_COUNT - 3) ++#else ++#define BA_LB_COUNT U_LB_COUNT ++#endif + // Line breaking table for CSS word-break: break-all. This table differs from + // asciiLineBreakTable in: + // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking + // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties + // - 1 indicates additional break opportunities. 0 indicates to fallback to + // normal line break, not "prohibit break." +-static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { ++static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { + // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI + { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX + { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI +@@ -178,7 +186,7 @@ + #undef AL + + static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent"); +-static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); ++static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); + + static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) + { +@@ -209,7 +217,7 @@ + + static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak) + { +- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) { ++ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) { + const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; + return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); + } diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch new file mode 100644 index 000000000000..193e71362065 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch @@ -0,0 +1,33 @@ +From fa8cdb3a32c377b6290d0a92d2522186bcd48293 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 9 Aug 2016 16:21:29 +0200 +Subject: Do not depend on Linux 4.5 + +Avoid using MADV_FREE that was only recently added to Linux. It will fail when +run on older Linux kernels. + +Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0 +Reviewed-by: Peter Varga +--- + chromium/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp +index 12c9a7b..1639013 100644 +--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp ++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp +@@ -39,6 +39,11 @@ + + #include + ++#if OS(LINUX) && defined(MADV_FREE) ++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime ++#undef MADV_FREE ++#endif ++ + #ifndef MADV_FREE + #define MADV_FREE MADV_DONTNEED + #endif +-- +cgit v1.0-4-g1e03 + diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch new file mode 100644 index 000000000000..597554e685cd --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch @@ -0,0 +1,23 @@ +# dev-qt/qtwebengine: Fix detecting audio backends. + +# The upstream change doesn't really work for us, so we'll make +# it work with us. +# Gentoo-Bug: https://bugs.gentoo.org/603498 + +--- /src/core/config/linux.pri 2016-12-23 00:05:41.057955774 +0200 ++++ /src/core/config/linux.pri 2016-12-23 00:09:39.000573909 +0200 +@@ -35,12 +35,12 @@ + contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 + contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 + contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 +-contains(QT_CONFIG, pulseaudio) { ++use?(pulseaudio) { + GYP_CONFIG += use_pulseaudio=1 + } else { + GYP_CONFIG += use_pulseaudio=0 + } +-contains(QT_CONFIG, alsa) { ++use?(alsa) { + GYP_CONFIG += use_alsa=1 + } else { + GYP_CONFIG += use_alsa=0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch new file mode 100644 index 000000000000..a5c3072a4777 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch @@ -0,0 +1,144 @@ +From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Wed, 29 Mar 2017 17:42:18 +0200 +Subject: [PATCH] Fix build with GCC 7.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but +earlier compilers did. + +Task-number:QTBUG-59776 +Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3 +Reviewed-by: Michael Brüning +--- + .../mojo/public/cpp/bindings/interface_ptr_info.h | 2 +- + .../third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ + chromium/v8/src/objects-body-descriptors.h | 2 +- + chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++ + chromium/v8/src/objects.h | 16 ++-------------- + 5 files changed, 25 insertions(+), 16 deletions(-) + +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h +index 5bd29d5..c94a5ac 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h +@@ -34,7 +34,7 @@ class InterfacePtrInfo { + + InterfacePtrInfo& operator=(InterfacePtrInfo&& other) { + if (this != &other) { +- handle_ = other.handle_.Pass(); ++ handle_ = std::move(other.handle_); + version_ = other.version_; + other.version_ = 0u; + } +-- +2.7.4 +From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Wed, 29 Mar 2017 15:53:00 +0200 +Subject: [PATCH 1/1] Fix build with GCC 7.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Fixes a few problems with using undeclared functions and ambigious +code. + +Task-number: QTBUG-59776 +Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c +Reviewed-by: Michael Brüning +--- + chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ + .../third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 ++++---- + chromium/v8/src/objects-body-descriptors.h | 2 +- + chromium/v8/src/objects-inl.h | 18 ++++++++++++++++++ + chromium/v8/src/objects.h | 16 ++-------------- + 5 files changed, 27 insertions(+), 19 deletions(-) + +diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +index e85c72f..6f94cd6 100644 +--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h ++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +@@ -542,6 +542,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(LinkedHas + return *this; + } + ++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); ++ + template + inline void LinkedHashSet::swap(LinkedHashSet& other) + { +diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h +index 91cb888..a1c3634 100644 +--- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h ++++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h +@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { + + template + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody(obj); + } + }; + +diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h +index 58441d3..4c486ea 100644 +--- a/src/3rdparty/chromium/v8/src/objects-inl.h ++++ b/src/3rdparty/chromium/v8/src/objects-inl.h +@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) { + } + + ++template ++inline uint32_t HashTable::Hash(Key key) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHash(key, GetHeap()->HashSeed()); ++ } else { ++ return Shape::Hash(key); ++ } ++} ++ ++template ++inline uint32_t HashTable::HashForObject(Key key, Object* object) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); ++ } else { ++ return Shape::HashForObject(key, object); ++ } ++} ++ + bool ObjectHashTableShape::IsMatch(Handle key, Object* other) { + return key->SameValue(other); + } +diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h +index 7d774be..42da5fa 100644 +--- a/src/3rdparty/chromium/v8/src/objects.h ++++ b/src/3rdparty/chromium/v8/src/objects.h +@@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase { + typedef Shape ShapeT; + + // Wrapper methods +- inline uint32_t Hash(Key key) { +- if (Shape::UsesSeed) { +- return Shape::SeededHash(key, GetHeap()->HashSeed()); +- } else { +- return Shape::Hash(key); +- } +- } ++ inline uint32_t Hash(Key key); + +- inline uint32_t HashForObject(Key key, Object* object) { +- if (Shape::UsesSeed) { +- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); +- } else { +- return Shape::HashForObject(key, object); +- } +- } ++ inline uint32_t HashForObject(Key key, Object* object); + + // Returns a new HashTable object. + MUST_USE_RESULT static Handle New( +-- +2.7.4 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch new file mode 100644 index 000000000000..5eb8ce12cff3 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch @@ -0,0 +1,46 @@ +--- a/src/3rdparty/chromium/v8/src/v8.gyp ++++ b/src/3rdparty/chromium/v8/src/v8.gyp +@@ -36,6 +36,7 @@ + 'v8_experimental_extra_library_files%': [], + 'v8_enable_inspector%': 0, + 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)', + 'v8_os_page_size%': 0, + }, +@@ -2432,7 +2433,7 @@ + ] + }, + { +- 'target_name': 'mksnapshot', ++ 'target_name': 'mksnapshot_u', + 'type': 'executable', + 'dependencies': [ + 'v8_base', +@@ -2485,5 +2486,26 @@ + }], + ], + }, ++ { ++ 'target_name': 'mksnapshot', ++ 'type': 'executable', ++ 'dependencies': ['mksnapshot_u'], ++ 'actions': [ ++ { ++ 'action_name': 'paxmark_m_mksnapshot', ++ 'inputs': [ ++ '<(mksnapshot_u_exec)', ++ ], ++ 'outputs': [ ++ '<(mksnapshot_exec)', ++ ], ++ 'action': [ ++ 'sh', ++ '-c', ++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)', ++ ], ++ }, ++ ], ++ }, + ], + } diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch new file mode 100644 index 000000000000..c71cedc223eb --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch @@ -0,0 +1,46 @@ +--- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100 ++++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000 +@@ -33,6 +33,7 @@ + 'embed_script%': "", + 'v8_extra_library_files%': [], + 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'remove_v8base_debug_symbols%': 0, + }, + 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'], +@@ -1913,7 +1914,7 @@ + ] + }, + { +- 'target_name': 'mksnapshot', ++ 'target_name': 'mksnapshot_u', + 'type': 'executable', + 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'], + 'include_dirs+': [ +@@ -1936,5 +1937,26 @@ + }], + ], + }, ++ { ++ 'target_name': 'mksnapshot', ++ 'type': 'executable', ++ 'dependencies': ['mksnapshot_u'], ++ 'actions': [ ++ { ++ 'action_name': 'paxmark_m_mksnapshot', ++ 'inputs': [ ++ '<(mksnapshot_u_exec)', ++ ], ++ 'outputs': [ ++ '<(mksnapshot_exec)', ++ ], ++ 'action': [ ++ 'sh', ++ '-c', ++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)', ++ ], ++ }, ++ ], ++ }, + ], + } diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml new file mode 100644 index 000000000000..d93362dc7bc2 --- /dev/null +++ b/dev-qt/qtwebengine/metadata.xml @@ -0,0 +1,27 @@ + + + + + qt@gentoo.org + Gentoo Qt Project + + + Enable physical position determination + via dev-qt/qtpositioning + Enable building under a PaX enabled kernel + Use the system-wide media-video/ffmpeg + instead of bundled. + Use the system-wide dev-libs/icu + instead of bundled. + Enable QtWidgets support + + + https://bugreports.qt.io/ + https://doc.qt.io/ + + + + Must only be used by packages that are known to use private parts of the Qt API. + + + diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild new file mode 100644 index 000000000000..c2d123d0085a --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit pax-utils python-any-r1 qt5-build + +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 x86" +fi + +IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" + +RDEPEND=" + app-arch/snappy:= + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtwebchannel-${PV}[qml] + dev-libs/expat + dev-libs/jsoncpp:= + dev-libs/libevent:= + dev-libs/libxml2 + dev-libs/libxslt + media-libs/alsa-lib + media-libs/flac + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/libpng:0= + >=media-libs/libvpx-1.5:=[svc] + media-libs/libwebp:= + media-libs/mesa + media-libs/opus + media-libs/speex + net-libs/libsrtp:0= + sys-apps/dbus + sys-apps/pciutils + sys-libs/libcap + sys-libs/zlib[minizip] + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + geolocation? ( ~dev-qt/qtpositioning-${PV} ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( dev-libs/icu:= ) + widgets? ( ~dev-qt/qtwidgets-${PV} ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/gperf + dev-util/ninja + dev-util/re2c + sys-devel/bison + pax_kernel? ( sys-apps/elfix ) +" + +src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) + + if use system-icu; then + # ensure build against system headers - bug #601264 + rm -r src/3rdparty/chromium/third_party/icu/source || die + fi + + qt_use_disable_mod geolocation positioning \ + src/core/core_common.pri \ + src/core/core_gyp_generator.pro + + qt_use_disable_mod widgets widgets src/src.pro + + qt5-build_src_prepare +} + +src_configure() { + export NINJA_PATH=/usr/bin/ninja + + local myqmakeargs=( + $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') + $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') + $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild new file mode 100644 index 000000000000..78b06c03f6ec --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit multiprocessing pax-utils python-any-r1 qt5-build + +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 ~arm ~arm64 x86" +fi + +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" + +RDEPEND=" + app-arch/snappy:= + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtwebchannel-${PV}[qml] + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/protobuf:= + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/libpng:0= + >=media-libs/libvpx-1.5:=[svc] + media-libs/libwebp:= + media-libs/mesa + media-libs/opus + net-libs/libsrtp:0= + sys-apps/dbus + sys-apps/pciutils + sys-libs/libcap + sys-libs/zlib[minizip] + virtual/jpeg:0 + virtual/libudev + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( dev-libs/icu:= ) + widgets? ( ~dev-qt/qtwidgets-${PV} ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/gperf + dev-util/ninja + dev-util/re2c + sys-devel/bison + pax_kernel? ( sys-apps/elfix ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch" + "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch" + "${FILESDIR}/${PN}-5.7.0-icu58.patch" + "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch" + "${FILESDIR}/${PN}-5.7.1-gcc-7.patch" +) + +src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) + + if use system-icu; then + # ensure build against system headers - bug #601264 + rm -r src/3rdparty/chromium/third_party/icu/source || die + fi + + qt_use_disable_mod geolocation positioning \ + src/core/core_common.pri \ + src/core/core_gyp_generator.pro + + qt_use_disable_mod widgets widgets src/src.pro + + qt5-build_src_prepare +} + +src_configure() { + export NINJA_PATH=/usr/bin/ninja + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + + local myqmakeargs=( + $(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '') + $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') + $(usex pulseaudio 'WEBENGINE_CONFIG+=use_pulseaudio' '') + $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') + $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # bug 601472 + if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + fi + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild new file mode 100644 index 000000000000..52d738f401f9 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit multiprocessing pax-utils python-any-r1 qt5-build + +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" + +RDEPEND=" + app-arch/snappy:= + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtwebchannel-${PV}[qml] + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/protobuf:= + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/libpng:0= + >=media-libs/libvpx-1.5:=[svc] + media-libs/libwebp:= + media-libs/mesa + media-libs/opus + net-libs/libsrtp:0= + sys-apps/dbus + sys-apps/pciutils + sys-libs/libcap + sys-libs/zlib[minizip] + virtual/jpeg:0 + virtual/libudev + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( dev-libs/icu:= ) + widgets? ( ~dev-qt/qtwidgets-${PV} ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/gperf + dev-util/ninja + dev-util/re2c + sys-devel/bison + pax_kernel? ( sys-apps/elfix ) +" + +src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) + + # bug 620444 - ensure local headers are used + find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die + + qt_use_disable_config alsa alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri + + qt_use_disable_mod geolocation positioning \ + mkspecs/features/configure.prf \ + src/core/core_chromium.pri \ + src/core/core_common.pri + + qt_use_disable_mod widgets widgets src/src.pro + + qt5-build_src_prepare +} + +src_configure() { + export NINJA_PATH=/usr/bin/ninja + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + + local myqmakeargs=( + $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') + $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') + $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # bug 601472 + if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + fi + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} -- cgit v1.2.3