Merge Arch package changes (system libvpx, unwind tables cflags)

1 files changed, 7 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0797d50dfd2c..42455a88acb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=chromium-gtk2
 _pkgname=chromium
 pkgver=64.0.3282.140
-pkgrel=1
+pkgrel=2
 _launcher_ver=5
 pkgdesc="A web browser built for speed, simplicity, and security (GTK2 version)"
 arch=('i686' 'x86_64')
@@ -33,7 +33,6 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$_pkg
         chromium-skia-harmony.patch
         chromium-memcpy-r0.patch
         chromium-clang-r2.patch
-        chromium-exclude_unwind_tables.patch
         chromium-widevine.patch
         fix-nav-button-layout.patch
         fix-gtk2-namespace.patch)
@@ -45,7 +44,6 @@ sha256sums=('146afbab37982c52251e5c71b6e19e6e7053b527217fe1da9966c794478c29ce'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
             '455f0029987d9f0532bd9a5250669af5146a9c2b65b776d4a6e2499e8aca7bb4'
             '4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3'
-            '9478f1ec1a3c53425306cf41c2d0555c215a4f106955d9d6adfff38044530ce8'
             'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808'
             '377cb60201a9bf6a095499273a1d96f43543a4f1dae62e591748eec5c652cf52'
             '500a6b96c62aad2a7f1c9c85372bc30dbed277744290e9c55de53e96da540ffb')
@@ -62,7 +60,7 @@ readonly -A _system_libs=(
   [libdrm]=
   [libjpeg]=libjpeg
   #[libpng]=libpng            # https://crbug.com/752403#c10
-  #[libvpx]=libvpx            # https://bugs.gentoo.org/611394
+  [libvpx]=libvpx
   [libwebp]=libwebp
   #[libxml]=libxml2           # https://crbug.com/736026
   [libxslt]=libxslt
@@ -105,9 +103,6 @@ prepare() {
   sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
     patch -Np1
 
-  # https://chromium-review.googlesource.com/c/chromium/src/+/712575
-  patch -Np1 -i ../chromium-exclude_unwind_tables.patch
-
   # https://crbug.com/772655
   patch -Np1 -i ../chromium-use-fromUTF8-for-UnicodeString-construction.patch
 
@@ -216,7 +211,11 @@ build() {
   )
 
   if check_option strip y; then
-    _flags+=('exclude_unwind_tables=true')
+    # https://chromium-review.googlesource.com/c/chromium/src/+/712575
+    # _flags+=('exclude_unwind_tables=true')
+    CFLAGS+='   -fno-unwind-tables -fno-asynchronous-unwind-tables'
+    CXXFLAGS+=' -fno-unwind-tables -fno-asynchronous-unwind-tables'
+    CPPFLAGS+=' -DNO_UNWIND_TABLES'
   fi
 
   python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${_flags[*]}"