Update to 4.21.2

15 files changed, 336 insertions, 268 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06dfb853958f..75c9a19d762a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jan  4 23:09:21 UTC 2019
+# Wed Jan 30 01:30:04 UTC 2019
 pkgbase = unreal-engine
 	pkgdesc = A 3D game engine by Epic Games which can be used non-commercially for free.
-	pkgver = 4.21.1
+	pkgver = 4.21.2
 	pkgrel = 1
 	url = https://www.unrealengine.com/
 	install = unreal-engine.install
@@ -17,47 +17,25 @@ pkgbase = unreal-engine
 	depends = sdl2
 	depends = python
 	depends = lld
-	optdepends = xdg-user-dirs: manage user directories in non-english language
+	depends = xdg-user-dirs
 	options = strip
 	options = staticlibs
-	source = git+ssh://git@github.com/EpicGames/UnrealEngine.git#tag=4.21.1-release
+	source = git+ssh://git@github.com/EpicGames/UnrealEngine.git#tag=4.21.2-release
 	source = UE4Editor.desktop
-	source = ignore-return-value-error.patch
-	source = only-generate-makefile.patch
 	source = html5-build.patch
 	source = recompile-version-selector.patch
 	source = Makefile
 	source = ignore-clang50-install.patch
 	source = use-arch-mono.patch
 	source = clang-70-support.patch
-	source = CodeGenerator-move.patch
-	source = UnrealSourceFile-move.patch
-	source = Platform-bitwise-or.patch
-	source = no-pie.patch
-	source = SBlueprintPalette.patch
-	source = Player-move.patch
-	source = UnrealExporter-move.patch
-	source = NiagaraScriptViewModel-self-assign-fix.patch
-	source = Messages-move.patch
 	sha256sums = SKIP
 	sha256sums = 46871ed662a3c97698be609d27da280d9000ec97183f1fa6592986f9910a2118
-	sha256sums = 918dff809a7e815343a8d233f704f52a910b8f01a9cb3d29de541a0334fecc7c
-	sha256sums = ab3e7981da6da4473717aef0bce9d550aacad02f9260f98d5b7a0bb3374a959a
 	sha256sums = 9fd6d16d56fbe0489a2580b86359df84b83a6987b5760a9e57ae0898f51943ac
 	sha256sums = 1dd876fa48c6fb4fcd4ccbdb8ed4ceccfa294685911e91be58bbc5e95726c279
 	sha256sums = 9654226ef3318389aa8fe15f3d4d14e7ac2113520ee5ebf2899d42273a2a6fb0
-	sha256sums = eab5ba97327de2b8b17aea73ffd797a882fe0d1923ed2a8dc1709a8b00da63e4
+	sha256sums = 71a7304deebb00234c323eed9a73cdbd022099ba65f62fc90e78069eceed1f5d
 	sha256sums = 006bfc6dc6c4258b55768cac34a3c42f033a2777332272d8c47c340282bf400f
-	sha256sums = 3cee7cf7cb8c7b8fc65a423b4e51ea00c8b025784b21838e5def7c14fec60a0c
-	sha256sums = babf3d0def1ae135f68c194124c7ba04f57de0bbe98c53304fabd2e434d1e99e
-	sha256sums = 6b6dad7218e8700abbdc74692079b7e9d2295a656fb05a99330d170abf689c0a
-	sha256sums = be679f8b3b3085bd328e786d84c044f9d9eaa6315ab60d75447dfef5b6f4bd0b
-	sha256sums = 6ba1e4df6c5750db42db8a9731087ae9de8adcf242594d32c9ae162d9ad5c76c
-	sha256sums = 97119e06e91af6dfd54df07bdaea3dc342eb15177ce5c53f3746a8dd09a30768
-	sha256sums = 2557758219e0e8718652e102579d26a67f88ec45e61cc3457b2ebf0710bb036a
-	sha256sums = 83df14d25b75321f80c9132e72d99e7feafd294a78210f284101a5a8298aa38d
-	sha256sums = a0abe52f6ffe9b85b934e85a7077121461fab56f615f1714bdbc12afce5b2e82
-	sha256sums = 2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830
+	sha256sums = deb74af4561beb2eb62fdc3bee45347785b9bd07443939ad0bf0f1fd9f72a859
 
 pkgname = unreal-engine
 
