linssid: fix build for qt5.13

This commit is contained in:
John 2019-07-06 20:10:32 +02:00 committed by John Zimmermann
parent 92c4b8c449
commit 41d8a3c9b0
3 changed files with 7 additions and 58 deletions

View file

@ -2,7 +2,8 @@
+++ linssid-app/linssid-app.pro
@@ -5,7 +5,7 @@
CONFIG -= debug_and_release app_bundle lib_bundle
CONFIG += release
-CONFIG += release
+CONFIG += release qwt
PKGCONFIG +=
-QT = core gui widgets svg
+QT = core gui widgets

View file

@ -1,56 +0,0 @@
--- linssid-app/MainForm.cpp
+++ linssid-app/MainForm.cpp
@@ -23,14 +23,14 @@
#include <QMainWindow>
#include <QMessageBox>
#include <QFont>
-#include <qwt.h>
-#include <qwt_plot.h>
-#include <qwt_plot_curve.h>
-#include <qwt_plot_grid.h>
-#include <qwt_symbol.h>
-#include <qwt_plot_marker.h>
+#include <qwt/qwt.h>
+#include <qwt/qwt_plot.h>
+#include <qwt/qwt_plot_curve.h>
+#include <qwt/qwt_plot_grid.h>
+#include <qwt/qwt_symbol.h>
+#include <qwt/qwt_plot_marker.h>
#include <QPointF>
-#include <qwt_scale_draw.h>
+#include <qwt/qwt_scale_draw.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
--- linssid-app/MainForm.h
+++ linssid-app/MainForm.h
@@ -13,11 +13,11 @@
#include <QEvent>
#include <QString>
#include <QFont>
-#include <qwt.h>
-#include <qwt_plot.h>
-#include <qwt_plot_curve.h>
-#include <qwt_plot_grid.h>
-#include <qwt_scale_draw.h>
+#include <qwt/qwt.h>
+#include <qwt/qwt_plot.h>
+#include <qwt/qwt_plot_curve.h>
+#include <qwt/qwt_plot_grid.h>
+#include <qwt/qwt_scale_draw.h>
#include "ui_MainForm.h"
#include "prefsDialog.h"
#include "Custom.h"
--- linssid-app/MainForm.ui
+++ linssid-app/MainForm.ui
@@ -757,7 +757,7 @@
<customwidget>
<class>QwtPlot</class>
<extends>QFrame</extends>
- <header>qwt_plot.h</header>
+ <header>qwt/qwt_plot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

View file

@ -3,7 +3,7 @@ pkgname=linssid
version=3.6
revision=2
build_style=qmake
hostmakedepends="qt5-devel"
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
depends="qt5-svg"
short_desc="Graphical wireless AP scanner"
@ -12,3 +12,7 @@ license="GPL-3.0-only"
homepage="https://sourceforge.net/projects/linssid/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
checksum=57301ee93f708f2512316668bf4e718502f37f21a5e93b68fc604a9032e3e49c
pre_configure() {
sed -e "s%/usr/include%${XBPS_CROSS_BASE}&%g" -i linssid-app/linssid-app.pro
}