Control: tags -1 pending Control: tags 922571 pending Hi,
I have moved sigviewer to Debian Med team[1], fixed the other bug and tried to build the new upstream version 0.6.4 but failed: ... g++ -c -pipe -g -O2 -fdebug-prefix-map=/build/sigviewer-0.6.4=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -std=gnu++11 -D_REENTRANT -Wall - Wextra -fPIC -DVERSION_MAJOR=0 -DVERSION_MINOR=6 -DVERSION_BUILD=4 -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -I. -I/build/sigviewer-0.6.4/ external/include -Isrc -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/ QtXml -I/usr/include/x86_64-linux-gnu/qt5/QtCore -Itmp/release -Itmp/release -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -o tmp/release/undo_redo_gui_command.o src/gui_impl/commands/ undo_redo_gui_command.cpp src/gui_impl/commands/open_file_gui_command.cpp: In member function 'void sigviewer::OpenFileGuiCommand::importEvents()': src/gui_impl/commands/open_file_gui_command.cpp:200:23: error: redeclaration of 'sigviewer::FileSignalReader* file_signal_reader' 200 | FileSignalReader* file_signal_reader = FileSignalReaderFactory::getInstance()->getHandler (file_path); | ^~~~~~~~~~~~~~~~~~ src/gui_impl/commands/open_file_gui_command.cpp:185:23: note: 'sigviewer::FileSignalReader* file_signal_reader' previously declared here 185 | FileSignalReader* file_signal_reader = FileSignalReaderFactory::getInstance()->getHandler (file_path); | ^~~~~~~~~~~~~~~~~~ make[1]: *** [Makefile:2576: tmp/release/open_file_gui_command.o] Error 1 Any help would be welcome Andreas. [1] https://salsa.debian.org/med-team/sigviewer On Sat, Nov 14, 2020 at 11:10:33AM +0200, Adrian Bunk wrote: > Hi Andreas, > > could you make an upload with one of these two solutions > (cherry-pick fix or new upstream)? > > Thanks > Adrian > > > On Wed, Aug 19, 2020 at 02:31:42PM +0200, Alois Schlögl wrote: > > attached is a patch that fixes bug #964688 (FTBFS). > > > > The patch corresponds to commit 93d5cec298ec6c787e45f7b3486cf47ff3461c75 > > in upstream. > > > > Upgrading to sigviewer 0.6.4 would also solve this issue. > > > > > > Best, > > Alois > > > > > > > > > > > > > > > commit 93d5cec298ec6c787e45f7b3486cf47ff3461c75 > > Author: Alois Schloegl <alois.schlo...@ist.ac.at> > > Date: Wed Oct 24 00:06:10 2018 +0200 > > > > fix compilation on Debian 9 with Qt v5.7.1 > > > > diff --git a/src/file_handling/file_signal_reader.h > > b/src/file_handling/file_signal_reader.h > > index eeac188..39d3207 100644 > > --- a/src/file_handling/file_signal_reader.h > > +++ b/src/file_handling/file_signal_reader.h > > @@ -10,6 +10,7 @@ > > #include "base/data_block.h" > > #include "application_context_impl.h" > > > > +#include <QFile> > > #include <QVector> > > #include <QPointer> > > #include <QSharedPointer> > > diff --git a/src/gui/gui_action_factory.h b/src/gui/gui_action_factory.h > > index 07586e4..dc99c0d 100644 > > --- a/src/gui/gui_action_factory.h > > +++ b/src/gui/gui_action_factory.h > > @@ -12,6 +12,7 @@ > > #include <QString> > > #include <QMap> > > #include <QMenu> > > +#include <QContextMenuEvent> > > > > namespace sigviewer > > { > > diff --git a/src/gui_impl/signal_browser/signal_graphics_item.cpp > > b/src/gui_impl/signal_browser/signal_graphics_item.cpp > > index cc60066..0572ed1 100644 > > --- a/src/gui_impl/signal_browser/signal_graphics_item.cpp > > +++ b/src/gui_impl/signal_browser/signal_graphics_item.cpp > > @@ -457,8 +457,8 @@ void SignalGraphicsItem::mousePressEvent > > (QGraphicsSceneMouseEvent * event ) > > //check whether a user added stream has already been > > existing > > XDFdata->userAddedStream = XDFdata->streams.size(); > > XDFdata->streams.emplace_back(); > > - std::time_t currentTime = std::time(nullptr); > > - std::string timeString = > > std::asctime(std::localtime(¤tTime)); > > + time_t currentTime = time(nullptr); > > + std::string timeString = > > asctime(localtime(¤tTime)); > > timeString.pop_back(); //we don't need '\n' at the end > > XDFdata->streams.back().streamHeader = > > "<?xml version='1.0'?>" > > -- http://fam-tille.de