From bb2d8c9704ec14fde75877afaba20862e0fcd997 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Fri, 12 Jan 2024 15:03:05 +0200
Subject: [PATCH] Patch Qbs.

---
 .cirrus.yml  | 4 ++++
 appveyor.yml | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index ea2f1d969..bc8cf55df 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -246,6 +246,10 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - qmake --version
     - which qmake
     - qbs --version
+    # Patch Qbs. Remove after Qbs 2.2.1+.
+    - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
+    - patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
+    - rm $HOME/qbs-pkg-config-probe.patch
   build_script:
     - echo $PATH
     - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
diff --git a/appveyor.yml b/appveyor.yml
index d988b1133..8eaee33ab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -726,6 +726,10 @@ for:
     - which qmake
     - which qbs
     - qbs --version
+    # Patch Qbs. Remove after Qbs 2.2.1+.
+    - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
+    - patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
+    - rm $HOME/qbs-pkg-config-probe.patch
     - /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
     - unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
     - cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
@@ -905,6 +909,10 @@ for:
     - qmake --version
     - which qmake
     - qbs --version
+    # Patch Qbs. Remove after Qbs 2.2.1+.
+    - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
+    - patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
+    - rm $HOME/qbs-pkg-config-probe.patch
     - /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
     - unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
     - cmake ${HOME}/macdeployqt-main -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release