diff --git a/CodeGenerator-move.patch b/CodeGenerator-move.patch
deleted file mode 100644
index 32e2362f4402..000000000000
--- a/CodeGenerator-move.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CodeGenerator.cpp	2018-10-12 15:09:53.933311716 -0500
-+++ CodeGenerator.cpp_new	2018-10-12 21:58:55.111028585 -0500
-@@ -2590,7 +2590,9 @@
- 		}
- 	}
- 
--	return Result;
-+	typedef FUHTStringBuilder &FUHTStringBuilderRef;
-+	FUHTStringBuilderRef &&Result_ref = Result;
-+	return (FUHTStringBuilder&&)Result_ref;
- }
- 
- void FNativeClassHeaderGenerator::ExportClassFromSourceFileInner(
diff --git a/Messages-move.patch b/Messages-move.patch
deleted file mode 100644
index 26a29e6043e9..000000000000
--- a/Messages-move.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Messages.h	2018-10-13 13:38:00.289005712 -0500
-+++ Messages_new.h	2018-10-14 00:07:54.826558760 -0500
-@@ -19,7 +19,9 @@
- 	TArray<uint8> AsData()
- 	{
- 		FBufferArchive MemAr;
--		return MemAr;
-+		typedef FBufferArchive &FBufferArchiveRef;
-+		FBufferArchiveRef &&MemAr_ref = MemAr;
-+		return (FBufferArchive&&)MemAr_ref; 
- 	}
- };
- 
-@@ -47,7 +49,9 @@
- 	{
- 		FBufferArchive MemAr;
- 		MemAr << Param1 << Param2;
--		return MemAr;
-+		typedef FBufferArchive &FBufferArchiveRef;
-+		FBufferArchiveRef &&MemAr_ref = MemAr;
-+		return (FBufferArchive&&)MemAr_ref; 
- 	}
- };
- 
-@@ -79,7 +83,9 @@
- 	{
- 		FBufferArchive MemAr;
- 		MemAr << Param1 << Param2 << Param3;
--		return MemAr;
-+		typedef FBufferArchive &FBufferArchiveRef;
-+		FBufferArchiveRef &&MemAr_ref = MemAr;
-+		return (FBufferArchive&&)MemAr_ref; 
- 	}
- };
- 
-@@ -115,7 +121,9 @@
- 	{
- 		FBufferArchive MemAr;
- 		MemAr << Param1 << Param2 << Param3 << Param4;
--		return MemAr;
-+		typedef FBufferArchive &FBufferArchiveRef;
-+		FBufferArchiveRef &&MemAr_ref = MemAr;
-+		return (FBufferArchive&&)MemAr_ref; 
- 	}
- };
- 
-@@ -155,6 +163,8 @@
- 	{
- 		FBufferArchive MemAr;
- 		MemAr << Param1 << Param2 << Param3 << Param4 << Param5;
--		return MemAr;
-+		typedef FBufferArchive &FBufferArchiveRef;
-+		FBufferArchiveRef &&MemAr_ref = MemAr;
-+		return (FBufferArchive&&)MemAr_ref; 
- 	}
- };
diff --git a/NiagaraScriptViewModel-self-assign-fix.patch b/NiagaraScriptViewModel-self-assign-fix.patch
deleted file mode 100644
index 76d57d68c858..000000000000
--- a/NiagaraScriptViewModel-self-assign-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- NiagaraScriptViewModel.cpp	2018-10-13 13:38:00.309005882 -0500
-+++ NiagaraScriptViewModel_new.cpp	2018-10-13 23:55:08.563280628 -0500
-@@ -298,7 +298,6 @@
- 		ENiagaraScriptCompileStatus ScriptStatus = Scripts[i]->GetLastCompileStatus();
- 		if (Scripts[i].IsValid() && Scripts[i]->IsCompilable() && Scripts[i]->GetVMExecutableData().IsValid() && Scripts[i]->GetVMExecutableData().ByteCode.Num() == 0) // This is either a brand new script or failed in the past. Since we create a default working script, assume invalid.
- 		{
--			LastCompileStatus = LastCompileStatus;
- 			Message = TEXT("Please recompile for full error stack.");
- 			GraphViewModel->SetErrorTextToolTip(Message);
- 		}
diff --git a/PKGBUILD b/PKGBUILD
index fbd396d35cce..2170e21ee0ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname='unreal-engine'
 install="$pkgname.install"
