From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67774138359 for ; Wed, 2 Sep 2020 13:01:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F4BAE094A; Wed, 2 Sep 2020 13:01:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 749A2E094A for ; Wed, 2 Sep 2020 13:01:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B4F5335C5D for ; Wed, 2 Sep 2020 13:01:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AEEF2EE for ; Wed, 2 Sep 2020 13:01:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1599051636.4a338c733fff32fc0f42fe5ce3a94613cb87522d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch X-VCS-Directories: games-action/supertuxkart/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4a338c733fff32fc0f42fe5ce3a94613cb87522d X-VCS-Branch: master Date: Wed, 2 Sep 2020 13:01:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 535d0a19-fc91-4c4a-bedc-7e12d691b47c X-Archives-Hash: fa990d7c2bbdfad18d49ae6e55a859bb commit: 4a338c733fff32fc0f42fe5ce3a94613cb87522d Author: Sam James gentoo org> AuthorDate: Wed Sep 2 13:00:36 2020 +0000 Commit: Sam James gentoo 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 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 - #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 +