commit: 4a338c733fff32fc0f42fe5ce3a94613cb87522d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Sep 2 13:00:36 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 2 13:00:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a338c73
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 <sam <AT> gentoo.org> .../supertuxkart-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 2a23e51323d..f9681733cfb 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 <[email protected] --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp @@ -35,7 +35,7 @@ - #include <GL/gl.h> - #ifdef _IRR_OPENGL_USE_EXTPOINTER_ - #define GLX_GLXEXT_PROTOTYPES --#include "glxext.h" -+#include <GL/glxext.h> - #endif - #endif - + #include <GL/gl.h> + #ifdef _IRR_OPENGL_USE_EXTPOINTER_ + #define GLX_GLXEXT_PROTOTYPES +-#include "glxext.h" ++#include <GL/glxext.h> + #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 <[email protected] --- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h +++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h @@ -12,7 +12,7 @@ - #define WIN32_LEAN_AND_MEAN - #include <windows.h> - #include <GL/gl.h> -- #include "glext.h" -+ #include <GL/glext.h> - #else - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) - #define GL_GLEXT_LEGACY 1 + #define WIN32_LEAN_AND_MEAN + #include <windows.h> + #include <GL/gl.h> +- #include "glext.h" ++ #include <GL/glext.h> + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + #define GL_GLEXT_LEGACY 1 @@ -26,7 +26,7 @@ - #include <GL/gl.h> - #endif - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -- #include "glext.h" -+ #include <GL/glext.h> - #endif - #endif - + #include <GL/gl.h> + #endif + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include <GL/glext.h> + #endif + #endif +
