[dream] Fixed FTBFS Resolves: rfbz#5697

commit 42b1cb76612f2af9f745ca298bc2a43833c85330 Author: Jaroslav Škarvada <jskarvad(a)redhat.com&gt; Date: Mon Aug 24 17:59:14 2020 +0200 Fixed FTBFS Resolves: rfbz#5697 dream-2.2-gpsd-3.20-fix.patch | 39 +++++++++++++++++++++++++++++++++++++++ dream.spec | 7 ++++++- 2 files changed, 45 insertions(+), 1 deletion(-) --- diff --git a/dream-2.2-gpsd-3.20-fix.patch b/dream-2.2-gpsd-3.20-fix.patch new file mode 100644 index 0000000..1fa23aa --- /dev/null +++ b/dream-2.2-gpsd-3.20-fix.patch @@ -0,0 +1,39 @@ +diff --git a/src/GUI-QT/EvaluationDlg.cpp b/src/GUI-QT/EvaluationDlg.cpp +index 627ecaa..4252c5e 100644 +--- a/src/GUI-QT/EvaluationDlg.cpp ++++ b/src/GUI-QT/EvaluationDlg.cpp +@@ -789,7 +789,7 @@ void systemevalDlg::UpdateGPS(CParameter& Parameters) + if (gps.set&TIME_SET) + { + struct tm * p_ts; +- time_t tt = time_t(gps.fix.time); ++ time_t tt = time_t(gps.fix.time.tv_sec); + p_ts = gmtime(&tt); + QChar fill('0'); + qStrTime = QString("UTC: %1/%2/%3 %4:%5:%6 ") +diff --git a/src/MDI/MDITagItems.cpp b/src/MDI/MDITagItems.cpp +index 15e0c33..cb0de4e 100644 +--- a/src/MDI/MDITagItems.cpp ++++ b/src/MDI/MDITagItems.cpp +@@ -1104,7 +1104,7 @@ CTagItemGeneratorGPS::GenTag(bool bIsValid, gps_data_t& gps_data) // Long/Lat in + + if (gps_data.set&TIME_SET) + { +- time_t time = (time_t)gps_data.fix.time; ++ time_t time = (time_t)gps_data.fix.time.tv_sec; + struct tm * ptm; + ptm = gmtime ( &time ); + Enqueue((uint32_t) ptm->tm_hour, SIZEOF__BYTE); +diff --git a/src/MDI/RSCITagItemDecoders.cpp b/src/MDI/RSCITagItemDecoders.cpp +index 78b38aa..ec9cc8b 100644 +--- a/src/MDI/RSCITagItemDecoders.cpp ++++ b/src/MDI/RSCITagItemDecoders.cpp +@@ -255,7 +255,7 @@ void CTagItemDecoderRgps::DecodeTag(CVector<_BINARY>& vecbiTag, const int iLen) + else + unsetenv("TZ"); + #endif +- gps_data.fix.time = t; ++ gps_data.fix.time.tv_sec = t; + gps_data.set |= TIME_SET; + } + diff --git a/dream.spec b/dream.spec index fd515e9..073fad6 100644 --- a/dream.spec +++ b/dream.spec @@ -3,7 +3,7 @@ Name: dream Version: 2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A software radio for AM and Digital Radio Mondiale (DRM) License: GPLv2+ URL: https://sourceforge.net/projects/drm/ @@ -11,6 +11,7 @@ Source0: https://sourceforge.net/projects/drm/files/dream/%{version}/dream_%{ver Source1: dream.desktop Patch0: dream-2.2-use-system-libs.patch Patch1: dream-2.2-hamlib-4-fix.patch +Patch2: dream-2.2-gpsd-3.20-fix.patch BuildRequires: gcc-c++, hamlib-devel, dos2unix, pulseaudio-libs-devel BuildRequires: libpcap-devel, gpsd-devel, libsndfile-devel, speexdsp-devel, fftw-devel BuildRequires: opus-devel, faad2-devel, qwt-qt5-devel, qt5-qtwebkit-devel @@ -54,6 +55,10 @@ desktop-file-install --add-category="Utility" \ %{_mandir}/man1/* %changelog +* Mon Aug 24 2020 Jaroslav Škarvada <jskarvad(a)redhat.com&gt; - 2.2-6 +- Fixed FTBFS + Resolves: rfbz#5697 + * Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild