From ccf126fdfc71a033479771dfe1b5dccfe89da42b Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Sun, 27 Apr 2025 14:13:39 +0200 Subject: [PATCH] Fix winrt patch not applying due to line endings. --- icedreammusic/.gitattributes | 2 ++ icedreammusic/winrt.1.patch | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 icedreammusic/.gitattributes diff --git a/icedreammusic/.gitattributes b/icedreammusic/.gitattributes new file mode 100644 index 0000000..2455fa9 --- /dev/null +++ b/icedreammusic/.gitattributes @@ -0,0 +1,2 @@ +# do not fix line endings on patch file as it will not apply correctly +winrt.*.patch text eol=crlf diff --git a/icedreammusic/winrt.1.patch b/icedreammusic/winrt.1.patch index a540291..8fdfc05 100644 --- a/icedreammusic/winrt.1.patch +++ b/icedreammusic/winrt.1.patch @@ -1,12 +1,11 @@ -diff -p1 -U1 -r a/roapi.h b/roapi.h ---- a/roapi.h 2024-01-22 02:10:15.948390337 +0100 -+++ b/roapi.h 2024-01-22 02:10:39.815131639 +0100 +--- a/roapi.h 2025-04-27 14:08:27.170499015 +0200 ++++ b/roapi.h 2025-04-27 14:09:28.870444546 +0200 @@ -32,2 +32,4 @@ extern "C" { - -+#pragma region Desktop Family -+ - // Ro initialization flags; passed to Windows::Runtime::Initialize + ++#pragma region Desktop Family ++ + // Ro initialization flags; passed to Windows::Runtime::Initialize @@ -35,3 +37,2 @@ typedef enum RO_INIT_TYPE - { --#pragma region Desktop Family - #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + { +-#pragma region Desktop Family + #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)