summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZerophase2017-10-27 06:31:57 -0500
committerZerophase2017-10-27 06:44:01 -0500
commitf6e0a4a4f1386515ff8a0e7dad007486cba7aea4 (patch)
treeef5f07682ebfd26f680e770d8e467c954571dc19
parent8e4248195e245965c5944f1d4cbdee1bf6416d93 (diff)
downloadaur-f6e0a4a4f1386515ff8a0e7dad007486cba7aea4.tar.gz
xlocale-crash.patch
-rw-r--r--.gitattributes1
-rw-r--r--PKGBUILD7
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 784bd78574d..00000000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-xlocale-crash.patch eol=lf
diff --git a/PKGBUILD b/PKGBUILD
index 324706a80d0..541163f90a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ sha256sums=('SKIP'
'918dff809a7e815343a8d233f704f52a910b8f01a9cb3d29de541a0334fecc7c'
'32ab20e37f5595eff73fb7ee7916ecae19a47f72875f448663941621d166c13b'
'dba4b1910dd6424d50a8d95a461c5cf3a96f3e7df0b015624d9bf1c97dc317d3'
- 'e2d152694d0859976d1459d8c9a521ed2ff968295851d0aba030af25cd43b010'
+ '6ce0247e233d4eafc7ae294482038addeee7fe2064de627e33839bcc4398a549'
'9fd6d16d56fbe0489a2580b86359df84b83a6987b5760a9e57ae0898f51943ac')
# Package is 3 Gib smaller with "strip" but it's skipped because it takes a long time and generates many warnings
@@ -66,8 +66,9 @@ prepare() {
#git clean -xdf
./Setup.sh
-
- patch --binary "$ue4src/ThirdParty/Linux/LibCxx/include/c++/v1/__locale" "$srcdir/xlocale-crash.patch"
+
+ dos2unix "$ue4src/ThirdParty/Linux/LibCxx/include/c++/v1/__locale"
+ patch "$ue4src/ThirdParty/Linux/LibCxx/include/c++/v1/__locale" "$srcdir/xlocale-crash.patch"
patch "$ue4src/Programs/UnrealBuildTool/Platform/HTML5/HTML5SDKInfo.cs" "$srcdir/html5-build.patch"
./GenerateProjectFiles.sh
}