From a5572b50cf6e569ae375cae8d900c6a8414138a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 23 Aug 2013 21:00:41 +0200 Subject: [PATCH 1/8] remove workaround for very old Mono bugs --- OpenRA.Game/Game.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 36d6723990..5e76423425 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -441,14 +441,11 @@ namespace OpenRA var settings = new ServerSettings() { Name = "Skirmish Game", - Map = map + Map = map, + AdvertiseOnline = false, + AllowPortForward = false }; - // Work around a miscompile in mono 2.6.7: - // booleans that default to true cannot be set false by an initializer - settings.AdvertiseOnline = false; - settings.AllowPortForward = false; - server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), Game.Settings.Game.Mods, settings, modData); From 6ed6bf15c04fc80eb5b77cde013c9f55d7ffa9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 23 Aug 2013 21:01:53 +0200 Subject: [PATCH 2/8] officially bump the required Mono version to stable 2.10.X closes #2597 --- INSTALL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index cab43ddaab..2aeaca5020 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -Copyright 2007-2011 The OpenRA Developers (see AUTHORS) +Copyright 2007-2013 The OpenRA Developers (see AUTHORS) This file is part of OpenRA, which is free software. It is made available to you under the terms of the GNU General Public License as published by the Free Software Foundation. For more information, @@ -29,8 +29,8 @@ Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer -UBUNTU (substitute comparable packages for other linux distros): -* mono-runtime (>= 2.6.7), +UBUNTU (substitute comparable packages for other Linux distros): +* mono-runtime (>= 2.10) * mono-gmcs * freetype * libmono-corlib1.0-cil From c845ca2dc8af946078877e88bb13852f3923690a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 23 Aug 2013 21:02:36 +0200 Subject: [PATCH 3/8] those old Ubuntu/Compiz versions are not maintained anymore --- INSTALL | 2 -- 1 file changed, 2 deletions(-) diff --git a/INSTALL b/INSTALL index 2aeaca5020..2f29a4823f 100644 --- a/INSTALL +++ b/INSTALL @@ -39,8 +39,6 @@ UBUNTU (substitute comparable packages for other Linux distros): * libsdl1.2-dev * nvidia-cg-toolkit (for Cg renderer) -OpenRA does not work with some older versions of Compiz. On affected systems, disable desktop effects before playing. This is fixed in Ubuntu Natty and later. - The following dlls can also be installed into your system GAC. This is not recommended because we ship a custom Tao.FreeType that can conflict with other applications that use Tao: From 5020056d377fcc82ff5613d698a4a3d18c44ec23 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 25 Aug 2013 21:24:19 +1200 Subject: [PATCH 4/8] Binary patch the OSX mono check to 2.10.0 for x86. --- .../Release/OpenRA.app/Contents/MacOS/OpenRA | Bin 43784 -> 43784 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA index 4e575c6269253e8a4a20ae0eb24e201c90f10331..01b83e98793afa7961050ccec500a962deacbf34 100755 GIT binary patch delta 26 icmeCU#?*0*X@jUbH&;DxsgU7;=Gr?9n-$bwGy?#G2MPxO delta 26 icmeCU#?*0*X@jUbH(Nb#sgU7;=Gr@Kn-$bwGy?#F>k0_~ From ec8301b96d12c7dc7bc889716f7cc2ab8f84d379 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 25 Aug 2013 21:28:48 +1200 Subject: [PATCH 5/8] Remove obsolete ppc arch from OSX launcher. --- .../Release/OpenRA.app/Contents/MacOS/OpenRA | Bin 43784 -> 23904 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA index 01b83e98793afa7961050ccec500a962deacbf34..ebf2dd9e9972ee96959bc9d4584f42e8a34dec14 100755 GIT binary patch delta 46 wcmeCU#`Itpqs*y)yY?|KFfal!I}kH7FbDuC-vl7Rv(fN8|3nATO#%tN04lZ%K>z>% delta 7040 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 Y>x#_B?rwE=bTpaY-o0Po{dF(?5BP#~$p8QV From a4bb0f13aa656ef26c5621d6977d28517c7843c2 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 25 Aug 2013 21:32:02 +1200 Subject: [PATCH 6/8] Update the mono install prompt text too. --- .../Release/OpenRA.app/Contents/MacOS/OpenRA | Bin 23904 -> 23904 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA index ebf2dd9e9972ee96959bc9d4584f42e8a34dec14..56d2aedbe79f2c325271e2470c18f8cacd066919 100755 GIT binary patch delta 28 jcmaE`i}ArO#tp8TyoLq}`9%sji6yB;dJLO`H2F*bpJEA` delta 28 jcmaE`i}ArO#tp8Tyk>gl3i(9}If*5yMS7cqH2F*bpQ8!X From 19039ae37d09a484ef37d0ac005884e7a0e0edd3 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 25 Aug 2013 21:33:58 +1200 Subject: [PATCH 7/8] Update source code to match. --- OpenRA.Launcher.Mac/Controller.m | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenRA.Launcher.Mac/Controller.m b/OpenRA.Launcher.Mac/Controller.m index 3e2a965484..c3cb70d599 100644 --- a/OpenRA.Launcher.Mac/Controller.m +++ b/OpenRA.Launcher.Mac/Controller.m @@ -28,7 +28,7 @@ extern char **environ; defaultButton:@"Download Mono" alternateButton:@"Quit" otherButton:nil - informativeTextWithFormat:@"OpenRA requires the Mono Framework version 2.6.7 or later."]; + informativeTextWithFormat:@"OpenRA requires the Mono Framework version 2.10 or later."]; if ([alert runModal] == NSAlertDefaultReturn) [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.go-mono.com/mono-downloads/download.html"]]; @@ -153,9 +153,7 @@ extern char **environ; sscanf([ret UTF8String], "Mono JIT compiler version %d.%d.%d", &major, &minor, &point); [ret release]; - return (major > 2 || - (major == 2 && minor > 6) || - (major == 2 && minor == 6 && point >= 7)); + return (major > 2 || (major == 2 && minor >= 10)); } - (void)dealloc From f17e976f45014704b216cfffa75c2658e71229b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 25 Aug 2013 13:01:05 +0200 Subject: [PATCH 8/8] bump mono runtime version to 2.10 for Debian --- packaging/linux/deb/DEBIAN/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index 5d35b5b187..536d9dfd3d 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -3,7 +3,7 @@ Version: {VERSION} Architecture: all Maintainer: Chris Forbes Installed-Size: {SIZE} -Depends: libopenal1, mono-runtime (>= 2.6.7), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil +Depends: libopenal1, mono-runtime (>= 2.10), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil Section: games Priority: extra Homepage: http://www.open-ra.org/