diff --git a/.files b/.files index ab39083..7865b5a 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 130ecf2..cf09365 100644 --- a/.rev +++ b/.rev @@ -434,4 +434,12 @@ 789729 + + 4cb90c8a1e093f70cc6df2b7879cf5d3 + 3.0.4 + + dimstar_suse + + 902735 + diff --git a/abiword.changes b/abiword.changes index 15cd8fc..bf9e46f 100644 --- a/abiword.changes +++ b/abiword.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Jun 26 23:33:26 UTC 2021 - Atri Bhattacharya + +- Pass '-std=c++14' to CXXFLAGS for openSUSE >= 1550 to fix + building with GCC 11 which uses c++17 by default, whereas + abiword codebase is not c++17 ready yet. + +------------------------------------------------------------------- Fri Mar 27 17:35:54 UTC 2020 - Dominique Leuenberger diff --git a/abiword.spec b/abiword.spec index 69757b0..6cdea06 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,7 +1,7 @@ # # spec file for package abiword # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -132,6 +132,10 @@ autoreconf -fi # not sure it is not needed any more and the performance cost of this # option is cheaper then random undefined behaviours. CFLAGS="%{optflags} -fno-strict-aliasing" +%if 0%{?suse_version} >= 1550 +# Enforce std=c++14 as codebase is not c++17 (default for gcc 11) ready +CXXFLAGS="%{optflags} -std=c++14" +%endif %configure \ --disable-static \ --enable-dynamic \