-pkgver=4.21.1
+pkgver=4.21.2
 # shellcheck disable=SC2034
 {
   pkgrel=1
@@ -18,51 +18,28 @@ pkgver=4.21.1
   arch=('x86_64')
   url='https://www.unrealengine.com/'
   makedepends=('clang' 'mono' 'dos2unix' 'cmake' 'git')
-  depends=('icu' 'sdl2' 'python' 'lld')
-  optdepends=('xdg-user-dirs: manage user directories in non-english language')
+  depends=('icu' 'sdl2' 'python' 'lld' 'xdg-user-dirs')
   license=('custom:UnrealEngine')
 
   source=(
     "git+ssh://git@github.com/EpicGames/UnrealEngine.git#tag=$pkgver-release"
     'UE4Editor.desktop'
-    'ignore-return-value-error.patch'
-    'only-generate-makefile.patch'
     'html5-build.patch'
     'recompile-version-selector.patch'
     'Makefile'
     'ignore-clang50-install.patch'
     'use-arch-mono.patch'
     'clang-70-support.patch'
-    'CodeGenerator-move.patch'
-    'UnrealSourceFile-move.patch'
-    'Platform-bitwise-or.patch' 
-    'no-pie.patch'
-    'SBlueprintPalette.patch'
-    'Player-move.patch'
-    'UnrealExporter-move.patch'
-    'NiagaraScriptViewModel-self-assign-fix.patch'
-    'Messages-move.patch'
   )
 
 sha256sums=('SKIP'
             '46871ed662a3c97698be609d27da280d9000ec97183f1fa6592986f9910a2118'
-            '918dff809a7e815343a8d233f704f52a910b8f01a9cb3d29de541a0334fecc7c'
-            'ab3e7981da6da4473717aef0bce9d550aacad02f9260f98d5b7a0bb3374a959a'
             '9fd6d16d56fbe0489a2580b86359df84b83a6987b5760a9e57ae0898f51943ac'
             '1dd876fa48c6fb4fcd4ccbdb8ed4ceccfa294685911e91be58bbc5e95726c279'
             '9654226ef3318389aa8fe15f3d4d14e7ac2113520ee5ebf2899d42273a2a6fb0'
-            'eab5ba97327de2b8b17aea73ffd797a882fe0d1923ed2a8dc1709a8b00da63e4'
+            '71a7304deebb00234c323eed9a73cdbd022099ba65f62fc90e78069eceed1f5d'
             '006bfc6dc6c4258b55768cac34a3c42f033a2777332272d8c47c340282bf400f'
-            '3cee7cf7cb8c7b8fc65a423b4e51ea00c8b025784b21838e5def7c14fec60a0c'
-            'babf3d0def1ae135f68c194124c7ba04f57de0bbe98c53304fabd2e434d1e99e'
-            '6b6dad7218e8700abbdc74692079b7e9d2295a656fb05a99330d170abf689c0a'
-            'be679f8b3b3085bd328e786d84c044f9d9eaa6315ab60d75447dfef5b6f4bd0b'
-            '6ba1e4df6c5750db42db8a9731087ae9de8adcf242594d32c9ae162d9ad5c76c'
-            '97119e06e91af6dfd54df07bdaea3dc342eb15177ce5c53f3746a8dd09a30768'
-            '2557758219e0e8718652e102579d26a67f88ec45e61cc3457b2ebf0710bb036a'
-            '83df14d25b75321f80c9132e72d99e7feafd294a78210f284101a5a8298aa38d'
-            'a0abe52f6ffe9b85b934e85a7077121461fab56f615f1714bdbc12afce5b2e82'
-            '2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830')
+            'deb74af4561beb2eb62fdc3bee45347785b9bd07443939ad0bf0f1fd9f72a859')
 
   # Package is 3 Gib smaller with "strip" but it's skipped because it takes a long time and generates many warnings
   options=(strip staticlibs)
