summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZerophase2018-11-09 01:23:44 -0600
committerZerophase2018-11-09 01:23:59 -0600
commit79168ec16e945253cf46fd4653580c4f807d6666 (patch)
tree2527349519745f6abb86eacdc8a3fc37be9291e3
parent2a7406a82e9b8c92697fb22eae9b3c59652faafd (diff)
downloadaur-79168ec16e945253cf46fd4653580c4f807d6666.tar.gz
Update to 4.21.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rw-r--r--UnrealVersionSelector-fstring-compat.patch22
-rw-r--r--ignore-clang50-install.patch12
4 files changed, 43 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fbf67e352ed..3bc38294264 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Oct 23 23:58:59 UTC 2018
+# Fri Nov 9 07:23:18 UTC 2018
pkgbase = unreal-engine
pkgdesc = A 3D game engine by Epic Games which can be used non-commercially for free.
- pkgver = 4.20.3
+ pkgver = 4.21.0
pkgrel = 1
url = https://www.unrealengine.com/
install = unreal-engine.install
@@ -21,7 +21,7 @@ pkgbase = unreal-engine
depends = lld
options = strip
options = staticlibs
- source = git+ssh://git@github.com/EpicGames/UnrealEngine.git#tag=4.20.3-release
+ source = git+ssh://git@github.com/EpicGames/UnrealEngine.git#tag=4.21.0-release
source = UE4Editor.desktop
source = ignore-return-value-error.patch
source = only-generate-makefile.patch
@@ -41,6 +41,7 @@ pkgbase = unreal-engine
source = UnrealExporter-move.patch
source = NiagaraScriptViewModel-self-assign-fix.patch
source = Messages-move.patch
+ source = UnrealVersionSelector-fstring-compat.patch
sha256sums = SKIP
sha256sums = 46871ed662a3c97698be609d27da280d9000ec97183f1fa6592986f9910a2118
sha256sums = 918dff809a7e815343a8d233f704f52a910b8f01a9cb3d29de541a0334fecc7c
@@ -49,7 +50,7 @@ pkgbase = unreal-engine
sha256sums = 23f55f7dffc98f5a8ef84520c7ef82bc9cca447433ad0405e3f9a319a29301ef
sha256sums = 1dd876fa48c6fb4fcd4ccbdb8ed4ceccfa294685911e91be58bbc5e95726c279
sha256sums = 9654226ef3318389aa8fe15f3d4d14e7ac2113520ee5ebf2899d42273a2a6fb0
- sha256sums = c1bb149410d6871a1858513d6253694452925a892d672f5705b2a7f96e5a1f36
+ sha256sums = eab5ba97327de2b8b17aea73ffd797a882fe0d1923ed2a8dc1709a8b00da63e4
sha256sums = 006bfc6dc6c4258b55768cac34a3c42f033a2777332272d8c47c340282bf400f
sha256sums = 3cee7cf7cb8c7b8fc65a423b4e51ea00c8b025784b21838e5def7c14fec60a0c
sha256sums = babf3d0def1ae135f68c194124c7ba04f57de0bbe98c53304fabd2e434d1e99e
@@ -61,6 +62,7 @@ pkgbase = unreal-engine
sha256sums = 83df14d25b75321f80c9132e72d99e7feafd294a78210f284101a5a8298aa38d
sha256sums = a0abe52f6ffe9b85b934e85a7077121461fab56f615f1714bdbc12afce5b2e82
sha256sums = 2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830
+ sha256sums = e8cedb798fb77200209e6315360bbfe13bb2660b61ba7a55a5164648fbe04d2a
pkgname = unreal-engine
diff --git a/PKGBUILD b/PKGBUILD
index 45e24ed4e8d..c360e8a9a96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
pkgname='unreal-engine'
install="$pkgname.install"
-pkgver=4.20.3
+pkgver=4.21.0
# shellcheck disable=SC2034
{
pkgrel=1
@@ -42,6 +42,7 @@ pkgver=4.20.3
'UnrealExporter-move.patch'
'NiagaraScriptViewModel-self-assign-fix.patch'
'Messages-move.patch'
+ 'UnrealVersionSelector-fstring-compat.patch'
)
sha256sums=('SKIP'
@@ -52,7 +53,7 @@ sha256sums=('SKIP'
'23f55f7dffc98f5a8ef84520c7ef82bc9cca447433ad0405e3f9a319a29301ef'
'1dd876fa48c6fb4fcd4ccbdb8ed4ceccfa294685911e91be58bbc5e95726c279'
'9654226ef3318389aa8fe15f3d4d14e7ac2113520ee5ebf2899d42273a2a6fb0'
- 'c1bb149410d6871a1858513d6253694452925a892d672f5705b2a7f96e5a1f36'
+ 'eab5ba97327de2b8b17aea73ffd797a882fe0d1923ed2a8dc1709a8b00da63e4'
'006bfc6dc6c4258b55768cac34a3c42f033a2777332272d8c47c340282bf400f'
'3cee7cf7cb8c7b8fc65a423b4e51ea00c8b025784b21838e5def7c14fec60a0c'
'babf3d0def1ae135f68c194124c7ba04f57de0bbe98c53304fabd2e434d1e99e'
@@ -63,7 +64,8 @@ sha256sums=('SKIP'
'2557758219e0e8718652e102579d26a67f88ec45e61cc3457b2ebf0710bb036a'
'83df14d25b75321f80c9132e72d99e7feafd294a78210f284101a5a8298aa38d'
'a0abe52f6ffe9b85b934e85a7077121461fab56f615f1714bdbc12afce5b2e82'
- '2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830')
+ '2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830'
+ 'e8cedb798fb77200209e6315360bbfe13bb2660b61ba7a55a5164648fbe04d2a')
# Package is 3 Gib smaller with "strip" but it's skipped because it takes a long time and generates many warnings
options=(strip staticlibs)
@@ -74,7 +76,10 @@ prepare() {
# shellcheck disable=SC2154
ue4src="$srcdir/UnrealEngine/Engine/Source"
- patch "$ue4src/Programs/UnrealVersionSelector/Private/UnrealVersionSelector.cpp" UnrealVersionSelector-register.patch
+ versionSelector="$ue4src/Programs/UnrealVersionSelector"
+ patch "$versionSelector/Private/UnrealVersionSelector.cpp" UnrealVersionSelector-register.patch
+ patch "$versionSelector/Private/UnrealVersionSelector.cpp" UnrealVersionSelector-fstring-compat.patch
+
patch "$srcdir/UnrealEngine/Engine/Build/BatchFiles/Linux/Setup.sh" ignore-clang50-install.patch
patch "$srcdir/UnrealEngine/Engine/Build/BatchFiles/Linux/SetupMono.sh" use-arch-mono.patch
patch "$srcdir/UnrealEngine/Setup.sh" recompile-version-selector.patch
diff --git a/UnrealVersionSelector-fstring-compat.patch b/UnrealVersionSelector-fstring-compat.patch
new file mode 100644
index 00000000000..434499be733
--- /dev/null
+++ b/UnrealVersionSelector-fstring-compat.patch
@@ -0,0 +1,22 @@
+--- UnrealVersionSelector.cpp 2018-11-07 23:49:54.420746527 -0600
++++ UnrealVersionSelector_new.cpp 2018-11-08 02:53:13.946685094 -0600
+@@ -281,7 +281,7 @@
+ else if (Arguments.Num() == 2 && Arguments[0] == TEXT("-editor"))
+ {
+ // Open a project with the editor
+- bRes = LaunchEditor(Arguments[1], L"");
++ bRes = LaunchEditor(Arguments[1], UTF8_TO_TCHAR(L""));
+ }
+ else if (Arguments[0] == TEXT("-projectlist"))
+ {
+--- UnrealVersionSelector.cpp 2018-11-08 02:58:20.148801974 -0600
++++ UnrealVersionSelector_new.cpp 2018-11-08 03:03:26.761220418 -0600
+@@ -291,7 +291,7 @@
+ else if (Arguments.Num() == 2 && Arguments[0] == TEXT("-game"))
+ {
+ // Play a game using the editor executable
+- bRes = LaunchEditor(Arguments[1], L"-game");
++ bRes = LaunchEditor(Arguments[1], UTF8_TO_TCHAR(L"-game"));
+ }
+ else if (Arguments.Num() == 2 && Arguments[0] == TEXT("-projectfiles"))
+ {
diff --git a/ignore-clang50-install.patch b/ignore-clang50-install.patch
index acffdfc286c..6edcf7d55b5 100644
--- a/ignore-clang50-install.patch
+++ b/ignore-clang50-install.patch
@@ -1,11 +1,11 @@
---- Setup.sh 2018-07-20 11:21:40.054921036 -0500
-+++ Setup_new.sh 2018-07-20 11:25:08.190071301 -0500
-@@ -126,7 +126,7 @@
+--- Setup.sh 2018-11-07 22:50:22.997048687 -0600
++++ Setup_new.sh 2018-11-07 23:04:31.947012499 -0600
+@@ -41,7 +41,7 @@
fi
- # Install our bundled toolchain unless we are running a Perforce build
--if [ ! -f Build/PerforceBuild.txt ]; then
-+if [ ! -f Build/PerforceBuild.txt ] && [[ "$ID" != "arch" ]]; then
+ # 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
echo "Installing a bundled clang toolchain"
pushd Build/BatchFiles/Linux > /dev/null
./SetupToolchain.sh