diff options
Diffstat (limited to 'community/chromium')
| -rw-r--r-- | community/chromium/APKBUILD | 10 | ||||
| -rw-r--r-- | community/chromium/chromium-webrtc-r0.patch | 34 | ||||
| -rw-r--r-- | community/chromium/gcc6.patch | 21 | ||||
| -rw-r--r-- | community/chromium/musl-libc++.patch | 13 |
4 files changed, 23 insertions, 55 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index c19f2a2bf7..ac7e713e47 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=chromium -pkgver=63.0.3239.108 +pkgver=64.0.3282.168 pkgrel=0 pkgdesc="chromium web browser" url="http://www.chromium.org/" @@ -98,7 +98,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn unset-madv_free.patch swiftshader.patch secure_getenv.patch - chromium-webrtc-r0.patch chromium-48.0.2564.116-libusb_interrupt_event_handler.patch chromium-60.0.3112.78-gn-system.patch chromium-60.0.3112.78-jpeg-nomangle.patch @@ -315,7 +314,7 @@ chromedriver() { mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin } -sha512sums="3cb7c8569d2d061f5abf4ad68d9ea1716a1b07bdf8dfa7b600d558d308374ff5dbda9f947e67e21186e3e716fe9524fc63e8eabd9eac1fa805f0eb7d994c32c8 chromium-63.0.3239.108.tar.xz +sha512sums="8bb31d6df85651315f8b70bd27f5b855b0936dd06b05a22451d24d4b440edc5d4e8d8f20d0fbc5fc52484f14f0539d2b2e5e0623aa22cca40c1f3b9e5d9d06d7 chromium-64.0.3282.168.tar.xz a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29 pstables-2.8.h b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf @@ -323,13 +322,13 @@ e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b3 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys 55921cc33d623e0751e94d4fef2ddd69afb57381da6115995b1f318e2398978b9173e80f6ffbc6e6c0c0c55a04e934e0e34a46c32e03947cc31f0f5a226e7725 chromium-widevine.patch 05fb6d9434565a7a73f5c18d470ae600bf4afbe15d0e4a7c2770bf2596a0bd2788cdfeb37e0b566fc3d26ff2d0791b70488b2c184e3286cff5a1fa25e17582cd default-pthread-stacksize.patch -88928afcc33843e17daa082435a4b88c2106b0252a202ad19f684021c027859366a0c12970700c0d1b010211eef95d295362dc6afdea1b00199dd8d2efbdcfe7 gcc6.patch +d86fa87a47f9dc1f7400358c70f2d9efcb85fa5bf0badf65456ed6a7003e59eb0809e0406fb114f256d51acb002c2a8da8a0c1c93dfdc21e198761dc516a0ecb gcc6.patch f420f6b4827da4dbd416b2de094452917313cb79e01d33a07029589066a0b79e06446882f1ade5ac418f180ae581937d620d1d48698df77b5c5ddb4a3d6cf680 gn_bootstrap.patch 8fbfd67a0b6bbdf08364e810bd85b4a80dda9af73fefe3aba8010d9b33022d458a785c628515bbda9c743b8a0293d57cfe18fcc5aa2313c845c6fb948c2335f9 last-commit-position.patch ca73f4912c4e41a235821fba5f3a7a5266739ce86dc1b27bc07d6bc2f97dc97b15b2fa47dc95c7a82a7e0b8fa1e6a17071f6dc06ddf47f65a56f216c0aaaf054 musl-fixes.patch 90efbc89151c77f32434364dcbaabaf9d9a207f4a77f147cd51b3fe100832fbfb3a9fb665303a79a3d788e400f4f41890de202ccbb7bd1fc6252e33c6e74e429 musl-fixes-breakpad.patch 507a8db2317f1f6ec18dec6cb5894b716e9b2542b58887bab9319bc6d4c66fe4a4d09b200ca8e3f11b32e380b282442a27e7a1b358d3c25eef0fa7655e9dc134 musl-hacks.patch -c38e3e30512f6f5d494bcd905b314dea52e09214f8fc779b66193f5eb3af8f1afb5cdf2d096aa4590e6a1dd28c289d26812d7268abf4459209fb8bdc8806a0be musl-libc++.patch +95ead57f7338649351948d100e32e5ec1eeadb02bffa136ff15c6c515eceb8013c444be092d777c1b62b945bfb83b97778ba4d3a0ccc2d7c2c9a0a8cd8ee0f01 musl-libc++.patch 9b75d6ac720d1b8ddc597f0f472bc400ff866a733f12b3a4cd3e7e18e724549c5f8e056c7e0d0462ef083bff5e677f8cef6b89b22f4740a40ad6398978269373 musl-sandbox.patch fe2cee01d07e5dc638dad0c5453397eb03e30867c1e54591d7f612034366c96ccaa35216d2bcedbe796863eeb5b90dcf71c75e5391c266df4cb27b44e59bb040 no-execinfo.patch 7a3a4ba4479a22a13126a78ad3d9991188ef030389026c4293d45b4440711751d68e43d28687653d5670d7f00ed5f1b820a8df50a3a08ce06e454f0cad9dbd3c no-mallinfo.patch @@ -337,7 +336,6 @@ ac0c9d7780ac897ea8ad5d909616d3aa29eed720353c7a660c850ee1404c80f51f5db274b3c5d3c7 27dd7916be3324294a0a913c43c856e9c00be767a2aec4f3da2455fb84e74ebb0017d1aa586b40dd9d989ada6b60fc531522f503d57e04324726a2171bf3a85e unset-madv_free.patch 6b0812725a0fc562527f3556dc4979fec72d1ba92f26a5e78ff2016c39bb2c155a0ff95fc22101f9c097d14b84182d6615276f4247f60ae7833ab45da8366e6d swiftshader.patch 67eea8e13c85aca7db5c85f5b0d33e5798e8063ab7f5b2f0a5c7f6fee8266e58bee4e72f4542472ef6634634ca0f4359a2d1113fa310a991373404320c784730 secure_getenv.patch -e4963e60d46eba748ab5b54d08fe0ca5469d2db7b985f11fd3f4fc334608b84aae3da46eeaff8c1734ff35792c06dc42cdda6610c86dd0eff28465cf7c146bca chromium-webrtc-r0.patch 2e9496aa9ccd6fed2d0df4b659d55e87abb67b1be4e3cc7cb0483ccb458b9071bed9939132a2345bf15192b4dcfe5da9474d7f653ae2f4b4d46d2f3c032b3a3f chromium-48.0.2564.116-libusb_interrupt_event_handler.patch 197ca3fd315e15c3e0b796615afbd01f65e2040027a2cde6304dea500cfaf18372ce2be88f4030bcd26651b913dd4af741a4df8803cdf9ff062a8eef9ab6c5db chromium-60.0.3112.78-gn-system.patch e9fcc976d2ac1b2e73d310790e76dae15111e78cd8e3efa5febd702fd9492d7d68b1b57d95bca88d5e16c0627594a00ebdeaf570df52be6e9b23a4212906c141 chromium-60.0.3112.78-jpeg-nomangle.patch diff --git a/community/chromium/chromium-webrtc-r0.patch b/community/chromium/chromium-webrtc-r0.patch deleted file mode 100644 index f89e798d77..0000000000 --- a/community/chromium/chromium-webrtc-r0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> -Date: Fri, 13 Oct 2017 15:49:32 +0200 -Subject: [PATCH] IWYU: Include math.h for round(3). - -math.h was being implicitly included, which can break the build with -alternative libc implementations. - -Bug: None -Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952 -Reviewed-on: https://webrtc-review.googlesource.com/9384 -Reviewed-by: Tommi <tommi@webrtc.org> -Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com> -Cr-Commit-Position: refs/heads/master@{#20292} ---- - p2p/base/port.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/p2p/base/port.cc b/p2p/base/port.cc -index a1b478d11..81aa0aadb 100644 ---- third_party/webrtc/p2p/base/port.cc -+++ third_party/webrtc/p2p/base/port.cc -@@ -10,6 +10,8 @@ - - #include "p2p/base/port.h" - -+#include <math.h> -+ - #include <algorithm> - #include <vector> - --- -2.15.0.rc2 - diff --git a/community/chromium/gcc6.patch b/community/chromium/gcc6.patch index 14c0d0f165..eeef288144 100644 --- a/community/chromium/gcc6.patch +++ b/community/chromium/gcc6.patch @@ -1,8 +1,25 @@ ---- build/config/linux/BUILD.gn.orig +diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn +index 45fee9a..0769c41 100644 +--- build/config/linux/BUILD.gn +++ build/config/linux/BUILD.gn -@@ -13,6 +13,7 @@ +@@ -13,6 +13,7 @@ group("linux") { # is applied to all targets. It is here to separate out the logic that is # Linux-only. This is not applied to Android, but is applied to ChromeOS. config("compiler") { + cflags_cc = [ "-fno-delete-null-pointer-checks" ] } + + # This is included by reference in the //build/config/compiler:runtime_library +diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h +index 77db3ac..201ed4e 100644 +--- third_party/angle/src/compiler/translator/Types.h ++++ third_party/angle/src/compiler/translator/Types.h +@@ -236,7 +236,7 @@ class TType + { + } + +- TBasicType getBasicType() const { return type; } ++ constexpr TBasicType getBasicType() const { return type; } + void setBasicType(TBasicType t); + + TPrecision getPrecision() const { return precision; } diff --git a/community/chromium/musl-libc++.patch b/community/chromium/musl-libc++.patch index 7f179331d0..088d80fad5 100644 --- a/community/chromium/musl-libc++.patch +++ b/community/chromium/musl-libc++.patch @@ -53,16 +53,3 @@ index 4163c2c..3d1902a 100644 #endif } #endif -diff --git a/buildtools/third_party/libc++/trunk/src/system_error.cpp b/buildtools/third_party/libc++/trunk/src/system_error.cpp -index cbbbb5d..8761e65 100644 ---- buildtools/third_party/libc++/trunk/src/system_error.cpp -+++ buildtools/third_party/libc++/trunk/src/system_error.cpp -@@ -73,7 +73,7 @@ string do_strerror_r(int ev) { - std::snprintf(buffer, strerror_buff_size, "unknown error %d", ev); - return string(buffer); - } --#elif defined(__linux__) && !defined(_LIBCPP_HAS_MUSL_LIBC) && \ -+#elif defined(__GLIBC__) && !defined(_LIBCPP_HAS_MUSL_LIBC) && \ - (!defined(__ANDROID__) || __ANDROID_API__ >= 23) - // GNU Extended version - string do_strerror_r(int ev) { |