Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linssid for openSUSE:Factory checked
in at 2021-08-05 20:48:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linssid (Old)
and /work/SRC/openSUSE:Factory/.linssid.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linssid"
Thu Aug 5 20:48:06 2021 rev:5 rq:910297 version:3.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/linssid/linssid.changes 2019-08-28
18:36:13.961275874 +0200
+++ /work/SRC/openSUSE:Factory/.linssid.new.1899/linssid.changes
2021-08-05 20:48:39.263894914 +0200
@@ -1,0 +2,6 @@
+Wed Aug 4 20:24:47 UTC 2021 - Luigi Baldoni <aloi...@gmx.com>
+
+- Add linssid-qwt620.patch
+- Spec cleanup
+
+-------------------------------------------------------------------
New:
----
linssid-qwt620.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linssid.spec ++++++
--- /var/tmp/diff_new_pack.s1j6u9/_old 2021-08-05 20:48:39.831894277 +0200
+++ /var/tmp/diff_new_pack.s1j6u9/_new 2021-08-05 20:48:39.831894277 +0200
@@ -1,7 +1,7 @@
#
# spec file for package linssid
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2014 Malcolm J Lewis <malcolmle...@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -29,13 +29,11 @@
Patch0: linssid-icons.patch
# PATCH-FIX-OPENSUSE linssid-icons.patch linssid-use-shared-qwt-qt5.patch --
uses shared qwt6 as packaged on openSUSE
Patch1: linssid-use-shared-qwt-qt5.patch
+# PATCH-FIX-UPSTREAM linssid-qwt620.patch
+Patch2: linssid-qwt620.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
-%if 0%{?suse_version} > 1315
BuildRequires: libboost_regex-devel
-%else
-BuildRequires: boost-devel
-%endif
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core) >= 5.2
@@ -52,13 +50,11 @@
It is written in C++ using Linux wireless tools and Qt5.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
%build
%qmake5
-make %{?_smp_mflags}
+%make_build
%install
%qmake5_install
@@ -71,15 +67,7 @@
%{_bindir}/xdg-su -c %{_sbindir}/linssid
PATH=$TMP_PATH
EOF
-%fdupes -s %{buildroot}
-
-%if 0%{?suse_version} <= 1315
-%post
-%desktop_database_post
-
-%postun
-%desktop_database_post
-%endif
+%fdupes %{buildroot}
%files
%license linssid-app/license.txt
++++++ linssid-qwt620.patch ++++++
From: Luigi Baldoni <aloi...@gmx.com>
Date: 2021-08-04 22:14:02 +0200
Subject: Fix compatibility with Qwt 6.2.0
References: https://sourceforge.net/p/linssid/discussion/bugs/thread/3080bf8f4d/
Upstream: submitted
Disambiguate function calls after new overloads added in qwt 6.2.
(courtesy of Jari Kuittinen)
---
Index: linssid-3.6/linssid-app/MainForm.cpp
===================================================================
--- linssid-3.6.orig/linssid-app/MainForm.cpp
+++ linssid-3.6/linssid-app/MainForm.cpp
@@ -28,6 +28,7 @@
#include <qwt_plot_curve.h>
#include <qwt_plot_grid.h>
#include <qwt_symbol.h>
+#include <qwt_text.h>
#include <qwt_plot_marker.h>
#include <QPointF>
#include <qwt_scale_draw.h>
@@ -1036,7 +1037,7 @@ void MainForm::fillPlots() {
MainForm::cellDataRay[tbi].signal ) );
}
} else {
- MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0);
+ MainForm::cellDataRay[tbi].pBandCurve->setSamples((double
*)nullptr, (double *)nullptr, 0);
}
// now the signal history plot
int ixStart;
@@ -1055,7 +1056,7 @@ void MainForm::fillPlots() {
&(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]),
ixLength);
} else {
- MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0);
+ MainForm::cellDataRay[tbi].pTimeCurve->setSamples((double
*)nullptr, (double *)nullptr, 0);
}
}
MainForm::mainFormWidget.chan24Plot->replot();
@@ -1424,4 +1425,4 @@ int MainForm::MinIntStr(const string &s)
// const std::string whiteSpaces( " \f\n\r\t\v" );
// std::string::size_type pos = str.find_first_not_of( whiteSpaces );
// str.erase( pos + 1 );
-//}
\ No newline at end of file
+//}
