diff --git a/srcpkgs/linssid/patches/project.patch b/srcpkgs/linssid/patches/project.patch index 40ed3dd8207..a228007bb22 100644 --- a/srcpkgs/linssid/patches/project.patch +++ b/srcpkgs/linssid/patches/project.patch @@ -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 diff --git a/srcpkgs/linssid/patches/qwt-include.patch b/srcpkgs/linssid/patches/qwt-include.patch new file mode 100644 index 00000000000..04a25d42b21 --- /dev/null +++ b/srcpkgs/linssid/patches/qwt-include.patch @@ -0,0 +1,56 @@ +--- linssid-app/MainForm.cpp ++++ linssid-app/MainForm.cpp +@@ -23,14 +23,14 @@ + #include + #include + #include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + #include +-#include ++#include + #include + #include + #include + +--- linssid-app/MainForm.h ++++ linssid-app/MainForm.h +@@ -13,11 +13,11 @@ + #include + #include + #include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + #include "ui_MainForm.h" + #include "prefsDialog.h" + #include "Custom.h" + +--- linssid-app/MainForm.ui ++++ linssid-app/MainForm.ui +@@ -757,7 +757,7 @@ + + QwtPlot + QFrame +-
qwt_plot.h
++
qwt/qwt_plot.h
+ 1 +
+ diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template index 13cae2a8577..80509d71bb1 100644 --- a/srcpkgs/linssid/template +++ b/srcpkgs/linssid/template @@ -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 -}