12:30 a.m.
commit 726339279c5759b7f53a35888c1b6d8af8161a02
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Jun 15 20:29:52 2020 -0400
Update to latest upstraem release, 0.46.0.
.gitignore | 2 ++
openmw-foreach-offmeshconnectionsmanager.patch | 11 +++++++++++
openmw.spec | 23 ++++++++++++++++-------
sources | 2 +-
4 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20222df..fef5569 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.src.rpm
openmw-0.36.1.tar.gz
openmw-0.37.0.tar.gz
openmw-0.38.0.tar.gz
@@ -7,3 +8,4 @@ openmw-0.39.0.tar.gz
/openmw-0.43.0.tar.gz
/openmw-0.44.0.tar.gz
/openmw-0.45.0.tar.gz
+/openmw-0.46.0.tar.gz
diff --git a/openmw-foreach-offmeshconnectionsmanager.patch
b/openmw-foreach-offmeshconnectionsmanager.patch
new file mode 100644
index 0000000..6ba090f
--- /dev/null
+++ b/openmw-foreach-offmeshconnectionsmanager.patch
@@ -0,0 +1,11 @@
+diff -rupN openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp
openmw-patched/components/detournavigator/offmeshconnectionsmanager.hpp
+---
openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp 2020-06-08
05:11:24.000000000 -0400
++++ openmw-patched/components/detournavigator/offmeshconnectionsmanager.hpp 2020-06-15
19:18:07.319909847 -0400
+@@ -13,6 +13,7 @@
+
+ #include <boost/optional.hpp>
+
++#include <algorithm>
+ #include <map>
+ #include <mutex>
+ #include <unordered_map>
diff --git a/openmw.spec b/openmw.spec
index 38c4c9d..e594112 100644
--- a/openmw.spec
+++ b/openmw.spec
@@ -1,6 +1,6 @@
Name: openmw
-Version: 0.45.0
-Release: 6%{?dist}
+Version: 0.46.0
+Release: 1%{?dist}
Summary: Unofficial open source engine re-implementation of the game Morrowind
License: GPLv3 and MIT and zlib
@@ -14,6 +14,9 @@ Patch0: %{name}.unbundle-dejavu-font.patch
# Unbundle tango icons
Patch1: %{name}.undundle-tango-icons.patch
+# Fix compilation problem in components/detournavigator/offmeshconnectionsmanager.hpp
+Patch2: openmw-foreach-offmeshconnectionsmanager.patch
+
# Openmw has problems with big indian cpu
ExcludeArch: ppc64
@@ -78,6 +81,8 @@ rm -rf files/wizard/icons/
rm -rf files/launcher/icons/
%patch1 -p1
+%patch2 -p1
+
%build
rm -rf build && mkdir build && pushd build
%cmake -DDATADIR:PATH=%{_datadir}/%{name} \
@@ -94,7 +99,7 @@ rm -rf build && mkdir build && pushd build
-DCMAKE_CXX_STANDARD=11 \
../
-make %{?_smp_mflags}
+%make_build
popd
%check
@@ -106,8 +111,8 @@ popd
pushd build
%make_install
popd
-desktop-file-validate %{buildroot}/%{_datadir}/applications/openmw-cs.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/openmw.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.openmw.cs.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.openmw.launcher.desktop
# Test and install appdata file
appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
@@ -129,10 +134,11 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/data
%{_bindir}/%{name}-cs
%{_bindir}/esmtool
%{_bindir}/bsatool
+%{_bindir}/niftest
# %%{_libdir}/Plugin_MyGUI_OpenMW_Resources.so
%{_datadir}/%{name}/
-%{_datadir}/applications/%{name}-cs.desktop
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/org.openmw.cs.desktop
+%{_datadir}/applications/org.openmw.launcher.desktop
%{_datadir}/pixmaps/%{name}-cs.png
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/metainfo/%{name}.appdata.xml
@@ -140,6 +146,9 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/data
%changelog
+* Mon Jun 15 2020 Ben Rosser <rosser.bjr(a)gmail.com> - 0.46.0-1
+- Update to latest upstream release.
+
* Thu Jun 04 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.45.0-6
- Rebuilt for Boost 1.73
diff --git a/sources b/sources
index 675406c..c2e3261 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f6821aeb64b46a90a73d811846c8825 openmw-0.45.0.tar.gz
+SHA512 (openmw-0.46.0.tar.gz) =
da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486