| 1 |
commit: de70754fe00d527a888c54e5110aed9d6730df57 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 27 21:08:46 2020 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 27 21:08:46 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de70754f |
| 7 |
|
| 8 |
games-engines/odamex: Try to fix patch line endings issue again |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/739186 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/17283 |
| 12 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 13 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 14 |
|
| 15 |
...1-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 22 +++++++++++----------- |
| 16 |
1 file changed, 11 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index 5dd89d1910d..935d43466c4 100644 |
| 20 |
--- a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch |
| 21 |
+++ b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch |
| 22 |
@@ -13,17 +13,17 @@ index f68a4d4d..4abbe0d8 100644 |
| 23 |
--- a/odalaunch/CMakeLists.txt |
| 24 |
+++ b/odalaunch/CMakeLists.txt |
| 25 |
@@ -32,6 +32,11 @@ endif() |
| 26 |
- |
| 27 |
- # Odalaunch target |
| 28 |
- if(wxWidgets_FOUND) |
| 29 |
-+ # wxWidgets 3.0.4 requires C++11 |
| 30 |
-+ if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3) |
| 31 |
-+ set(CMAKE_CXX_STANDARD 11) |
| 32 |
-+ endif() |
| 33 |
-+ |
| 34 |
- add_custom_command( |
| 35 |
- OUTPUT ${XRCRES_HEADER} |
| 36 |
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res |
| 37 |
+ |
| 38 |
+ # Odalaunch target |
| 39 |
+ if(wxWidgets_FOUND) |
| 40 |
++ # wxWidgets 3.0.4 requires C++11 |
| 41 |
++ if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3) |
| 42 |
++ set(CMAKE_CXX_STANDARD 11) |
| 43 |
++ endif() |
| 44 |
++ |
| 45 |
+ add_custom_command( |
| 46 |
+ OUTPUT ${XRCRES_HEADER} |
| 47 |
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res |
| 48 |
-- |
| 49 |
2.28.0 |
Archives