openttd-git: really fix chunnel.patch

1 files changed, 11 insertions, 9 deletions

diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD
index bd7a052c..2f175d92 100644
--- a/openttd-git/PKGBUILD
+++ b/openttd-git/PKGBUILD
@@ -43,7 +43,8 @@ backup=()
 options=()
 source=(
     "${pkgname}::git://github.com/OpenTTD/OpenTTD.git#commit=${_commit}"
-    "chunnel-pre.patch"
+    "chunnel-signaltunnel-pre.patch"
+    "chunnel-underground-pre.patch"
     "chunnel.patch"
     "signaltunnel.patch"
     "sloped-stations.patch"
@@ -51,7 +52,8 @@ source=(
     'opntitle.dat'
 )
 sha512sums=('SKIP'
-            'fa238b9ea9a2d334bdabcbc667b87eae87748d510d6d2bb3308f5186b6b613b7a50623e42c075cd4261cfd4aa4a6822902d7d6536e1805a1ac00a6e885bc9ae7'
+            '26fa515d2706455f0f713ef8aab80fb2a52f665b54ae354d3feab2c25e194f80187125a28429a25ad86b58a2e902862aeb1ebae74e36d974ec78f4304df94b61'
+            '09200144aa4dd5beaf12787d175aa47226205427721c05f681730474a95a2d2f8692be63df568c622f78edf81347dec249d0926203be3aa6dd902ff93f7aa047'
             '74283b8adb001a010aa05a8cee33b620371544e2909317f4c7156852e4ea440cdf8793dbe8957d646734ee309fdb5924915e0d967d78d43329ea4fc211e7e8ef'
             '497f395320edff647dd58c53abc451f706db9934fc847c95ecbbb33d519f67fe94ecd913e13bd7d770320370ea088b675e6583e8b59b69e2d3ee587a62ad2261'
             '11c87d30824bca5738e46c14422c622cdfe4d7e55a5b3a4fe5e77a0a14ceee742bfa8f6c0e8212e9b38c2a1d1db3a4f525c7a70a0b0ed03751dee2539d3da929'
@@ -70,6 +72,11 @@ pkgver() {
 
 prepare() {
 
+    cd "${srcdir}"
+    cp chunnel.patch chunnel.pre.patch
+    patch -p1 -i "chunnel-signaltunnel-pre.patch"
+    patch -p1 -i "chunnel-underground-pre.patch"
+
     cd "${srcdir}/${pkgname}"
     cp "${srcdir}/opntitle.dat" media/baseset/
 
@@ -93,17 +100,12 @@ prepare() {
       s,"\${CMAKE_SOURCE_DIR}/\.git","/dev/does/not/exist",
     ' cmake/scripts/FindVersion.cmake
 
-#    for _p in "${srcdir}/"{signaltunnel,sloped-stations,underground,chunnel}.patch; do
-    for _p in "${srcdir}/"{signaltunnel,underground}.patch; do
+#    for _p in "${srcdir}/"{signaltunnel,sloped-stations,underground}.patch; do
+    for _p in "${srcdir}/"{signaltunnel,underground,chunnel.pre}.patch; do
       >&2 echo "patching ${_p##*/} ..."
       patch -p1 -i "${_p}"
       >&2 echo "... ok"
     done
-    (
-      cd "${srcdir}"
-      patch -p2 -i "chunnel-pre.patch" -o -
-    ) \
-    | patch -p1
 }
 
 build() {