linssid: cleanup template + patches

This commit is contained in:
Piraty 2018-12-30 20:11:51 +01:00 committed by maxice8
parent 986dc9b9ed
commit 2db4faa868
3 changed files with 67 additions and 14 deletions

View File

@ -9,7 +9,14 @@
SOURCES += AboutBox.cpp Getter.cpp MainForm.cpp main.cpp prefsDialog.cpp
HEADERS += AboutBox.h Custom.h Getter.h MainForm.h prefsDialog.h
FORMS += AboutBox.ui MainForm.ui prefsDialog.ui
@@ -22,10 +22,10 @@
@@ -15,18 +15,16 @@
MOC_DIR =
RCC_DIR =
UI_DIR =
-QMAKE_CC = gcc
-QMAKE_CXX = g++
DEFINES +=
INCLUDEPATH += /usr/include/boost
INCLUDEPATH += /usr/include/qt5
INCLUDEPATH += /usr/include/qwt
LIBS += -lboost_regex
@ -22,3 +29,4 @@
+target.path = /usr/bin
INSTALLS += target
targetexec.path = /usr/bin
targetexec.files=linssid-pkexec

View File

@ -0,0 +1,56 @@
--- 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

@ -1,9 +1,9 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
revision=1
revision=2
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
hostmakedepends="qt5-devel"
makedepends="boost-devel qwt-devel"
depends="qt5-svg"
short_desc="Graphical wireless AP scanner"
@ -12,14 +12,3 @@ license="GPL-3.0-only"
homepage="https://sourceforge.net/projects/linssid/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
checksum=57301ee93f708f2512316668bf4e718502f37f21a5e93b68fc604a9032e3e49c
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/qt5/QtCore"
CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets"
CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtGui"
pre_configure() {
sed -e "s|QMAKE_CC =.*|QMAKE_CC = $CC|" \
-e "s|QMAKE_CXX =.*|QMAKE_CXX = $CXX|" \
-e "s|INCLUDEPATH += |INCLUDEPATH += ${XBPS_CROSS_BASE}|g" \
-i linssid-app/linssid-app.pro
}