Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/
Date: Wed, 02 Sep 2020 13:01:16
Message-Id: 1599051636.4a338c733fff32fc0f42fe5ce3a94613cb87522d.sam@gentoo
1 commit: 4a338c733fff32fc0f42fe5ce3a94613cb87522d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 13:00:36 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 13:00:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a338c73
7
8 games-action/supertuxkart: fix patch line-endings
9
10 Unfortunately, I tested this *pre-commit* at which point
11 git used its autocrlf to adapt the line-endings.
12
13 Closes: https://bugs.gentoo.org/740030
14 Package-Manager: Portage-3.0.5, Repoman-3.0.1
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 .../supertuxkart-1.2-irrlicht-system-libs.patch | 50 +++++++++++-----------
18 1 file changed, 24 insertions(+), 26 deletions(-)
19
20 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
21 index 2a23e51323d..f9681733cfb 100644
22 --- a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
23 +++ b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
24 @@ -1,5 +1,3 @@
25 -https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff
26 -----
27 Subject: [PATCH] debian/use-system-libs
28
29 Path to build irrlicht using the system libraries for png,zlib and
30 @@ -10,14 +8,14 @@ Signed-off-by: Christoph Egger <debian@×××××××××××××××.org
31 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
32 +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
33 @@ -35,7 +35,7 @@
34 - #include <GL/gl.h>
35 - #ifdef _IRR_OPENGL_USE_EXTPOINTER_
36 - #define GLX_GLXEXT_PROTOTYPES
37 --#include "glxext.h"
38 -+#include <GL/glxext.h>
39 - #endif
40 - #endif
41 -
42 + #include <GL/gl.h>
43 + #ifdef _IRR_OPENGL_USE_EXTPOINTER_
44 + #define GLX_GLXEXT_PROTOTYPES
45 +-#include "glxext.h"
46 ++#include <GL/glxext.h>
47 + #endif
48 + #endif
49 +
50 --- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
51 +++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
52 @@ -24,7 +24,7 @@
53 @@ -50,20 +48,20 @@ Signed-off-by: Christoph Egger <debian@×××××××××××××××.org
54 --- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
55 +++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
56 @@ -12,7 +12,7 @@
57 - #define WIN32_LEAN_AND_MEAN
58 - #include <windows.h>
59 - #include <GL/gl.h>
60 -- #include "glext.h"
61 -+ #include <GL/glext.h>
62 - #else
63 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
64 - #define GL_GLEXT_LEGACY 1
65 + #define WIN32_LEAN_AND_MEAN
66 + #include <windows.h>
67 + #include <GL/gl.h>
68 +- #include "glext.h"
69 ++ #include <GL/glext.h>
70 + #else
71 + #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
72 + #define GL_GLEXT_LEGACY 1
73 @@ -26,7 +26,7 @@
74 - #include <GL/gl.h>
75 - #endif
76 - #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
77 -- #include "glext.h"
78 -+ #include <GL/glext.h>
79 - #endif
80 - #endif
81 -
82 + #include <GL/gl.h>
83 + #endif
84 + #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
85 +- #include "glext.h"
86 ++ #include <GL/glext.h>
87 + #endif
88 + #endif
89 +