From 8605082cc584cf59e3e4e8198e1f7074fc27cb39 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 27 Jun 2019 16:47:00 -0600
Subject: [PATCH] Fix openttd
---
recipes/openttd/01_redox.patch | 60 ++++++++++++++++++++--------------
1 file changed, 35 insertions(+), 25 deletions(-)
diff --git a/recipes/openttd/01_redox.patch b/recipes/openttd/01_redox.patch
index 11387c56e..2cba22304 100644
--- a/recipes/openttd/01_redox.patch
+++ b/recipes/openttd/01_redox.patch
@@ -1,7 +1,17 @@
-diff -rupNw source/config.lib source-new/config.lib
---- source/config.lib 2019-03-04 21:01:49.523053923 +0100
-+++ source-new/config.lib 2019-03-04 21:00:15.870317336 +0100
-@@ -1486,7 +1486,7 @@ make_cflags_and_ldflags() {
+diff -ruw source/config.lib source-new/config.lib
+--- source/config.lib 2019-06-19 08:34:01.122040101 -0600
++++ source-new/config.lib 2019-06-27 16:41:18.749553078 -0600
+@@ -1458,7 +1458,8 @@
+ fi
+ fi
+
+- has_rdynamic=`$1 -dumpspecs | grep rdynamic`
++ #TODO has_rdynamic=`$1 -dumpspecs | grep rdynamic`
++ has_rdynamic=""
+ if [ -n "$has_rdynamic" ]; then
+ # rdynamic is used to get useful stack traces from crash reports.
+ flags="$flags -rdynamic"
+@@ -1486,7 +1487,7 @@
# Special CXXFlags for HOST
CXXFLAGS="$CXXFLAGS"
# Libs to compile. In fact this is just LDFLAGS
@@ -10,10 +20,10 @@ diff -rupNw source/config.lib source-new/config.lib
# LDFLAGS used for HOST
LDFLAGS="$LDFLAGS"
# FEATURES for HOST (lto)
-diff -rupNw source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
---- source/src/music/extmidi.cpp 2019-03-04 21:01:49.899056924 +0100
-+++ source-new/src/music/extmidi.cpp 2019-03-04 21:00:15.886317459 +0100
-@@ -115,7 +115,11 @@ void MusicDriver_ExtMidi::DoPlay()
+diff -ruw source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
+--- source/src/music/extmidi.cpp 2019-06-19 08:34:01.278040813 -0600
++++ source-new/src/music/extmidi.cpp 2019-06-27 16:39:06.400266392 -0600
+@@ -115,7 +115,11 @@
switch (this->pid) {
case 0: {
close(0);
@@ -25,10 +35,10 @@ diff -rupNw source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
if (d != -1 && dup2(d, 1) != -1 && dup2(d, 2) != -1) {
execvp(this->params[0], this->params);
}
-diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
---- source/src/os/unix/unix.cpp 2019-03-04 21:01:49.915057051 +0100
-+++ source-new/src/os/unix/unix.cpp 2019-03-04 20:20:35.800062835 +0100
-@@ -69,12 +69,12 @@ ULONG __stack = (1024*1024)*2; // maybe
+diff -ruw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
+--- source/src/os/unix/unix.cpp 2019-06-19 08:34:01.294040885 -0600
++++ source-new/src/os/unix/unix.cpp 2019-06-27 16:39:06.400266392 -0600
+@@ -69,12 +69,12 @@
bool FiosIsRoot(const char *path)
{
@@ -44,7 +54,7 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
#endif
}
-@@ -106,10 +106,10 @@ bool FiosIsValidFile(const char *path, c
+@@ -106,10 +106,10 @@
{
char filename[MAX_PATH];
int res;
@@ -58,7 +68,7 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
} else // XXX - only next line!
#else
assert(path[strlen(path) - 1] == PATHSEPCHAR);
-@@ -370,7 +370,7 @@ void OSOpenBrowser(const char *url)
+@@ -370,7 +370,7 @@
if (child_pid != 0) return;
const char *args[3];
@@ -67,10 +77,10 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
args[1] = url;
args[2] = NULL;
execvp(args[0], const_cast<char * const *>(args));
-diff -rupNw source/src/rev.cpp.in source-new/src/rev.cpp.in
---- source/src/rev.cpp.in 2019-03-04 21:01:49.923057115 +0100
-+++ source-new/src/rev.cpp.in 2019-03-04 21:00:15.922317739 +0100
-@@ -57,7 +57,7 @@ const char _openttd_build_date[] = __DAT
+diff -ruw source/src/rev.cpp.in source-new/src/rev.cpp.in
+--- source/src/rev.cpp.in 2019-06-19 08:34:01.298040904 -0600
++++ source-new/src/rev.cpp.in 2019-06-27 16:39:06.400266392 -0600
+@@ -57,7 +57,7 @@
* (compiling from sources without any version control software)
* and 2 is for modified revision.
*/
@@ -79,9 +89,9 @@ diff -rupNw source/src/rev.cpp.in source-new/src/rev.cpp.in
/**
* The NewGRF revision of OTTD:
-diff -rupNw source/src/stdafx.h source-new/src/stdafx.h
---- source/src/stdafx.h 2019-03-04 21:01:49.955057370 +0100
-+++ source-new/src/stdafx.h 2019-03-04 21:00:15.930317800 +0100
+diff -ruw source/src/stdafx.h source-new/src/stdafx.h
+--- source/src/stdafx.h 2019-06-19 08:34:01.334041067 -0600
++++ source-new/src/stdafx.h 2019-06-27 16:39:06.400266392 -0600
@@ -12,6 +12,9 @@
#ifndef STDAFX_H
#define STDAFX_H
@@ -92,10 +102,10 @@ diff -rupNw source/src/stdafx.h source-new/src/stdafx.h
#if defined(__APPLE__)
#include "os/macosx/osx_stdafx.h"
#endif /* __APPLE__ */
-diff -rupNw source/src/string.cpp source-new/src/string.cpp
---- source/src/string.cpp 2019-03-04 21:01:49.955057370 +0100
-+++ source-new/src/string.cpp 2019-03-04 21:00:15.938317862 +0100
-@@ -528,7 +528,7 @@ size_t Utf8TrimString(char *s, size_t ma
+diff -ruw source/src/string.cpp source-new/src/string.cpp
+--- source/src/string.cpp 2019-06-19 08:34:01.334041067 -0600
++++ source-new/src/string.cpp 2019-06-27 16:39:06.400266392 -0600
+@@ -528,7 +528,7 @@
return length;
}
--
GitLab