Add -fmt patch for compatibility with fmt 6.2.0.

This commit is contained in:
Jerry James 2020-04-09 17:13:59 -06:00
parent ae86a6b746
commit c39a8bcd9f
2 changed files with 46 additions and 1 deletions

40
libsemigroups-fmt.patch Normal file
View File

@ -0,0 +1,40 @@
--- a/include/libsemigroups/report.hpp
+++ b/include/libsemigroups/report.hpp
@@ -68,7 +68,7 @@
#endif
#define REPORT_TIME(var) \
- REPORT_DEFAULT("elapsed time (%s): %s\n", __func__, var);
+ REPORT_DEFAULT("elapsed time (%s): %s\n", __func__, var.string());
namespace libsemigroups {
--- a/src/todd-coxeter.cpp
+++ b/src/todd-coxeter.cpp
@@ -1381,7 +1381,7 @@ namespace libsemigroups {
}
apply_permutation(p, q);
- REPORT("%d\n", tmr).prefix().flush_right().flush();
+ REPORT("%s\n", tmr.string()).prefix().flush_right().flush();
#ifdef LIBSEMIGROUPS_DEBUG
debug_validate_forwd_bckwd();
debug_validate_table();
@@ -1405,7 +1405,7 @@ namespace libsemigroups {
}
}
apply_permutation(p, q);
- REPORT("%d\n", tmr).prefix().flush_right().flush();
+ REPORT("%s\n", tmr.string()).prefix().flush_right().flush();
#ifdef LIBSEMIGROUPS_DEBUG
debug_validate_forwd_bckwd();
debug_validate_table();
@@ -1533,7 +1533,7 @@ namespace libsemigroups {
}
}
apply_permutation(p, q);
- REPORT("%d\n", tmr).prefix().flush_right().flush();
+ REPORT("%s\n", tmr.string()).prefix().flush_right().flush();
#ifdef LIBSEMIGROUPS_DEBUG
debug_validate_forwd_bckwd();
debug_validate_table();

View File

@ -1,11 +1,13 @@
Name: libsemigroups
Version: 1.0.7
Release: 1%{?dist}
Release: 2%{?dist}
Summary: C++ library for semigroups and monoids
License: GPLv3+
URL: https://github.com/libsemigroups/libsemigroups
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
# Adapt to fmt 6.2.0
Patch0: %{name}-fmt.patch
BuildRequires: doxygen
BuildRequires: fontawesome-fonts-web
@ -156,6 +158,9 @@ LD_LIBRARY_PATH=$PWD/.libs make check
%license LICENSE
%changelog
* Thu Apr 9 2020 Jerry James <loganjerry@gmail.com> - 1.0.7-2
- Add -fmt patch for compatibility with fmt 6.2.0
* Sat Mar 21 2020 Jerry James <loganjerry@gmail.com> - 1.0.7-1
- Version 1.0.7
- Create font symlinks with fc-match for greater robustness