From f5cf8a0d59c83da32eb98f14f651cd78de07a2ea Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Aug 03 2022 15:52:05 +0000 Subject: Add %{name}-%{version}-timer.patch to fix (BZ#2113165) --- diff --git a/cxxtools-3.0-timer.patch b/cxxtools-3.0-timer.patch new file mode 100644 index 0000000..440bb55 --- /dev/null +++ b/cxxtools-3.0-timer.patch @@ -0,0 +1,10 @@ +--- src/timer.cpp.orig 2022-08-03 17:42:29.273788399 +0200 ++++ src/timer.cpp 2022-08-03 17:47:03.287758459 +0200 +@@ -28,6 +28,7 @@ + #include "cxxtools/selector.h" + #include "cxxtools/datetime.h" + #include ++#include + + namespace cxxtools + { diff --git a/cxxtools.spec b/cxxtools.spec index 8d41bab..dc53957 100644 --- a/cxxtools.spec +++ b/cxxtools.spec @@ -1,16 +1,18 @@ Name: cxxtools Version: 3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A collection of general-purpose C++ classes Epoch: 1 License: LGPLv2+ URL: http://www.tntnet.org/cxxtools.html -Source0: http://www.tntnet.org/download/cxxtools-%{version}.tar.gz +Source0: https://github.com/maekitalo/cxxtools/archive/refs/tags/V%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-arm.patch Patch1: %{name}-%{version}-gcc11.patch Patch2: %{name}-%{version}-i686.patch Patch3: %{name}-%{version}-ppc64le.patch +# fix error: aggregate 'tm tim' has incomplete type and cannot be defined +Patch4: %{name}-%{version}-timer.patch BuildRequires: make BuildRequires: automake @@ -52,8 +54,7 @@ find -name "*.h" -exec chmod -x {} \; --with-atomictype=pthread \ %endif %{nil} -%make_build - +%make_build CXXFLAGS="%{optflags} -std=gnu++14" %install %make_install @@ -80,6 +81,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %{_includedir}/cxxtools/ %changelog +* Wed Aug 03 2021 Martin Gansser - 1:3.0-6 +- Add %%{name}-%%{version}-timer.patch to fix (BZ#2113165) + * Wed Jul 20 2022 Fedora Release Engineering - 1:3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild