[chromium-freeworld] Fix: Building with system harfbuzz

commit 7e4ad0893402265ef49bc9462385636c99436f12 Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; Date: Sat Dec 14 08:43:07 2019 +0530 Fix: Building with system harfbuzz chromium-fix-use_system_harfbuzz-ng.patch | 44 +++++++++++++++++++++++++++++++ chromium-freeworld.spec | 3 ++- 2 files changed, 46 insertions(+), 1 deletion(-) --- diff --git a/chromium-fix-use_system_harfbuzz-ng.patch b/chromium-fix-use_system_harfbuzz-ng.patch new file mode 100644 index 0000000..383aa0a --- /dev/null +++ b/chromium-fix-use_system_harfbuzz-ng.patch @@ -0,0 +1,44 @@ +From ea7a9bad96f921da314ab8d171b1e22ad19d49a7 Mon Sep 17 00:00:00 2001 +From: ckitagawa <ckitagawa(a)chromium.org&gt; +Date: Tue, 22 Oct 2019 14:31:41 +0000 +Subject: [PATCH] [Build] fix use_system_harfbuzz-ng +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use <> for harfbuzz includes to support the option to build with system +harfbuzz rather than the version in third_party. + +Bug: 1016158 +Change-Id: I8a85e928c010ca65e04b5ebc4909a051b4312672 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1873236 +Commit-Queue: Calder Kitagawa <ckitagawa(a)chromium.org&gt; +Commit-Queue: Dominik Röttsches <drott(a)chromium.org&gt; +Reviewed-by: Dominik Röttsches <drott(a)chromium.org&gt; +Cr-Commit-Position: refs/heads/master@{#708176} +--- + components/paint_preview/common/subset_font.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc +index a218d6373350..287f5600ce9b 100644 +--- a/components/paint_preview/common/subset_font.cc ++++ b/components/paint_preview/common/subset_font.cc +@@ -7,11 +7,12 @@ + #include <memory> + #include <utility> + ++#include <hb-subset.h> ++#include <hb.h> ++ + #include "base/bind.h" + #include "base/callback.h" + #include "base/macros.h" +-#include "third_party/harfbuzz-ng/src/src/hb-subset.h" +-#include "third_party/harfbuzz-ng/src/src/hb.h" + #include "third_party/skia/include/core/SkStream.h" + #include "third_party/skia/include/core/SkTypeface.h" + +-- +2.23.0 + diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index b07294e..2038e52 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -237,6 +237,8 @@ Patch73: launch_manager.h-uses-std-vector.patch Patch74: chromium-79.0.3945.56-glibc-clock-nanosleep.patch # ICU ver. 65 support on Rawhide Patch75: icu65.patch +#Fix building with system harfbuzz +Patch76: chromium-fix-use_system_harfbuzz-ng.patch %description @@ -752,7 +754,6 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %dir %{chromiumdir}/swiftshader %{chromiumdir}/swiftshader/libEGL.so %{chromiumdir}/swiftshader/libGLESv2.so -%{chromiumdir}/swiftshader/libvk_swiftshader.so #########################################changelogs################################################# %changelog * Fri Dec 13 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 79.0.3945.79-1