From cf29e798d96e55adcf33d183a19971521b37facd Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 7 Feb 2024 14:57:15 +0100 Subject: [PATCH 1/2] bundle woff2 due to linker errors --- chromium.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chromium.spec b/chromium.spec index d9b45bea..1c941916 100644 --- a/chromium.spec +++ b/chromium.spec @@ -190,9 +190,10 @@ # This is left here to ease the change if that ever switches. %global bundleicu 1 -# system re2, jsoncpp, build errors with use_custom_libcxx=true +# bundle re2, jsoncpp, woff2 - build errors with use_custom_libcxx=true %global bundlere2 1 %global bundlejsoncpp 1 +%global bundlewoff2 1 %global bundlelibaom 1 %global bundlelibavif 1 %global bundledav1d 1 @@ -228,7 +229,6 @@ %global bundlelcms2 1 %global bundlelibtiff 1 %global bundlecrc32c 1 -%global bundlewoff2 1 %global bundledoubleconversion 1 %global bundlelibsecret 1 %global bundlesnappy 1 @@ -259,7 +259,6 @@ %global bundlecrc32c 0 %global bundleharfbuzz 0 %endif -%global bundlewoff2 0 %global bundledoubleconversion 0 %global bundlelibsecret 0 %global bundlesnappy 0 From 09312b077c60201eb2942063c9652d8def794948 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 8 Feb 2024 08:44:44 +0100 Subject: [PATCH 2/2] bundle snappy (linker error) --- chromium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium.spec b/chromium.spec index 1c941916..2799791c 100644 --- a/chromium.spec +++ b/chromium.spec @@ -261,7 +261,7 @@ %endif %global bundledoubleconversion 0 %global bundlelibsecret 0 -%global bundlesnappy 0 +%global bundlesnappy 1 %global bundlelibXNVCtrl 0 %global bundlelibxml 0 %endif