[arch-commits] Commit in chromium/trunk (3 files)

[Evangelos Foutras]

    Date: Monday, January 27, 2020 @ 12:30:31
  Author: foutrelis
Revision: 374076

Switch to upstream patch for unbundling zlib

Added:
  chromium/trunk/fix-building-with-system-zlib.patch
Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/chromium-system-zlib.patch

-------------------------------------+
 PKGBUILD                            |    8 +++++---
 chromium-system-zlib.patch          |   13 -------------
 fix-building-with-system-zlib.patch |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-27 11:13:19 UTC (rev 374075)
+++ PKGBUILD	2020-01-27 12:30:31 UTC (rev 374076)
@@ -28,8 +28,8 @@
         include-algorithm-to-use-std-lower_bound.patch
         icu65.patch
         sync-enable-USSPasswords-by-default.patch
+        fix-building-with-system-zlib.patch
         chromium-system-icu.patch
-        chromium-system-zlib.patch
         chromium-system-hb.patch
         fix-spammy-unique-font-matching-log.patch
         chromium-widevine.patch
@@ -40,8 +40,8 @@
             '1f906676563e866e2b59719679e76e0b2f7f082f48ef0593e86da0351a586c73'
             '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41'
             '08ef82476780e0864b5bf7f20eb19db320e73b9a5d4f595351e12e97dda8746f'
+            '18276e65c68a0c328601b12fefb7e8bfc632346f34b87e64944c9de8c95c5cfa'
             'e73cc2ee8d3ea35aab18c478d76fdfc68ca4463e1e10306fa1e738c03b3f26b5'
-            'eb67eda4945a89c3b90473fa8dc20637511ca4dcb58879a8ed6bf403700ca9c8'
             'c0ad3fa426cb8fc1a237ddc6309a6b2dd4055bbe41dd07f50071ee61f969b81a'
             '6fbffe59b886195b92c9a55137cef83021c16593f49714acb20023633e3ebb19'
             '709e2fddba3c1f2ed4deb3a239fc0479bfa50c46e054e7f32db4fb1365fed070'
@@ -105,9 +105,11 @@
   # https://crbug.com/1027929
   patch -Np1 -i ../sync-enable-USSPasswords-by-default.patch
 
+  # https://crbug.com/977964
+  patch -Np1 -i ../fix-building-with-system-zlib.patch
+
   # Fixes from Gentoo
   patch -Np1 -i ../chromium-system-icu.patch
-  patch -Np1 -i ../chromium-system-zlib.patch
   patch -Np1 -i ../chromium-system-hb.patch
 
   # https://crbug.com/1005508

Deleted: chromium-system-zlib.patch
===================================================================
--- chromium-system-zlib.patch	2020-01-27 11:13:19 UTC (rev 374075)
+++ chromium-system-zlib.patch	2020-01-27 12:30:31 UTC (rev 374076)
@@ -1,13 +0,0 @@
-diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn
-index 3bc618a..e0ddf6d 100644
---- a/third_party/perfetto/gn/BUILD.gn
-+++ b/third_party/perfetto/gn/BUILD.gn
-@@ -244,7 +244,7 @@ if (enable_perfetto_trace_processor || perfetto_build_standalone ||
-         "//buildtools:zlib",
-       ]
-     } else {
--      public_configs = [ "//third_party/zlib:zlib_config" ]
-+      public_configs = [ "//third_party/zlib:system_zlib" ]
-       public_deps = [
-         "//third_party/zlib",
-       ]

Added: fix-building-with-system-zlib.patch
===================================================================
--- fix-building-with-system-zlib.patch	                        (rev 0)
+++ fix-building-with-system-zlib.patch	2020-01-27 12:30:31 UTC (rev 374076)
@@ -0,0 +1,32 @@
+From cda86e34ddadba5f08dea764881bbb6c8ec01e8a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09 at googlemail.com>
+Date: Sat, 25 Jan 2020 02:00:43 +0000
+Subject: [PATCH] Fix building with system zlib
+
+Add zlib_config target because perfetto depends on it.
+
+Bug: 977964
+Change-Id: I2aac5c3704f1274f932a61264d1c26a05f2db55e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019035
+Reviewed-by: Thomas Anderson <thomasanderson at chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#735201}
+---
+ build/linux/unbundle/zlib.gn | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn
+index 1fdd472f35e..97d6aebe6d5 100644
+--- a/build/linux/unbundle/zlib.gn
++++ b/build/linux/unbundle/zlib.gn
+@@ -13,6 +13,10 @@ config("system_zlib") {
+   defines = [ "USE_SYSTEM_ZLIB=1" ]
+ }
+ 
++config("zlib_config") {
++  configs = [ ":system_zlib" ]
++}
++
+ source_set("zlib") {
+   deps = [ ":zlib_shim" ]
+   libs = [ "z" ]