@@ -78,35 +55,13 @@ prepare() {
   patch "$srcdir/UnrealEngine/Engine/Build/BatchFiles/Linux/SetupMono.sh" use-arch-mono.patch
   patch "$srcdir/UnrealEngine/Setup.sh" recompile-version-selector.patch
 
-  patch "$ue4src/Runtime/Engine/Private/Player.cpp" Player-move.patch
-  patch "$ue4src/Runtime/Engine/Private/UnrealExporter.cpp" UnrealExporter-move.patch
-
-  plugins="$srcdir/UnrealEngine/Engine/Plugins"
-  niagaraEditor="$plugins/FX/Niagara/Source/NiagaraEditor"
-  patch "$niagaraEditor/Private/ViewModels/NiagaraScriptViewModel.cpp" NiagaraScriptViewModel-self-assign-fix.patch
-
-  remoteSession="$plugins/Experimental/RemoteSession/Source/RemoteSession"
-  patch "$remoteSession/Private/MessageHandler/Messages.h" Messages-move.patch
-
-
-  kismet="$ue4src/Editor/Kismet/Private"
-  patch "$kismet/SBlueprintPalette.cpp" SBlueprintPalette.patch
-
-  uht="$ue4src/Programs/UnrealHeaderTool/Private"
-  patch "$uht/CodeGenerator.cpp" CodeGenerator-move.patch
-  patch "$uht/UnrealSourceFile.cpp" UnrealSourceFile-move.patch
-  
-  hal="$ue4src/Runtime/Core/Public/HAL"
-  patch "$hal/Platform.h" Platform-bitwise-or.patch
-
-  linuxToolChain="$ue4src/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs"
-  patch "$linuxToolChain" no-pie.patch
-  patch "$linuxToolChain" ignore-return-value-error.patch
-  patch "$linuxToolChain" clang-70-support.patch
+  #/tmp/makepkg/unreal-engine/src/UnrealEngine /tmp/makepkg/unreal-engine/src
+  pushd "$srcdir/UnrealEngine" > /dev/null
+  patch -p1 -i ../clang-70-support.patch 
+  popd > /dev/null
 
   cp "$srcdir/Makefile" "$srcdir/UnrealEngine/Makefile"
 
-  patch -p0 -i only-generate-makefile.patch
   # Source Code Accessors
 
   # CodeLite (Fully integrated)
@@ -132,7 +87,7 @@ prepare() {
 
   patch "$ue4src/Programs/UnrealBuildTool/Platform/HTML5/HTML5SDKInfo.cs" "$srcdir/html5-build.patch"
   echo "generating project files"
-  ./GenerateProjectFiles.sh
+  ./GenerateProjectFiles.sh -makefile
 }
 
 build() {
diff --git a/Platform-bitwise-or.patch b/Platform-bitwise-or.patch
deleted file mode 100644
index 491d8f224668..000000000000
--- a/Platform-bitwise-or.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Platform.h	2018-10-11 14:05:07.503192188 -0500
-+++ Platform.h_new	2018-10-11 14:52:43.025935194 -0500
-@@ -802,7 +802,7 @@
- 	static_assert((!TAreTypesEqual<ANSICHAR, WIDECHAR>::Value), "ANSICHAR and WIDECHAR should be different types.");
- 	static_assert((!TAreTypesEqual<ANSICHAR, UCS2CHAR>::Value), "ANSICHAR and CHAR16 should be different types.");
- 	static_assert((!TAreTypesEqual<WIDECHAR, UCS2CHAR>::Value), "WIDECHAR and CHAR16 should be different types.");
--	static_assert((TAreTypesEqual<TCHAR, ANSICHAR>::Value || TAreTypesEqual<TCHAR, WIDECHAR>::Value), "TCHAR should either be ANSICHAR or WIDECHAR.");
-+	static_assert((TAreTypesEqual<TCHAR, ANSICHAR>::Value | TAreTypesEqual<TCHAR, WIDECHAR>::Value), "TCHAR should either be ANSICHAR or WIDECHAR.");
- 
- 	static_assert(sizeof(uint8) == 1, "BYTE type size test failed.");
- 	static_assert(int32(uint8(-1)) == 0xFF, "BYTE type sign test failed.");
diff --git a/Player-move.patch b/Player-move.patch
deleted file mode 100644
index 188cf64fee12..000000000000
--- a/Player-move.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Player.cpp	2018-10-13 13:38:00.969011532 -0500
-+++ Player_new.cpp	2018-10-13 23:40:51.971677987 -0500
-@@ -64,7 +64,9 @@
- 
- 	if (!bWriteToLog)
- 	{
--		return StrOut;
-+		typedef FConsoleOutputDevice &FConsoleOutputDeviceRef;
-+		FConsoleOutputDeviceRef &&StrOut_ref = StrOut;
-+		return (FConsoleOutputDevice&&)StrOut_ref; 
- 	}
- 
- 	return TEXT("");
diff --git a/SBlueprintPalette.patch b/SBlueprintPalette.patch
deleted file mode 100644
index 905785ca5521..000000000000
--- a/SBlueprintPalette.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- SBlueprintPalette.cpp	2018-10-13 13:38:00.569008108 -0500
-+++ SBlueprintPalette_new.cpp	2018-10-13 23:05:58.184420516 -0500
-@@ -317,10 +317,6 @@
- 		{
- 			ToolTipOut = NodeToolTipText;
- 		}
--		else
--		{
--			ToolTipOut = ToolTipOut;
--		}
- 
- 		// Ask node for a palette icon
- 		FLinearColor IconLinearColor = FLinearColor::White;
diff --git a/UnrealExporter-move.patch b/UnrealExporter-move.patch
deleted file mode 100644
index 41f32d642c91..000000000000
--- a/UnrealExporter-move.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- UnrealExporter.cpp	2018-10-13 13:38:00.979011618 -0500
-+++ UnrealExporter_new.cpp	2018-10-13 23:49:58.100180446 -0500
-@@ -865,7 +865,10 @@
- 	Output.Logf(TEXT("Components for '%s':\r\n"), *Object->GetFullName());
- 	ExportProperties(NULL, Output, Object->GetClass(), (uint8*)Object, 2, NULL, NULL, Object, PPF_SubobjectsOnly);
- 	Output.Logf(TEXT("<--- DONE!\r\n"));
--	return Output;
-+
-+	typedef FStringOutputDevice &FStringOutputDeviceRef;
-+	FStringOutputDeviceRef &&Output_ref = Output;
-+	return (FStringOutputDevice&&)Output_ref; 
- }
- 
- 
-@@ -885,5 +888,7 @@
- 	const FExportObjectInnerContext Context;
- 	UExporter::ExportToOutputDevice(&Context, Object, NULL, Archive, TEXT("copy"), 0, PPF_Copy | PPF_DebugDump, false);
- 
--	return Archive;
-+	typedef FStringOutputDevice &FStringOutputDeviceRef;
-+	FStringOutputDeviceRef && Archive_ref = Archive;
-+	return (FStringOutputDevice&&)Archive_ref;
- }
diff --git a/UnrealSourceFile-move.patch b/UnrealSourceFile-move.patch
deleted file mode 100644
index 29873f69d59a..000000000000
--- a/UnrealSourceFile-move.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- UnrealSourceFile.cpp	2018-10-12 22:40:20.667309568 -0500
-+++ UnrealSourceFile.cpp_new	2018-10-12 22:39:50.387963519 -0500
-@@ -46,7 +46,9 @@
- 		}
- 	}
- 
--	return Out;
-+	typedef FStringOutputDevice &FStringOutputDeviceRef;
-+	FStringOutputDeviceRef &&Out_ref = Out;
-+	return (FStringOutputDevice&&)Out_ref;
- }
- 
- FString FUnrealSourceFile::GetStrippedFilename() const
diff --git a/clang-70-support.patch b/clang-70-support.patch
index 4c6adb461f51..7fb2fe35413e 100644
--- a/clang-70-support.patch
+++ b/clang-70-support.patch
@@ -1,6 +1,189 @@
---- LinuxToolChain.cs	2018-10-10 21:03:32.148896937 -0500
-+++ LinuxToolChain.cs_new	2018-10-10 21:11:47.556037751 -0500
-@@ -137,7 +137,7 @@
+From efa3fd24e2b05d8ca64f342b3fe9dc6940a0b653 Mon Sep 17 00:00:00 2001
+From: Zerophase <mikelojkovic@gmail.com>
+Date: Sat, 5 Jan 2019 01:14:30 -0600
+Subject: [PATCH 1/5] Fix no-pie support for clang
+
+---
+ .../Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
+index 1cbe22dcb55..46d3559d932 100644
+--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
++++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
+@@ -924,7 +924,7 @@ namespace UnrealBuildTool
+ 			Result += " -Wl,--build-id";
+ 			if (bSuppressPIE && !LinkEnvironment.bIsBuildingDLL)
+ 			{
+-				Result += " -Wl,-nopie";
++				Result += " -Wl,--no-pie";
+ 			}
+ 
+ 			// whether we actually can do that is checked in CanUseLTO() earlier
+-- 
+2.20.1
+
+
+From 55a7d2ae886a037a59d0f20b843e6bdbbec5d3f1 Mon Sep 17 00:00:00 2001
+From: Zerophase <mikelojkovic@gmail.com>
+Date: Sat, 5 Jan 2019 06:40:26 -0600
+Subject: [PATCH 2/5] Fix clang error -Wconstant-logical-operand
+
+---
+ Engine/Source/Runtime/Core/Public/HAL/Platform.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Engine/Source/Runtime/Core/Public/HAL/Platform.h b/Engine/Source/Runtime/Core/Public/HAL/Platform.h
+index 853a9e0512c..edb6497d636 100644
+--- a/Engine/Source/Runtime/Core/Public/HAL/Platform.h
++++ b/Engine/Source/Runtime/Core/Public/HAL/Platform.h
+@@ -822,7 +822,7 @@ namespace TypeTests
+ 	static_assert((!TAreTypesEqual<ANSICHAR, WIDECHAR>::Value), "ANSICHAR and WIDECHAR should be different types.");
+ 	static_assert((!TAreTypesEqual<ANSICHAR, UCS2CHAR>::Value), "ANSICHAR and CHAR16 should be different types.");
+ 	static_assert((!TAreTypesEqual<WIDECHAR, UCS2CHAR>::Value), "WIDECHAR and CHAR16 should be different types.");
+-	static_assert((TAreTypesEqual<TCHAR, ANSICHAR>::Value || TAreTypesEqual<TCHAR, WIDECHAR>::Value), "TCHAR should either be ANSICHAR or WIDECHAR.");
++	static_assert((TAreTypesEqual<TCHAR, ANSICHAR>::Value | TAreTypesEqual<TCHAR, WIDECHAR>::Value), "TCHAR should either be ANSICHAR or WIDECHAR.");
+ 
+ 	static_assert(sizeof(uint8) == 1, "BYTE type size test failed.");
+ 	static_assert(int32(uint8(-1)) == 0xFF, "BYTE type sign test failed.");
+-- 
+2.20.1
+
+
+From b0b12145255abe924236127607e2856b1ff601b4 Mon Sep 17 00:00:00 2001
+From: Zerophase <mikelojkovic@gmail.com>
+Date: Sat, 5 Jan 2019 06:49:25 -0600
+Subject: [PATCH 3/5] Uses move constructor explictly, when values returned by
+ name, to avoid copying
+
+---
+ .../Source/RemoteSession/Private/MessageHandler/Messages.h       | 1 +
+ Engine/Source/Runtime/Engine/Private/Player.cpp                  | 1 +
+ Engine/Source/Runtime/Engine/Private/UnrealExporter.cpp          | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/Messages.h b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/Messages.h
+index f57d3dbd808..d4c9bcaeae9 100644
+--- a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/Messages.h
++++ b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/Messages.h
+@@ -5,6 +5,7 @@
+ #include "CoreMinimal.h"
+ #include "Serialization/BufferArchive.h"
+ #include "Serialization/MemoryReader.h"
++#include "Templates/UnrealTemplate.h"
+ 
+ struct NoParamMsg
+ {
+diff --git a/Engine/Source/Runtime/Engine/Private/Player.cpp b/Engine/Source/Runtime/Engine/Private/Player.cpp
+index d082c22e375..19b60d725e0 100644
+--- a/Engine/Source/Runtime/Engine/Private/Player.cpp
++++ b/Engine/Source/Runtime/Engine/Private/Player.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "GameFramework/CheatManager.h"
+ #include "GameFramework/GameStateBase.h"
++#include "Templates/UnrealTemplate.h"
+ 
+ //////////////////////////////////////////////////////////////////////////
+ // UPlayer
+diff --git a/Engine/Source/Runtime/Engine/Private/UnrealExporter.cpp b/Engine/Source/Runtime/Engine/Private/UnrealExporter.cpp
+index 9cdc271cc18..03d7c83ee2c 100644
+--- a/Engine/Source/Runtime/Engine/Private/UnrealExporter.cpp
++++ b/Engine/Source/Runtime/Engine/Private/UnrealExporter.cpp
+@@ -25,6 +25,7 @@
+ #include "Misc/FeedbackContext.h"
+ #include "AssetExportTask.h"
+ #include "UObject/GCObjectScopeGuard.h"
++#include "Templates/UnrealTemplate.h"
+ 
+ DEFINE_LOG_CATEGORY_STATIC(LogExporter, Log, All);
+ 
+-- 
+2.20.1
+
+
+From af58ce094487ce3f6aaf504d56def813dd5583fc Mon Sep 17 00:00:00 2001
+From: Zerophase <mikelojkovic@gmail.com>
+Date: Mon, 7 Jan 2019 21:58:14 -0600
+Subject: [PATCH 4/5] change --no-pie to -no-pie
+
+---
+ .../Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
+index 46d3559d932..58f6df1ef14 100644
+--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
++++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
+@@ -924,7 +924,7 @@ namespace UnrealBuildTool
+ 			Result += " -Wl,--build-id";
+ 			if (bSuppressPIE && !LinkEnvironment.bIsBuildingDLL)
+ 			{
+-				Result += " -Wl,--no-pie";
++				Result += " -Wl,-no-pie";
+ 			}
+ 
+ 			// whether we actually can do that is checked in CanUseLTO() earlier
+-- 
+2.20.1
+
+
+From 203ecda2cb48fabcd57ede14655f744f04e78145 Mon Sep 17 00:00:00 2001
+From: Zerophase <mikelojkovic@gmail.com>
+Date: Mon, 7 Jan 2019 23:22:46 -0600
+Subject: [PATCH 5/5] Switches usage of Move to MoveTemp for resolving
+ Wreturn-std-move error
+
+---
+ .../Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp   | 1 -
+ .../Programs/UnrealHeaderTool/Private/UnrealSourceFile.cpp       | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp b/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp
+index e3f6de7aa5a..e80cb179174 100644
+--- a/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp
++++ b/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp
+@@ -2617,7 +2617,6 @@ static FString PrivatePropertiesOffsetGetters(const UStruct* Struct, const FStri
+				*PropertyName, *StructCppName, *PropertyName);
+		}
+	}
+-
+-	return Result;
++ return MoveTemp(Result);
+ }
+ 
+diff --git a/Engine/Source/Programs/UnrealHeaderTool/Private/UnrealSourceFile.cpp b/Engine/Source/Programs/UnrealHeaderTool/Private/UnrealSourceFile.cpp
+index c90166540cb..173a2518431 100644
+--- a/Engine/Source/Programs/UnrealHeaderTool/Private/UnrealSourceFile.cpp
++++ b/Engine/Source/Programs/UnrealHeaderTool/Private/UnrealSourceFile.cpp
+@@ -45,7 +45,6 @@ FString FUnrealSourceFile::GetFileId() const
+ 			Out.AppendChar('_');
+ 		}
+ 	}
+-
+-	return Out;
++ return MoveTemp(Out);
+ }
+ 
+-- 
+2.20.1
+
+diff --git a/Engine/Source/Runtime/Engine/Private/TimerManager.cpp b/Engine/Source/Runtime/Engine/Private/TimerManager.cpp
+index a3645ce3d67..cff60942cc3 100644
+--- a/Engine/Source/Runtime/Engine/Private/TimerManager.cpp
++++ b/Engine/Source/Runtime/Engine/Private/TimerManager.cpp
+@@ -42,7 +42,7 @@ namespace
+ 	{
+ 		FStringOutputDevice Output;
+ 		DescribeFTimerDataSafely(Output, Data);
+-		return Output;
++		return MoveTemp(Output);
+ 	}
+ }
+ 
+--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs	2019-01-29 18:23:29.935169346 -0600
++++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs	2019-01-27 15:09:29.820085074 -0600
+@@ -171,10 +171,10 @@
  				throw new BuildException("Unable to build: no compatible clang version found. Please run Setup.sh");
  			}
  			// prevent unknown clangs since the build is likely to fail on too old or too new compilers
