[gimp/wip/Jehan/incremental-win-installer-improvements] Add --binary.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/incremental-win-installer-improvements] Add --binary.
- Date: Tue, 6 Jul 2021 22:27:31 +0000 (UTC)
commit 511b59164f7144b4a30ec21cf1bb5e8119538958
Author: Jehan <jehan girinstud io>
Date: Wed Jul 7 00:27:22 2021 +0200
Add --binary.
build/windows/gitlab-ci/build-deps-msys2.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 0c227ff6e7..221d622b9a 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -127,7 +127,7 @@ patch -p1 < 0004-Disable-low-level-keyboard-hook.patch
# Patches not in MSYS2 build.
patch -p1 < ../build/windows/patches/gtk3-24-mr3275-gimp-issue-5475.patch
# The --ignore-whitespace option is necessary to accomodate such errors: Hunk #1 FAILED at 15 (different
line endings)
-patch -p1 --ignore-whitespace < 1563.patch
+patch -p1 --ignore-whitespace --binary < 1563.patch
mkdir _build
cd _build
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]