From 5267207206489fdd1087be58f5a806043c185a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= <ferenc.gm@gmail.com>
Date: Tue, 27 Feb 2024 00:00:03 +0000
Subject: [PATCH] [3party] Skip vendored HarfBuzz on Linux (dependency of Qt
 anyway)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ferenc Géczi <ferenc.gm@gmail.com>
---
 .github/workflows/linux-check.yaml | 2 ++
 3party/CMakeLists.txt              | 2 +-
 CMakeLists.txt                     | 2 +-
 docs/INSTALL.md                    | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux-check.yaml b/.github/workflows/linux-check.yaml
index 670681c895..67bfa36bfd 100644
--- a/.github/workflows/linux-check.yaml
+++ b/.github/workflows/linux-check.yaml
@@ -60,6 +60,7 @@ jobs:
               ninja-build \
               libgl1-mesa-dev \
               libglvnd-dev \
+              libharfbuzz-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \
@@ -128,6 +129,7 @@ jobs:
               ninja-build \
               libgl1-mesa-dev \
               libglvnd-dev \
+              libharfbuzz-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
index 7bfc4f0f3d..d6c5cea0c1 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -45,9 +45,9 @@ add_subdirectory(bsdiff-courgette)
 if (NOT PLATFORM_LINUX)
   add_subdirectory(freetype)
   add_subdirectory(icu)
+  add_subdirectory(harfbuzz)
 endif()
 
-add_subdirectory(harfbuzz)
 add_subdirectory(liboauthcpp)
 add_subdirectory(minizip)
 add_subdirectory(open-location-code)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90fc915059..5a6d043565 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -289,10 +289,10 @@ if (USE_PCH)
 endif()
 
 # Should be on the root level, not in 3party, so tests can get these dependencies.
-# Should go before 3party as harfbuzz is using them.
 if (PLATFORM_LINUX)
   find_package(ICU COMPONENTS uc i18n data REQUIRED)
   find_package(Freetype REQUIRED)
+  find_package(harfbuzz REQUIRED)
 endif()
 
 # Include 3party dependencies.
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 2706fe40fd..07abba06f2 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -116,6 +116,7 @@ sudo apt update && sudo apt install -y \
     libfreetype-dev \
     libglvnd-dev \
     libgl1-mesa-dev \
+    libharfbuzz-dev \
     libicu-dev \
     libqt6svg6-dev \
     libqt6positioning6-plugins \