summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZerophase2019-01-04 17:02:00 -0600
committerZerophase2019-01-04 17:02:00 -0600
commita95dd568ca6c31da41290b316f183e62ebd469e2 (patch)
treec4ca0b5cdc21c90f4074cd8d991ad5dcb352b01b
parent79168ec16e945253cf46fd4653580c4f807d6666 (diff)
downloadaur-a95dd568ca6c31da41290b316f183e62ebd469e2.tar.gz
Update to 4.21.1
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD18
-rw-r--r--UnrealVersionSelector-fstring-compat.patch22
-rw-r--r--UnrealVersionSelector-register.patch11
4 files changed, 8 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3bc38294264..83ba392208b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Nov 9 07:23:18 UTC 2018
+# Fri Jan 4 23:01:18 UTC 2019
pkgbase = unreal-engine
pkgdesc = A 3D game engine by Epic Games which can be used non-commercially for free.
- pkgver = 4.21.0
+ pkgver = 4.21.1
pkgrel = 1
url = https://www.unrealengine.com/
install = unreal-engine.install
@@ -16,17 +16,15 @@ pkgbase = unreal-engine
depends = icu
depends = xdg-user-dirs
depends = sdl2
- depends = qt4
depends = python
depends = lld
options = strip
options = staticlibs
- source = git+ssh://git@github.com/EpicGames/UnrealEngine.git#tag=4.21.0-release
+ source = git+ssh://git@github.com/EpicGames/UnrealEngine.git#tag=4.21.1-release
source = UE4Editor.desktop
source = ignore-return-value-error.patch
source = only-generate-makefile.patch
source = html5-build.patch
- source = UnrealVersionSelector-register.patch
source = recompile-version-selector.patch
source = Makefile
source = ignore-clang50-install.patch
@@ -41,13 +39,11 @@ 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
sha256sums = ab3e7981da6da4473717aef0bce9d550aacad02f9260f98d5b7a0bb3374a959a
sha256sums = 9fd6d16d56fbe0489a2580b86359df84b83a6987b5760a9e57ae0898f51943ac
- sha256sums = 23f55f7dffc98f5a8ef84520c7ef82bc9cca447433ad0405e3f9a319a29301ef
sha256sums = 1dd876fa48c6fb4fcd4ccbdb8ed4ceccfa294685911e91be58bbc5e95726c279
sha256sums = 9654226ef3318389aa8fe15f3d4d14e7ac2113520ee5ebf2899d42273a2a6fb0
sha256sums = eab5ba97327de2b8b17aea73ffd797a882fe0d1923ed2a8dc1709a8b00da63e4
@@ -62,7 +58,6 @@ pkgbase = unreal-engine
sha256sums = 83df14d25b75321f80c9132e72d99e7feafd294a78210f284101a5a8298aa38d
sha256sums = a0abe52f6ffe9b85b934e85a7077121461fab56f615f1714bdbc12afce5b2e82
sha256sums = 2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830
- sha256sums = e8cedb798fb77200209e6315360bbfe13bb2660b61ba7a55a5164648fbe04d2a
pkgname = unreal-engine
diff --git a/PKGBUILD b/PKGBUILD
index c360e8a9a96..b507cac092d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
pkgname='unreal-engine'
install="$pkgname.install"
-pkgver=4.21.0
+pkgver=4.21.1
# shellcheck disable=SC2034
{
pkgrel=1
@@ -18,7 +18,7 @@ pkgver=4.21.0
arch=('x86_64')
url='https://www.unrealengine.com/'
makedepends=('clang' 'mono' 'dos2unix' 'cmake' 'git')
- depends=('icu' 'xdg-user-dirs' 'sdl2' 'qt4' 'python' 'lld')
+ depends=('icu' 'xdg-user-dirs' 'sdl2' 'python' 'lld')
license=('custom:UnrealEngine')
source=(
@@ -27,7 +27,6 @@ pkgver=4.21.0
'ignore-return-value-error.patch'
'only-generate-makefile.patch'
'html5-build.patch'
- 'UnrealVersionSelector-register.patch'
'recompile-version-selector.patch'
'Makefile'
'ignore-clang50-install.patch'
@@ -42,7 +41,6 @@ pkgver=4.21.0
'UnrealExporter-move.patch'
'NiagaraScriptViewModel-self-assign-fix.patch'
'Messages-move.patch'
- 'UnrealVersionSelector-fstring-compat.patch'
)
sha256sums=('SKIP'
@@ -50,7 +48,6 @@ sha256sums=('SKIP'
'918dff809a7e815343a8d233f704f52a910b8f01a9cb3d29de541a0334fecc7c'
'ab3e7981da6da4473717aef0bce9d550aacad02f9260f98d5b7a0bb3374a959a'
'9fd6d16d56fbe0489a2580b86359df84b83a6987b5760a9e57ae0898f51943ac'
- '23f55f7dffc98f5a8ef84520c7ef82bc9cca447433ad0405e3f9a319a29301ef'
'1dd876fa48c6fb4fcd4ccbdb8ed4ceccfa294685911e91be58bbc5e95726c279'
'9654226ef3318389aa8fe15f3d4d14e7ac2113520ee5ebf2899d42273a2a6fb0'
'eab5ba97327de2b8b17aea73ffd797a882fe0d1923ed2a8dc1709a8b00da63e4'
@@ -64,8 +61,7 @@ sha256sums=('SKIP'
'2557758219e0e8718652e102579d26a67f88ec45e61cc3457b2ebf0710bb036a'
'83df14d25b75321f80c9132e72d99e7feafd294a78210f284101a5a8298aa38d'
'a0abe52f6ffe9b85b934e85a7077121461fab56f615f1714bdbc12afce5b2e82'
- '2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830'
- 'e8cedb798fb77200209e6315360bbfe13bb2660b61ba7a55a5164648fbe04d2a')
+ '2f872c76f998f4e04c1eb221d022848686537e087413bfc016028e1f406e2830')
# Package is 3 Gib smaller with "strip" but it's skipped because it takes a long time and generates many warnings
options=(strip staticlibs)
@@ -76,9 +72,6 @@ prepare() {
# shellcheck disable=SC2154
ue4src="$srcdir/UnrealEngine/Engine/Source"
- 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
@@ -102,15 +95,14 @@ prepare() {
patch "$uht/CodeGenerator.cpp" CodeGenerator-move.patch
patch "$uht/UnrealSourceFile.cpp" UnrealSourceFile-move.patch
- ubt="$ue4src/Programs/UnrealBuildTool"
- patch "$ubt/Platform/Linux/LinuxToolChain.cs" no-pie.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
+
cp "$srcdir/Makefile" "$srcdir/UnrealEngine/Makefile"
patch -p0 -i only-generate-makefile.patch
diff --git a/UnrealVersionSelector-fstring-compat.patch b/UnrealVersionSelector-fstring-compat.patch
deleted file mode 100644
index 434499be733..00000000000
--- a/UnrealVersionSelector-fstring-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/UnrealVersionSelector-register.patch b/UnrealVersionSelector-register.patch
deleted file mode 100644
index 34c0ed400fa..00000000000
--- a/UnrealVersionSelector-register.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- UnrealVersionSelector.cpp 2018-07-19 18:48:39.554416589 -0500
-+++ UnrealVersionSelector.cpp_new 2018-07-19 20:08:45.702952782 -0500
-@@ -261,7 +261,7 @@
- else if (Arguments.Num() == 1 && Arguments[0] == TEXT("-register"))
- {
- // Add the current directory to the list of installations
-- bRes = RegisterCurrentEngineDirectory(true);
-+ bRes = RegisterCurrentEngineDirectory(false);
- }
- else if (Arguments.Num() == 1 && Arguments[0] == TEXT("-fileassociations"))
- {