Updated to 7.1.10

3 files changed, 40 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7feca93e3111..55939b4b356f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openxcom-extended
 	pkgdesc = An extended version of the open-source reimplementation of X-COM (OXCE)
-	pkgver = 7.1.8
+	pkgver = 7.1.10
 	pkgrel = 1
 	url = https://openxcom.org/forum/index.php/topic,5251.0.html
 	install = openxcom-extended.install
@@ -29,7 +29,11 @@ pkgbase = openxcom-extended
 	provides = openxcom
 	provides = openxcom-git
 	conflicts = openxcom
-	source = openxcom-extended::git+https://github.com/MeridianOXC/OpenXcom.git#commit=3ed011f4baba3b6f541a4b1008618311145f8d2e
+	source = openxcom-extended::git+https://github.com/MeridianOXC/OpenXcom.git#commit=1abbbf5706796f9f37ee0fe8ac7603f4e89ff597
+	source = 8e27756e07c8c260fcee847d8f3851181d9e3200.patch
 	md5sums = SKIP
+	md5sums = 4d6d63b47ed6a58d4503582d65c789e8
+	sha1sums = SKIP
+	sha1sums = c1f10485519b6f47af7c36404a2cdd2f8ca2c3a6
 
 pkgname = openxcom-extended
diff --git a/8e27756e07c8c260fcee847d8f3851181d9e3200.patch b/8e27756e07c8c260fcee847d8f3851181d9e3200.patch
new file mode 100644
index 000000000000..876d536cda22
--- /dev/null
+++ b/8e27756e07c8c260fcee847d8f3851181d9e3200.patch
@@ -0,0 +1,22 @@
+From 8e27756e07c8c260fcee847d8f3851181d9e3200 Mon Sep 17 00:00:00 2001
+From: Yankes <Yankes@users.noreply.github.com>
+Date: Sat, 11 Dec 2021 14:38:12 +0100
+Subject: [PATCH] Fix bug in last commit
+
+---
+ src/Engine/Script.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Engine/Script.cpp b/src/Engine/Script.cpp
+index 543d933084..62680ffa5f 100644
+--- a/src/Engine/Script.cpp
++++ b/src/Engine/Script.cpp
+@@ -3165,7 +3165,7 @@ void ScriptParserEventsBase::parseCode(ScriptContainerEventsBase& container, con
+  */
+ void ScriptParserEventsBase::load(const YAML::Node& scripts)
+ {
+-	ScriptParserBase::load(node);
++	ScriptParserBase::load(scripts);
+ 
+ 	if (const YAML::Node& curr = scripts[getName()])
+ 	{
diff --git a/PKGBUILD b/PKGBUILD
index 01ef6532673d..5066e56f3ed0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer:  WorMzy Tykashi <wormzy.tykashi@gmail.com>
 
 pkgname=openxcom-extended
-pkgver=7.1.8
+pkgver=7.1.10
 # Repo doesn't use tags, so set which commit this version corresponds to in
 # https://github.com/MeridianOXC/OpenXcom/commits/oxce-plus/src/version.h
-_commit=3ed011f4baba3b6f541a4b1008618311145f8d2e
+_commit=1abbbf5706796f9f37ee0fe8ac7603f4e89ff597
 pkgrel=1
 pkgdesc="An extended version of the open-source reimplementation of X-COM (OXCE)"
 arch=('i686' 'x86_64')
@@ -17,12 +17,18 @@ optdepends=('openxcom-data-steam: pacman-tracked X-COM data files from Steam'
 provides=('openxcom' 'openxcom-git')
 conflicts=('openxcom')
 install="${pkgname}.install"
-source=(openxcom-extended::git+"https://github.com/MeridianOXC/OpenXcom.git#commit=${_commit}")
-md5sums=('SKIP')
+source=(openxcom-extended::git+"https://github.com/MeridianOXC/OpenXcom.git#commit=${_commit}"
+        8e27756e07c8c260fcee847d8f3851181d9e3200.patch)
+md5sums=('SKIP'
+         '4d6d63b47ed6a58d4503582d65c789e8')
+sha1sums=('SKIP'
+          'c1f10485519b6f47af7c36404a2cdd2f8ca2c3a6')
 
 prepare() {
-    mkdir -p openxcom-extended/build
-    sed -i 's:openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6):openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6):' openxcom-extended/docs/CMakeLists.txt
+  mkdir -p openxcom-extended/build
+  sed -i 's:openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6):openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6):' openxcom-extended/docs/CMakeLists.txt
+  cd openxcom-extended
+  patch -p1 -i "${srcdir}/8e27756e07c8c260fcee847d8f3851181d9e3200.patch"
 }
 
 build() {