commit: ca2bacfa4ce2b28b10decef259e5be5512dc7567 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Wed Dec 14 21:19:20 2016 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Wed Dec 14 21:19:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ca2bacfa
dev-qt/qtwebengine: Version bump to 5.7.1 Sync with tree. dev-qt/qtwebengine/Manifest | 8 +- .../qtwebengine/files/qtwebengine-5.7.0-gcc6.patch | 106 --------------------- .../files/qtwebengine-5.7.0-undef-madv_free.patch | 33 ------- dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 2 +- ...ngine-5.7.0.ebuild => qtwebengine-5.7.1.ebuild} | 7 +- 5 files changed, 7 insertions(+), 149 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 61054c1..4a3f03f 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -7,18 +7,16 @@ AUX qtwebengine-5.6.0-musl-siginfo.patch 666 SHA256 42c3119595738e1e4757bee83d97 AUX qtwebengine-5.6.0-musl-stack.patch 1469 SHA256 b2a66152c5f2c72aed97bd0358ee888d410a17c6048cfebc3a6867294e94c291 SHA512 50fd27962fdd2193b45ec334462535008d565a681bd6171d9c8e986e246ec42025e54eecdd8b8cbdaa118d4f6b0d88b73ad6add7c4d59cffc55899264c5b1bfd WHIRLPOOL 604f319f5229f02271e3f12166f5c50d8c2c25d78aebb93917ab333ce15adeded4cbd061afc0af0c1ea9c8bdf3411400c37a15827a31d29420f1787cfe49b97d AUX qtwebengine-5.6.0-musl-sysctl.patch 692 SHA256 a66b527eb717a5ad662c8c088540341a206c3c208c7f2fe5a20b71a17f7aacd4 SHA512 22b2380fdb1bec46c8f38d98d55c7fb72dca85859c6ae822f4b7aa441ea996dee12e11653c6f156575a1779437690d64b6101052ef12716e2dfbe046d0962b9a WHIRLPOOL d63e725ed25ffd8a219d97d1790ecf8bf44417c224ace98a5af743b84314914f50e8208fa5358fe31818fe865b01cb55e8841d879438a29bed30ff099b6e0e90 AUX qtwebengine-5.7.0-fix-system-ffmpeg.patch 953 SHA256 046d2d09cb50a5b580a445edaf4545481e3575c30c1ba3197182f1e0f71e6478 SHA512 7fe43758f0f20ce1d4952d36773fede8def13c60dc4ac01186ef0d1b79055f02151a89e94c61b6dbe5e0a0560e53e3a27c2f40aaba181704b752b3618b3f3b9f WHIRLPOOL 64a566562652e4c7754a634de5ea4f4d64fe54033223157645d5efb64a0784a0e45c00785c4fa30f95adfeb9c830189f5796465b94ee834b04b11c3f871ad1e7 -AUX qtwebengine-5.7.0-gcc6.patch 3967 SHA256 1f97985725bc1dd46602045c83c4ba67f593ac2a1fda1db8d8e8848baaf26608 SHA512 badeeb698ba2b5a9d02c4f0812d4d4557f1549e25b8eba321553c208e36054407f75450ca335884a7ee544e02847914b0d743b0a7687af1d5aa00fd29890ecfc WHIRLPOOL 385c917ad1c11e5b84f06320898b85f4078f95b8e254c3c67e9820756b232fca65675338307a3ee9d81d6acb1f52c4f4fafca5f09ce3cd914ace9b5173e160ca AUX qtwebengine-5.7.0-icu58.patch 3126 SHA256 0e9eaae292efd47c76a05e0380ffe8cc2f353f1a55fc1bf180a5313a529ab8cb SHA512 573741564c85dfa8df1f8b89f075214067f4892d9cc4280d986709c4438823a82ab1eb752b39fdae4e0321a0ae30479fce2ecacb4d35f197bc3699ee24583d67 WHIRLPOOL 79b02ab132b3dd56f70b6d8cb828605abbd27d33862556d1c22196c2b34ce7a9b0ff31dcc5d48b28f75a74888d96327cb572fdaca92284dd89ec4e2c23bbf6e7 AUX qtwebengine-5.7.0-musl-mallinfo.patch 1522 SHA256 aa151b81bc4b744b9b8d9fae7fe1b1efcec60946c33d0608f297171b30d5bfea SHA512 ccf2a354a4d521385bf9edb73cc48ada146de2790b9c54d244a4498aeeb80965f230cfa698867630197f791021ff04407aaaffd3e06e40efebf54750a7e90afc WHIRLPOOL 53711f00cda7d09a9913ec07181a3378e27748a92175af1ed5e46a6b45566802f69412a07fb032198159c290b98ae084c088bd854d655ee985942baf1dc7c8a1 AUX qtwebengine-5.7.0-musl-pthread-setname.patch 1173 SHA256 a18740a277fd9379ee57da1af203248efb23c429173d6ffad486da699fcbfc8c SHA512 da3baa6981b8897cf7dd30dc8d8889d2e3d23dc85bf4c27f9ea43c978be74ea380dba1362a3e131d810bd120013c8c6652cba0c5a56537b4a5aa89f7bec2479c WHIRLPOOL 21fbb93fef680b4c8610fb2de843f51274dc198714e12102f706db6f98e3cfb9f760001bf06a1bafa0fe3441849dce1b39553fbc85d6767be4a4c2ff496242a0 AUX qtwebengine-5.7.0-musl-resolver.patch 2568 SHA256 07a3ee87d509e8dc963b8d60c5168a8dd615be7488c5aa23c1f993922ff38b96 SHA512 8913b0daf060f9f3ed7fb3e69f3108992d078394e9a3e1a02f0d7668bcbb8cb7f8df715b7b3463f2ac35765a2fafe2ae8407669ecdf84405b9a3cc90bf845891 WHIRLPOOL df4ed38e8dfe407c430ce58a2006192345b35952be209ef51fb6661070ba96f86a9b60c180ac7374beb4780546c230b2d7dbbb59cc054c2d34fb0d33f9d8b42a AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e75c95702314f1ae42bfd3068a92ba1575ac01 SHA512 80a3c5eddf29cdf9beac3cd4e0c3d450ab32d85dbe794d2055d0abe0e1242db0fc69a44df7cf250d3ecf9a93a7e1d15d460a1d2409e65ceae1ac5c189f055918 WHIRLPOOL 6d4e1b055ce739e5b9f7d0235a7b628a52aebe03014e8f09e83968b2d1ddbb614ee00e4f8ffa792c6305822e759bd24265f1b63c5fae78834da6c1dcbb123305 -AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 SHA256 2490dcbad1ec31a7eadf872ce0e63cbf9c12f8b9fa65f2f8b030274e283c0198 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e WHIRLPOOL 0c4404fd40e5fa3fdc55c11bac0f76843fb174b1048d24b0b934d0ecbe664ff7b04f03c09a1cb08df0a30622adcd515e837cbabee77c699eeecc87785f3ec354 AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256 c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512 4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f WHIRLPOOL dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667 DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e -DIST qtwebengine-opensource-src-5.7.0.tar.xz 165709640 SHA256 985762fff5cd8a1a0d2a644a4a51238676898685f9ff1a78c3f2800025d6dc5d SHA512 8f010ea8d7047880c0bc941749a4172deae0f363ff25e00412291ad2bb243ac4c51031403eae0bba11b4f42c3e3d414858d29e3a3fb0459703dcaaff9b7133cd WHIRLPOOL 112f80f8cc279d743641095f47512a95d43286c1fe32c678a5ada810a7da12b1ef6e4483401e1a08c32d7e0d6e23369c65fbaeeee5f9a4bc34e330f59359e648 +DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104 EBUILD qtwebengine-5.6.1.ebuild 2399 SHA256 cf87e113dd9b731ab1a2c7ab6e2b94bf54a041d0d890725a7c48c0073447442c SHA512 f31ea3257a6153bfbd9a3ab9ed2ad7b4703ab7c76305be6b41451123b02537aaab07ca13967c586cbb76e1c9f989c03ec50c774443be8a6acd6d0ac37ea6fa32 WHIRLPOOL 14f86450d5c323d12592876bd9e7fc9c8cdfced1473415c41e17e15c89a3ed43818aa9db9ec49486bfbfb600c8ab03bf4a7333445a359b124ece4fcd6146f1a5 -EBUILD qtwebengine-5.6.2.ebuild 2779 SHA256 882e1a4a73498fd8512292950cb54b21d4dcb7b4b93db33be1152cd8c19e40d9 SHA512 0afbd02907494f78821208c361e9f47d1bdbc23e67d53a3ab6b1ee93aac2d50bcb0cea5e334c0f9f31e8cdb274995273666d795924f1a18dd889104588435642 WHIRLPOOL 38658acff380c65b30e2d5127a25eb73e012618196e6e95418bd5178544a1f6d29024a83f7d7339e57345d854960351d65d1776bf7981236075b0204aa491a8f -EBUILD qtwebengine-5.7.0.ebuild 3022 SHA256 31c40dfe70ba0fe129b87e999270c825c50a2edd5ee5c86fadf3c4085e88f816 SHA512 4dcf2d5e2629b9a3d94e6e4a58736bd722e6c0be91795ec2950bd9e7cd15247671afc1c4656a17e857840907305a0da9ae762dfb8c3797ed2714301494f8ffc5 WHIRLPOOL 51015b24cb6a5a712f65f1a5f302464726109e53d1fbd5f040ee05bd73621b695d69350acaa62499958c038fc3f2109e90069fdd8f58e006f995f66a5fba7b4a +EBUILD qtwebengine-5.6.2.ebuild 2777 SHA256 07361fec84110219e75705e7ff956c3af2b00d2c8497a5abe1bb3b120d39b713 SHA512 b05bc93a46830581ce6b4ad7a37186211ba60fd1a54419fadab1918ebd4e988cc0caf68f2bd48f4fc3d6967a9665663453e644ee3d7e8cfff7f4ccc6063ac482 WHIRLPOOL 0664cab57e74c79688899c91e8d682161199ae74c266b17f3ecc94df56e6954ae45808c773259c9e1d9feaa4858627c3c8a0827fbcea8627ffab0538d1c66c68 +EBUILD qtwebengine-5.7.1.ebuild 2960 SHA256 8ac92f83542209773a821f696bfaf2f60406d5c300d7f2b58124902e02472bac SHA512 dc42e272f3db72c1e2b8db228cf00c5d83c3ff4f2d5e9e4296f1ad5551a499bdc1ec672815ff1f03ac02e575babe7d1d45f8db8d82f13eafff96efb87e5b2d50 WHIRLPOOL 923a4a68cc95b6c11ea3bf3dd74d47cc6a08980a999acd98d08320028b743f63145d80edd6f2906c878b5a65c521a42ab4b7caf40d006a522ce76812989f9cb2 MISC metadata.xml 947 SHA256 15083351c49bbcf033829248688471002ca7990644535e1228c5f29396839026 SHA512 a53fa56d2922b8abb2b10193ebc3cb61923697d9c1ddbb583f0d06886dc357604c192cbbbc2849a976be189a41473069b1931434d057b9c9d5b91c7333680224 WHIRLPOOL 7db472885a977071531059312cb171ceffe119900e68bf20a6de6aca9d90336b21067a47e71e80e2d79fc54193b0aa276d74e96b98d3001e58be3c7d0840f8a8 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch deleted file mode 100644 index 2cc53e6..0000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch +++ /dev/null @@ -1,106 +0,0 @@ -From cffcf22082879939bbcfa89e88057beda829a0a7 Mon Sep 17 00:00:00 2001 -From: David Faure <[email protected]> -Date: Sat, 3 Sep 2016 18:01:40 +0200 -Subject: gcc6: set -fno-delete-null-pointer-checks for all files - -Not just v8, as v8_no_delete_null_pointer_checks does. -This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer -which also compares this with null. - -I'll remove v8_no_delete_null_pointer_checks in a later commit -to avoid a temporary breakage until qtwebengine is updated. - -Change-Id: I8782fadc8fab125b5394bd60857e70c6ae75f9b0 -Reviewed-by: Allan Sandfeld Jensen <[email protected]> -(cherry picked from commit c42f53ec3ca90bfd98577988462ed51464feebe3) ---- - chromium/build/common.gypi | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi -index b6a0284..d768ab3 100644 ---- a/src/3rdparty/chromium/build/common.gypi -+++ b/src/3rdparty/chromium/build/common.gypi -@@ -4702,6 +4706,9 @@ - '-Wl,--disable-new-dtags', - ], - }], -+ [ 'no_delete_null_pointer_checks==1', { -+ 'cflags_cc': [ '-fno-delete-null-pointer-checks' ], -+ }], - ['clang==0', { - 'target_conditions': [ - ['_toolset=="target"', { --- -cgit v1.0-4-g1e03 - -From ae73e50e7d8c1371ed293c10150646a2719f4598 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <[email protected]> -Date: Wed, 14 Sep 2016 17:40:50 +0200 -Subject: FIXUP: gcc6: set -fno-delete-null-pointer-checks for all files - -Set a default and pull in the value from configuration, and -remove the old v8 only version. - -Change-Id: Ica9f971baa28c717178eb2acd074607424792e1d -Reviewed-by: David Faure <[email protected]> ---- - chromium/build/common.gypi | 4 ++++ - chromium/v8/build/toolchain.gypi | 7 ------- - 2 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi -index d768ab3..8a1df22 100644 ---- a/src/3rdparty/chromium/build/common.gypi -+++ b/src/3rdparty/chromium/build/common.gypi -@@ -727,6 +727,9 @@ - # By default include non-appstore-compliant code. - 'appstore_compliant_code%': 0, - -+ # Enable this to turn off the delete-null-pointer-checks optimization in GCC 6+ -+ 'no_delete_null_pointer_checks%': 0, -+ - 'conditions': [ - # A flag for POSIX platforms - ['OS=="win"', { -@@ -1271,6 +1274,7 @@ - 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)', - 'proprietary_codecs%': '<(proprietary_codecs)', - 'appstore_compliant_code%': '<(appstore_compliant_code)', -+ 'no_delete_null_pointer_checks%': '<(no_delete_null_pointer_checks)', - 'use_goma%': '<(use_goma)', - 'gomadir%': '<(gomadir)', - 'use_lto%': '<(use_lto)', --- -cgit v1.0-4-g1e03 - -From d6c8a2cf8fa374e6d1c0a578391b57112c047fa4 Mon Sep 17 00:00:00 2001 -From: David Faure <[email protected]> -Date: Mon, 5 Sep 2016 15:25:02 +0200 -Subject: Enable -fno_delete_null_pointer_checks for g++ 6 on all of chromium - -This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer -which also compares this with null. - -Change-Id: I85d69432a0d7eeb0d8df8f395821880e36180dcc -Reviewed-by: Allan Sandfeld Jensen <[email protected]> ---- - src/core/config/linux.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 9264932..a318e17 100644 ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -29,6 +29,8 @@ use?(nss) { - use_openssl_certs=1 - } - -+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += no_delete_null_pointer_checks=1 -+ - contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1 - contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 - contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 --- -cgit v1.0-4-g1e03 - 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 deleted file mode 100644 index 193e713..0000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fa8cdb3a32c377b6290d0a92d2522186bcd48293 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <[email protected]> -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 <[email protected]> ---- - 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 <sys/mman.h> - -+#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/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild index 0aa8ce0..37d4b0e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild @@ -9,7 +9,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" + KEYWORDS="amd64 x86" fi IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild similarity index 94% rename from dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild rename to dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild index 8fffc94..875f5b3 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild @@ -29,13 +29,14 @@ RDEPEND=" dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt + dev-libs/protobuf:= media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= - >=media-libs/libvpx-1.4:= + >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus @@ -73,9 +74,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch" - "${FILESDIR}/${PN}-5.7.0-gcc6.patch" "${FILESDIR}/${PN}-5.7.0-icu58.patch" - "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch" # musl patches "${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch" @@ -93,7 +92,7 @@ src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) if use system-icu; then - # ensuire build against system headers - bug #601264 + # ensure build against system headers - bug #601264 rm -r src/3rdparty/chromium/third_party/icu/source || die fi
