From 4a338c733fff32fc0f42fe5ce3a94613cb87522d Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 2 Sep 2020 14:00:36 +0100 Subject: [PATCH] games-action/supertuxkart: fix patch line-endings Unfortunately, I tested this *pre-commit* at which point git used its autocrlf to adapt the line-endings. Closes: https://bugs.gentoo.org/740030 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Sam James --- ...upertuxkart-1.2-irrlicht-system-libs.patch | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch index 2a23e51323dca..f9681733cfb10 100644 --- a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch +++ b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch @@ -1,5 +1,3 @@ -https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff ----- Subject: [PATCH] debian/use-system-libs Path to build irrlicht using the system libraries for png,zlib and @@ -10,14 +8,14 @@ Signed-off-by: Christoph Egger - #ifdef _IRR_OPENGL_USE_EXTPOINTER_ - #define GLX_GLXEXT_PROTOTYPES --#include "glxext.h" -+#include - #endif - #endif - + #include + #ifdef _IRR_OPENGL_USE_EXTPOINTER_ + #define GLX_GLXEXT_PROTOTYPES +-#include "glxext.h" ++#include + #endif + #endif + --- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h +++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h @@ -24,7 +24,7 @@ @@ -50,20 +48,20 @@ Signed-off-by: Christoph Egger - #include -- #include "glext.h" -+ #include - #else - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) - #define GL_GLEXT_LEGACY 1 + #define WIN32_LEAN_AND_MEAN + #include + #include +- #include "glext.h" ++ #include + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + #define GL_GLEXT_LEGACY 1 @@ -26,7 +26,7 @@ - #include - #endif - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -- #include "glext.h" -+ #include - #endif - #endif - + #include + #endif + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include + #endif + #endif +