7:44 p.m.
commit 36e73b3b632cac679969f73216e3098a75fe1662
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Feb 24 14:42:40 2020 -0500
Update to 0.47.03-alpha0, fix FTBFS with gcc10.
.gitignore | 4 ++++
dfhack.spec | 23 ++++++++++++++++-------
git-describe.h | 8 ++++----
protobuf-gcc-10-fix.patch | 11 +++++++++++
sources | 14 +++++++-------
5 files changed, 42 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 25bb8bc..ecefd72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,7 @@
/dfhack-df-structures-4421583.tar.gz
/dfhack-scripts-4a0f63e.tar.gz
/dfhack-stonesense-4a0f63e.tar.gz
+/dfhack-0.47.03-alpha0.tar.gz
+/dfhack-df-structures-018558e.tar.gz
+/dfhack-scripts-4fdb2be.tar.gz
+/dfhack-stonesense-4fdb2be.tar.gz
diff --git a/dfhack.spec b/dfhack.spec
index ad0fe78..f85542b 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -10,13 +10,13 @@
# dfhack submodule: depends/jsoncpp-sub
%global commit11 ddabf50f72cf369bf652a95c4d9fe31a1865a781
# dfhack submodule: library/xml
-%global commit12 44215836d5b57c3722b126aaf481f652385f3a23
+%global commit12 018558e3c2e3ff08a24a66f622a4a5ca45ea4173
# dfhack submodule: plugins/isoworld
%global commit13 fbbf9e46458e41707c27f2a4438452a579490db1
# dfhack submodule: plugins/stonesense
-%global commit14 4a0f63e044d02532c948d67780dfd128fbd6d043
+%global commit14 4fdb2be54365442b8abea86f21746795f83fbdc2
# dfhack submodule: scripts
-%global commit15 a242a7cd81ae7046146f86c3103360449e1d9ca8
+%global commit15 c8ea01c2f45a2ef0bd4c363c44e4c06b0185486a
# End autogenerated commit lines.
@@ -29,8 +29,8 @@
%global shortcommit15 %(c=%{commit14}; echo ${c:0:7})
# dfhack version string.
-%global dfversion 0.44.12
-%global hackrelease r2
+%global dfversion 0.47.03
+%global hackrelease alpha0
# Define dfhack build architecture.
%global dfhack_arch 32
@@ -40,7 +40,7 @@
Name: dfhack
Version: %{dfversion}
-Release: 6.%{hackrelease}%{?dist}
+Release: 1.%{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.
@@ -84,6 +84,10 @@ Patch2: https://github.com/DFHack/stonesense/pull/53.patch
# See https://github.com/DFHack/dfhack/issues/961 for these isoworld issues.
+# Patch to make protobuf build on F33/F32 with gcc 10.
+# https://github.com/DFHack/dfhack/issues/1506
+Patch3: protobuf-gcc-10-fix.patch
+
# dfhack only supports DF architectures, of which there are two.
ExclusiveArch: %{ix86} x86_64
@@ -224,6 +228,9 @@ cd plugins/stonesense
%patch2 -p1
cd ../../
+# Fix protobuf problem; there's probably a way to do this with the patch macro.
+patch depends/protobuf/google/protobuf/message.cc %PATCH3
+
# Manually (for now) apply fix to plugins/stonesense/CMakeLists.txt.
sed 's/dfhack-tinyxml/${DFHACK_TINYXML}/' -i plugins/stonesense/CMakeLists.txt
@@ -247,7 +254,6 @@ cd build
%cmake .. -DCMAKE_BUILD_TYPE:string=Release
-DCMAKE_INSTALL_PREFIX=%{buildroot}%{_libdir}/dfhack -DDFHACK_BUILD_ARCH=%{dfhack_arch}
%{?fedora:-DBUILD_STONESENSE:BOOL=True -DSTONESENSE_INTERNAL_SO=OFF} -DDOWNLOAD_RUBY=OFF
# These do not seem to work currently.
# -DBUILD_ISOWORLD=ON -DISOWORLD_INTERNAL_SO=OFF
-
%make_build
# Create pkgconfig file.
@@ -338,6 +344,9 @@ rm -f docs/build.sh
%license LICENSE.rst
%changelog
+* Mon Feb 24 2020 Ben Rosser <rosser.bjr(a)gmail.com> - 0.47.03-1.alpha0
+- Update to latest upstream release with support for 0.47.03.
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
0.44.12-6.r2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/git-describe.h b/git-describe.h
index 5a1be70..f379ac4 100644
--- a/git-describe.h
+++ b/git-describe.h
@@ -1,6 +1,6 @@
-#define DFHACK_GIT_DESCRIPTION "0.44.12-r2-0-g315852a2"
-#define DFHACK_GIT_COMMIT "315852a2513679ca1afe0d53b34974cefd946f89"
-#define DFHACK_GIT_XML_EXPECTED_COMMIT
"44215836d5b57c3722b126aaf481f652385f3a23"
-#define DFHACK_GIT_XML_COMMIT "44215836d5b57c3722b126aaf481f652385f3a23"
+#define DFHACK_GIT_DESCRIPTION "0.47.03-alpha0-0-g28bf6667"
+#define DFHACK_GIT_COMMIT "28bf6667cba0d68f76d5da74b49ee4b355ddd647"
+#define DFHACK_GIT_XML_EXPECTED_COMMIT
"018558e3c2e3ff08a24a66f622a4a5ca45ea4173"
+#define DFHACK_GIT_XML_COMMIT "018558e3c2e3ff08a24a66f622a4a5ca45ea4173"
#define DFHACK_GIT_XML_MATCH
#define DFHACK_BUILD_ID ""
diff --git a/protobuf-gcc-10-fix.patch b/protobuf-gcc-10-fix.patch
new file mode 100644
index 0000000..025578d
--- /dev/null
+++ b/protobuf-gcc-10-fix.patch
@@ -0,0 +1,11 @@
+--- depends/protobuf/google/protobuf/message.cc 2020-02-24 14:28:55.167232318 -0500
++++ depends/protobuf/google/protobuf/message.cc.patched 2020-02-24 14:28:49.769177835
-0500
+@@ -49,6 +49,8 @@
+ #include <google/protobuf/stubs/map-util.h>
+ #include <google/protobuf/stubs/stl_util-inl.h>
+
++#include <fstream>
++
+ namespace google {
+ namespace protobuf {
+
diff --git a/sources b/sources
index 65aa99b..d58cae1 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
-35cfdf121436218c1cd9d317c7599bc5 dfhack-isoworld-fbbf9e4.tar.gz
-cd8054e0be8c44c5b03555471a91f78a dfhack-clsocket-6a9153d.tar.gz
-e43eda5bf91c3a8fe343be6a596c970e dfhack-jsoncpp-ddabf50.tar.gz
-589f12861db5630c1570b1ab3137d858 dfhack-0.44.12-r2.tar.gz
-08906486d402c9c2b6fbbbffe76d914c dfhack-df-structures-4421583.tar.gz
-8e3adba214bc25779ab079f6c25c84d3 dfhack-scripts-4a0f63e.tar.gz
-dc20471cb0974bd74bcdaa0fddfdbcb6 dfhack-stonesense-4a0f63e.tar.gz
+SHA512 (dfhack-0.47.03-alpha0.tar.gz) =
ec76320184459956778af0233c3608d9c56d71a6fb3df81071a699c83951c4ee828ee832179efb3fbf4e2a4edec71812adfe5773a09f4a4ee756e5f8bb00dbc0
+SHA512 (dfhack-clsocket-6a9153d.tar.gz) =
f72e169065f72d0a5c258fd57a82ddfa7b86723264af7488ba7018638462dc6bdf1a03f1d069002a0f83ec0d0d1f6a46ddf6ba2e11631f8d08f27494af892261
+SHA512 (dfhack-df-structures-018558e.tar.gz) =
fdd079d3dd62a4ad1a1ce234a16db03f25d725851130bb7d73bafad36f5c54af1603dd7655ba7f1032c20ff5f58d17f22c70aeac46a24b9185668130f2a9bdec
+SHA512 (dfhack-isoworld-fbbf9e4.tar.gz) =
7ea7a80b5cbcea14305d46b305ecdbba00095fe7cbd5ac143e710137d50bc7451df80d09a506c94324dfc343ecb693d5bbdc34cc65e3eb57f7a783561be65ee6
+SHA512 (dfhack-jsoncpp-ddabf50.tar.gz) =
5a85cf5f71c72bac5e229fdeeb1f7350bf57928d7e3dc688a0ffd41e6341070b53e53ef94875a8a01b3aa498000a5881644d5c5aa7c02322520db89a81d6aed3
+SHA512 (dfhack-scripts-4fdb2be.tar.gz) =
7c6c73a4617e1b1a7ef59d68df1b20712a03b800a37eb51fd5fb223638c3698cdcaf034cbdf68f15ed4d5a8be22659d76fc6dd6fed80117feb215c4c55bfd9ef
+SHA512 (dfhack-stonesense-4fdb2be.tar.gz) =
41d6e8fccfc49720b0b012628eca980cbbfc607b6e53d8edb17e2caa3b01dc818b537184347ea5591a2e45ff34e98cba870ea4cda96970f1b7f1121ac1861bf8