[gimp/wip/Jehan/incremental-win-installer-improvements] Test with --ignore-whitespace
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/incremental-win-installer-improvements] Test with --ignore-whitespace
- Date: Tue, 6 Jul 2021 20:37:11 +0000 (UTC)
commit 8cfa79f198b87dd10f6338950b06706ed96e56a7
Author: Jehan <jehan girinstud io>
Date: Tue Jul 6 22:36:53 2021 +0200
Test with --ignore-whitespace
build/windows/gitlab-ci/build-deps-msys2.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index e453c02214..0c227ff6e7 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -126,7 +126,8 @@ patch -p1 < 0003-gtkwindow-Don-t-force-enable-CSD-under-Windows.patch
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
-patch -p1 < 1563.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
mkdir _build
cd _build
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]