[gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/

[gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/

[James Le Cuirot]

commit:     493793045415865eb892c7ee5c4efb6c603d338f
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Thu Aug 27 16:41:28 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 17:46:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49379304

games-engines/odamex: Fix line endings in odalaunch patch

Closes: https://bugs.gentoo.org/739186
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17283
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
index 95cdfce5183..5dd89d1910d 100644
--- a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
+++ b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
@@ -1,4 +1,4 @@
-From 8b82b887fd1fb17162ad831bbe7a83076187499d Mon Sep 17 00:00:00 2001
+From 9e3ae8538475e6f15757ce51e214f5cd29f223e7 Mon Sep 17 00:00:00 2001
 From: Michael Wood <mwoodj@huntsvegas.org>
 Date: Tue, 25 Aug 2020 02:34:37 -0500
 Subject: [PATCH] Use C++11 on odalaunch target for wx 3.0.4 and up

[gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/

[James Le Cuirot]

commit:     de70754fe00d527a888c54e5110aed9d6730df57
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 21:08:46 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 21:08:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de70754f

games-engines/odamex: Try to fix patch line endings issue again

Closes: https://bugs.gentoo.org/739186
Closes: https://github.com/gentoo/gentoo/pull/17283
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...1-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
index 5dd89d1910d..935d43466c4 100644
--- a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
+++ b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
@@ -13,17 +13,17 @@ index f68a4d4d..4abbe0d8 100644
 --- a/odalaunch/CMakeLists.txt
 +++ b/odalaunch/CMakeLists.txt
 @@ -32,6 +32,11 @@ endif()
- 
- # Odalaunch target
- if(wxWidgets_FOUND)
-+  # wxWidgets 3.0.4 requires C++11
-+  if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)
-+    set(CMAKE_CXX_STANDARD 11)
-+  endif()
-+
-   add_custom_command(
-     OUTPUT ${XRCRES_HEADER}
-     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
+ 
+ # Odalaunch target
+ if(wxWidgets_FOUND)
++  # wxWidgets 3.0.4 requires C++11
++  if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)
++    set(CMAKE_CXX_STANDARD 11)
++  endif()
++
+   add_custom_command(
+     OUTPUT ${XRCRES_HEADER}
+     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
 -- 
 2.28.0