diff --git a/.cirrus.yml b/.cirrus.yml index 11f43f755..67518d414 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -257,7 +257,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - 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 + - patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch - rm $HOME/qbs-pkg-config-probe.patch build_script: - echo $PATH diff --git a/appveyor.yml b/appveyor.yml index 8eaee33ab..e5d23e1f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -728,7 +728,7 @@ for: - 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 + - patch -N -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} @@ -911,7 +911,7 @@ for: - 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 + - patch -N -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}