aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2021-01-15 16:08:30 -0300
committerLeo <thinkabit.ukim@gmail.com>2021-01-15 16:08:30 -0300
commit92572a760354a405dc7d36496e57702ea94dd707 (patch)
tree4ea430f419880e7b3af2d61819713371b57e63a1
parentd0760465aa34a389c37c9e3f2d10e6cf461ef257 (diff)
downloadaports-92572a760354a405dc7d36496e57702ea94dd707.tar.gz
aports-92572a760354a405dc7d36496e57702ea94dd707.tar.bz2
aports-92572a760354a405dc7d36496e57702ea94dd707.tar.xz
testing/openmw: fix build by add missing include to <algorithm>
required to have std::for_each defined
-rw-r--r--testing/openmw/APKBUILD7
-rw-r--r--testing/openmw/missing-include.patch19
2 files changed, 24 insertions, 2 deletions
diff --git a/testing/openmw/APKBUILD b/testing/openmw/APKBUILD
index c4a100454b..96e524ae44 100644
--- a/testing/openmw/APKBUILD
+++ b/testing/openmw/APKBUILD
@@ -16,7 +16,9 @@ makedepends="cmake boost doxygen ninja mesa-dev qt5-qtbase-dev ffmpeg-dev
# [ FAILED ] ContentFileTest.dialogue_merging_test
# [ FAILED ] ContentFileTest.content_diagnostics_test
options="!check"
-source="https://github.com/OpenMW/openmw/archive/openmw-$pkgver.tar.gz"
+source="https://github.com/OpenMW/openmw/archive/openmw-$pkgver.tar.gz
+ missing-include.patch
+ "
builddir=$srcdir/$pkgname-$pkgname-$pkgver
@@ -41,4 +43,5 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486 openmw-0.46.0.tar.gz"
+sha512sums="da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486 openmw-0.46.0.tar.gz
+d0d47fe249e8fb366e00e272dc62853f8a2aaa75d45d83d270891e76674c1382fd3405e674e3b6c383bbc17125c4471893e77251744deae4d17bc373d847a638 missing-include.patch"
diff --git a/testing/openmw/missing-include.patch b/testing/openmw/missing-include.patch
new file mode 100644
index 0000000000..803707498e
--- /dev/null
+++ b/testing/openmw/missing-include.patch
@@ -0,0 +1,19 @@
+Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
+
+From 10daadefbea1f62a818c339dc7f3d69a858bc8a6 Mon Sep 17 00:00:00 2001
+From: elsid <elsid.mail@gmail.com>
+Date: Thu, 30 Apr 2020 21:57:22 +0200
+Subject: [PATCH] Add missing include
+
+diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
+index 30d7976aec..155ce32963 100644
+--- a/components/detournavigator/offmeshconnectionsmanager.hpp
++++ b/components/detournavigator/offmeshconnectionsmanager.hpp
+@@ -13,6 +13,7 @@
+
+ #include <boost/optional.hpp>
+
++#include <algorithm>
+ #include <map>
+ #include <mutex>
+ #include <unordered_map>