[dfhack] Fix FTBFS in Stonesense on Fedora 30 and up.
commit 4143ba611cfc485b4b0fe523262eb3e6a2b75789
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Wed Mar 27 11:46:49 2019 -0400
Fix FTBFS in Stonesense on Fedora 30 and up.
53.patch | 23 +++++++++++++++++++++++
dfhack.spec | 13 ++++++++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/53.patch b/53.patch
new file mode 100644
index 0000000..16a8e47
--- /dev/null
+++ b/53.patch
@@ -0,0 +1,23 @@
+From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001
+From: Herwig Hochleitner <hhochleitner(a)gmail.com>
+Date: Sun, 1 Oct 2017 18:01:43 +0200
+Subject: [PATCH] include <GL/glext.h>
+
+this fixes `GLhandleARB` not being defined
+---
+ common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/common.h b/common.h
+index eb36691a..ef453890 100644
+--- a/common.h
++++ b/common.h
+@@ -31,6 +31,8 @@ using namespace df::enums;
+ #include <allegro5/allegro_opengl.h>
+ #include <allegro5/utf8.h>
+
++#include <GL/glext.h>
++
+ // allegro leaks X headers, undef some of it here:
+ #undef TileShape
+ #undef None
diff --git a/dfhack.spec b/dfhack.spec
index 5494838..ba79b67 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -40,7 +40,7 @@
Name: dfhack
Version: %{dfversion}
-Release: 3.%{hackrelease}%{?dist}
+Release: 4.%{hackrelease}%{?dist}
Summary: Memory hacking library for Dwarf Fortress and a set of tools that use it
# It'd be nice if we could unbundle some of these things, but I suspect it won't
happen.
@@ -79,6 +79,9 @@ Patch0: isoworld-external-allegro-agui.patch
# Patch to include cmath in isoworld.
Patch1: isoworld-cmath-include.patch
+# Patch to fix stonesense build failure on Fedora 30+
+Patch2: https://github.com/DFHack/stonesense/pull/53.patch
+
# See https://github.com/DFHack/dfhack/issues/961 for these isoworld issues.
# dfhack only supports DF architectures, of which there are two.
@@ -216,6 +219,11 @@ cp -a %SOURCE3 library/include/
%patch0 -p1
%patch1 -p1
+# This is a patch for *Stonesense*.
+cd plugins/stonesense
+%patch2 -p1
+cd ../../
+
# Manually (for now) apply fix to plugins/stonesense/CMakeLists.txt.
sed 's/dfhack-tinyxml/${DFHACK_TINYXML}/' -i plugins/stonesense/CMakeLists.txt
@@ -330,6 +338,9 @@ rm -f docs/build.sh
%license LICENSE.rst
%changelog
+* Wed Mar 27 2019 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-4.r2
+- Fix FTBFS in Stonesense on Fedora 30 and up.
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
0.44.12-3.r2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild