From 81bcedfb690812cce07165a27f381253afd44653 Mon Sep 17 00:00:00 2001 From: Mike Waychison Date: Thu, 8 Oct 2020 22:27:08 -0400 Subject: [PATCH 1/3] rust-sdl2: Force unix line-endings for patches This fixes an issue where the *.patch files get windows line endings when checked out on windows, which breaks the bundled build when building from git directly. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..dbf3d256b79 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.patch eol=lf From 6f9b3346dfaf115e9c65da584d0d9f1bd4ad8cd6 Mon Sep 17 00:00:00 2001 From: Mike Waychison Date: Fri, 26 Mar 2021 15:16:21 -0700 Subject: [PATCH 2/3] Update changelog for line endings of *.patch --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 696a450f648..076baf6557a 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ when upgrading from a version of rust-sdl2 to another. * Add patch to fix metal detection (https://bugzilla.libsdl.org/show_bug.cgi?id=4988) * Changed signature of TimerSubsystem::ticks to accept `&self`. + * Fix line endings of patches to lf so patching of sources works on Windows. ### v0.34.4 From c2d25edf22d50ace43f1b736c8c243352e817613 Mon Sep 17 00:00:00 2001 From: Mike Waychison Date: Fri, 26 Mar 2021 15:31:46 -0700 Subject: [PATCH 3/3] Update with PR --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 076baf6557a..ce4c9d207ef 100644 --- a/changelog.md +++ b/changelog.md @@ -5,7 +5,7 @@ when upgrading from a version of rust-sdl2 to another. * Add patch to fix metal detection (https://bugzilla.libsdl.org/show_bug.cgi?id=4988) * Changed signature of TimerSubsystem::ticks to accept `&self`. - * Fix line endings of patches to lf so patching of sources works on Windows. +[PR #1080](https://github.com/Rust-SDL2/rust-sdl2/pull/1080): Fix line endings of patches to lf so patching of sources works on Windows. ### v0.34.4