@@ -8,4 +191,137 @@
 +			else if ((CompilerVersionMajor * 10 + CompilerVersionMinor) > 70 || (CompilerVersionMajor * 10 + CompilerVersionMinor) < 38)
  			{
  				throw new BuildException(
- 					string.Format("This version of the Unreal Engine can only be compiled with clang 6.0, 5.0, 4.0, 3.9, 3.8. clang {0} may not build it - please use a different version.",
+-					string.Format("This version of the Unreal Engine can only be compiled with clang 6.0, 5.0, 4.0, 3.9, 3.8. clang {0} may not build it - please use a different version.",
++					string.Format("This version of the Unreal Engine can only be compiled with clang 7.0, 6.0, 5.0, 4.0, 3.9, 3.8. clang {0} may not build it - please use a different version.",
+ 						CompilerVersionString)
+ 					);
+ 			}
+--- a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/Messages.h	2019-01-29 18:39:14.528390396 -0600
++++ b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/Messages.h	2019-01-27 15:01:57.569942558 -0600
+@@ -1,4 +1,4 @@
+-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
++// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+ 
+ #pragma once
+ 
+@@ -20,7 +20,7 @@
+ 	TArray<uint8> AsData()
+ 	{
+ 		FBufferArchive MemAr;
+-		return MemAr;
++		return MoveTemp(MemAr);
+ 	}
+ };
+ 
+@@ -48,7 +48,7 @@
+ 	{
+ 		FBufferArchive MemAr;
+ 		MemAr << Param1 << Param2;
+-		return MemAr;
++		return MoveTemp(MemAr);
+ 	}
+ };
+ 
+@@ -80,7 +80,7 @@
+ 	{
+ 		FBufferArchive MemAr;
+ 		MemAr << Param1 << Param2 << Param3;
+-		return MemAr;
++		return MoveTemp(MemAr);
+ 	}
+ };
+ 
+@@ -116,7 +116,7 @@
+ 	{
+ 		FBufferArchive MemAr;
+ 		MemAr << Param1 << Param2 << Param3 << Param4;
+-		return MemAr;
++		return MoveTemp(MemAr);
+ 	}
+ };
+ 
+@@ -156,6 +156,6 @@
+ 	{
+ 		FBufferArchive MemAr;
+ 		MemAr << Param1 << Param2 << Param3 << Param4 << Param5;
+-		return MemAr;
++		return MoveTemp(MemAr);
+ 	}
+ };
+--- a/Engine/Source/Runtime/Engine/Private/Player.cpp	2019-01-29 18:39:14.528390396 -0600
++++ b/Engine/Source/Runtime/Engine/Private/Player.cpp	2019-01-27 15:04:39.436398242 -0600
+@@ -1,4 +1,4 @@
+-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
++// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+ 
+ /*=============================================================================
+ 	Player.cpp: Unreal player implementation.
+@@ -65,7 +65,7 @@
+ 
+ 	if (!bWriteToLog)
+ 	{
+-		return StrOut;
++		return MoveTemp(StrOut);
+ 	}
+ 
+ 	return TEXT("");
+--- a/Engine/Source/Runtime/Engine/Private/UnrealExporter.cpp	2019-01-29 18:39:14.528390396 -0600
++++ b/Engine/Source/Runtime/Engine/Private/UnrealExporter.cpp	2019-01-27 18:31:30.304177510 -0600
+@@ -1,4 +1,4 @@
+-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
++// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+ 
+ /*=============================================================================
+ 	UExporter.cpp: Exporter class implementation.
+@@ -870,7 +870,8 @@
+ 	Output.Logf(TEXT("Components for '%s':\r\n"), *Object->GetFullName());
+ 	ExportProperties(NULL, Output, Object->GetClass(), (uint8*)Object, 2, NULL, NULL, Object, PPF_SubobjectsOnly);
+ 	Output.Logf(TEXT("<--- DONE!\r\n"));
+-	return Output;
++
++	return MoveTemp(Output);
+ }
+ 
+ 
+@@ -890,5 +891,5 @@
+ 	const FExportObjectInnerContext Context;
+ 	UExporter::ExportToOutputDevice(&Context, Object, NULL, Archive, TEXT("copy"), 0, PPF_Copy | PPF_DebugDump, false);
+ 
+-	return Archive;
++	return MoveTemp(Archive);
+ }
+--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/ViewModels/NiagaraScriptViewModel.cpp	2019-01-29 17:49:54.610116866 -0600
++++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/ViewModels/NiagaraScriptViewModel.cpp	2019-01-27 11:17:57.796011354 -0600
+@@ -1,4 +1,4 @@
+-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
++// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+ 
+ #include "NiagaraScriptViewModel.h"
+ #include "NiagaraScript.h"
+@@ -298,7 +298,6 @@
+ 		ENiagaraScriptCompileStatus ScriptStatus = Scripts[i]->GetLastCompileStatus();
+ 		if (Scripts[i].IsValid() && Scripts[i]->IsCompilable() && Scripts[i]->GetVMExecutableData().IsValid() && Scripts[i]->GetVMExecutableData().ByteCode.Num() == 0) // This is either a brand new script or failed in the past. Since we create a default working script, assume invalid.
+ 		{
+-			LastCompileStatus = LastCompileStatus;
+ 			Message = TEXT("Please recompile for full error stack.");
+ 			GraphViewModel->SetErrorTextToolTip(Message);
+ 		}
+--- a/Engine/Source/Editor/Kismet/Private/SBlueprintPalette.cpp	2019-01-29 17:49:54.880099978 -0600
++++ b/Engine/Source/Editor/Kismet/Private/SBlueprintPalette.cpp	2019-01-27 11:17:57.986007265 -0600
+@@ -1,4 +1,4 @@
+-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
++// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+ 
+ #include "SBlueprintPalette.h"
+ #include "Widgets/IToolTip.h"
+@@ -318,10 +318,6 @@
+ 		{
+ 			ToolTipOut = NodeToolTipText;
+ 		}
+-		else
+-		{
+-			ToolTipOut = ToolTipOut;
+-		}
+ 
+ 		// Ask node for a palette icon
+ 		FLinearColor IconLinearColor = FLinearColor::White;
diff --git a/ignore-clang50-install.patch b/ignore-clang50-install.patch
index 6edcf7d55b5c..3a94a919c886 100644
--- a/ignore-clang50-install.patch
+++ b/ignore-clang50-install.patch
@@ -5,7 +5,7 @@
  
  # Install our bundled toolchain unless we are running a Perforce build or a an our of source toolchain is available.
 -if [ ! -f Build/PerforceBuild.txt ] && [ -z "$LINUX_MULTIARCH_ROOT" ] && [ -z "$UE_SDKS_ROOT" ]; then
-+if [ ! -f Build/PerforceBuild.txt ] && [["$ID" != "arch" ]] && [ -z "$LINUX_MULTIARCH_ROOT" ] && [ -z "$UE_SDKS_ROOT" ]; then
++if [ ! -f Build/PerforceBuild.txt ] && [[ "$ID" != "arch" ]] && [ -z "$LINUX_MULTIARCH_ROOT" ] && [ -z "$UE_SDKS_ROOT" ]; then
    echo "Installing a bundled clang toolchain"
    pushd Build/BatchFiles/Linux > /dev/null
    ./SetupToolchain.sh
diff --git a/ignore-return-value-error.patch b/ignore-return-value-error.patch
deleted file mode 100644
index 8674487c0070..000000000000
--- a/ignore-return-value-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/UnrealEngine/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs.orig	2017-04-23 13:59:57.476068918 -0400
-+++ ./src/UnrealEngine/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs	2017-04-23 14:42:48.021739418 -0400
-@@ -387,6 +387,8 @@
- 			Result += " -Wno-unused-variable";
- 			// this will hide the warnings about static functions in headers that aren't used in every single .cpp file
- 			Result += " -Wno-unused-function";
-+			// suppress errors about ignoring return value of function
-+			Result += " -Wno-unused-result";
- 			// this hides the "enumeration value 'XXXXX' not handled in switch [-Wswitch]" warnings - we should maybe remove this at some point and add UE_LOG(, Fatal, ) to default cases
- 			Result += " -Wno-switch";
- 			Result += " -Wno-unknown-pragmas";			// Slate triggers this (with its optimize on/off pragmas)
diff --git a/no-pie.patch b/no-pie.patch
deleted file mode 100644
index f6be2573bc24..000000000000
--- a/no-pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- LinuxToolChain.cs	2018-10-12 22:43:55.832656436 -0500
-+++ LinuxToolChain.cs_new	2018-10-13 00:06:06.833791928 -0500
-@@ -816,7 +816,7 @@
- 			Result += " -Wl,--build-id";
- 			if (bSuppressPIE && !LinkEnvironment.bIsBuildingDLL)
- 			{
--				Result += " -Wl,-nopie";
-+				Result += " -Wl,--no-pie";
- 			}
- 
- 			// whether we actually can do that is checked in CanUseLTO() earlier
diff --git a/only-generate-makefile.patch b/only-generate-makefile.patch
deleted file mode 100644
index 0c0ee93b1de6..000000000000
--- a/only-generate-makefile.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- UnrealEngine/Engine/Build/BatchFiles/Linux/GenerateProjectFiles.sh	2017-09-18 16:43:36.818934026 -0500
-+++ -	2017-09-18 16:54:43.349891714 -0500
-@@ -28,5 +28,5 @@
- 
- # pass all parameters to UBT
--mono "$BASE_PATH/../../../Binaries/DotNET/UnrealBuildTool.exe" -projectfiles "$@"
-+mono "$BASE_PATH/../../../Binaries/DotNET/UnrealBuildTool.exe" -makefile