summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZerophase2017-10-27 02:40:12 -0500
committerZerophase2017-10-27 02:44:07 -0500
commit8e4248195e245965c5944f1d4cbdee1bf6416d93 (patch)
treede7e8ce689172edea2501c9b6d75144aebb101aa
parent36deb9dec32f4300965453716dd491d55570248c (diff)
downloadaur-8e4248195e245965c5944f1d4cbdee1bf6416d93.tar.gz
xlocale problems
-rw-r--r--.gitattributes2
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index 51751533d4b9..784bd78574d6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-xlocale-crash.patch eol=crlf
+xlocale-crash.patch eol=lf
diff --git a/PKGBUILD b/PKGBUILD
index 06e92b044dc0..324706a80d03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ sha256sums=('SKIP'
'918dff809a7e815343a8d233f704f52a910b8f01a9cb3d29de541a0334fecc7c'
'32ab20e37f5595eff73fb7ee7916ecae19a47f72875f448663941621d166c13b'
'dba4b1910dd6424d50a8d95a461c5cf3a96f3e7df0b015624d9bf1c97dc317d3'
- '66c575805e21ba1dec6da7374f3f8fe62195fd6d271dd6751b600538f1dae9b6'
+ 'e2d152694d0859976d1459d8c9a521ed2ff968295851d0aba030af25cd43b010'
'9fd6d16d56fbe0489a2580b86359df84b83a6987b5760a9e57ae0898f51943ac')
# Package is 3 Gib smaller with "strip" but it's skipped because it takes a long time and generates many warnings
@@ -67,7 +67,7 @@ prepare() {
./Setup.sh
- patch "$ue4src/ThirdParty/Linux/LibCxx/include/c++/v1/__locale" "$srcdir/xlocale-crash.patch"
+ patch --binary "$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
}