aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-08-29 12:32:58 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:52:25 +0200
commitce067d98f8976cb34563c32027c5ddacd23dc318 (patch)
tree430172aee99e39a952ae0ece25c8285aa4ceae79
parent3bee30550ca5ffe364ccd620dd9ba73e1b960229 (diff)
downloadmeta-openembedded-contrib-jansa/qcanobserver.tar.gz
meta-openembedded-contrib-jansa/qcanobserver.tar.bz2
meta-openembedded-contrib-jansa/qcanobserver.zip
qcanobserver: Update svn URL for new sourceforge layout, fix build with newer eglibcjansa/qcanobserver
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb4
-rw-r--r--meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb9
-rw-r--r--meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-WIP-try-to-upgrade-to-qwt-6-API.patch98
-rw-r--r--meta-oe/recipes-qt/qcanobserver/qcanobserver/0003-messagebufferinterface-include-unistd.h-for-read-wri.patch39
4 files changed, 144 insertions, 6 deletions
diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb
index 9852b0c08b..c7c222165c 100644
--- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb
+++ b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb
@@ -9,9 +9,9 @@ DEPENDS += "qwt libsocketcan"
PV = "0.5+svnr${SRCPV}"
SRCREV = "48"
-SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https"
+SRC_URI = "svn://svn.code.sf.net/p/qcanobserver;module=code;protocol=https"
-S = "${WORKDIR}/qcanobserver/DeviceLib/linux/SocketCAN"
+S = "${WORKDIR}/code/DeviceLib/linux/SocketCAN"
CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN"
diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb
index 4b566f7a33..7dd86f2b52 100644
--- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb
+++ b/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb
@@ -8,13 +8,14 @@ inherit qt4x11
DEPENDS += "qwt"
PV = "0.5+svnr${SRCPV}"
-SRCREV = "48"
-SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https \
+SRCREV = "50"
+SRC_URI = "svn://svn.code.sf.net/p/qcanobserver;module=code;protocol=https \
file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \
- file://0002-qconsole-writethread-gcc-4.5-fixes.patch \
+ file://0001-WIP-try-to-upgrade-to-qwt-6-API.patch \
+ file://0003-messagebufferinterface-include-unistd.h-for-read-wri.patch \
file://candemo.xml"
-S = "${WORKDIR}/qcanobserver/"
+S = "${WORKDIR}/code/"
CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN"
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-WIP-try-to-upgrade-to-qwt-6-API.patch b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-WIP-try-to-upgrade-to-qwt-6-API.patch
new file mode 100644
index 0000000000..9d25a782fd
--- /dev/null
+++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-WIP-try-to-upgrade-to-qwt-6-API.patch
@@ -0,0 +1,98 @@
+From fbfd3db23b2707e5d423e3271fef2a5a8f8719ab Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 29 Aug 2013 16:27:22 +0200
+Subject: [PATCH] WIP: try to upgrade to qwt-6 API
+
+* biggest remaining issue is qcancostumplotcurve.cpp
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ graphicwindow.cpp | 4 ++--
+ graphicwindow.h | 7 +++----
+ qcancostumplotcurve.h | 2 --
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/graphicwindow.cpp b/graphicwindow.cpp
+index f1690c6..0af3f12 100644
+--- a/graphicwindow.cpp
++++ b/graphicwindow.cpp
+@@ -123,7 +123,7 @@ void GraphicWindow::MainTimerSlot()
+ {
+ if(Curves.at(i)->x.count())
+ {
+- Curves.at(i)->PlotCurve->setRawData((double*)&Curves.at(i)->x.first(),(double*)&Curves.at(i)->y.first(), Curves.at(i)->x.size());
++ Curves.at(i)->PlotCurve->setRawSamples((double*)&Curves.at(i)->x.first(),(double*)&Curves.at(i)->y.first(), Curves.at(i)->x.size());
+ Curves.at(i)->PlotCurve->attach(Plot);
+
+ }
+@@ -140,7 +140,7 @@ void GraphicWindow::ClearAll()
+ {
+ if(Curves.at(i)->x.count())
+ {
+- Curves.at(i)->PlotCurve->setRawData((double*)&Curves.at(i)->x.first(),(double*)&Curves.at(i)->y.first(), 0);
++ Curves.at(i)->PlotCurve->setRawSamples((double*)&Curves.at(i)->x.first(),(double*)&Curves.at(i)->y.first(), 0);
+ Curves.at(i)->y.clear();
+ Curves.at(i)->x.clear();
+ }
+diff --git a/graphicwindow.h b/graphicwindow.h
+index ea93db6..cf173bb 100644
+--- a/graphicwindow.h
++++ b/graphicwindow.h
+@@ -41,6 +41,7 @@
+ #include <qwt_plot_magnifier.h>
+ #include <QLinkedList>
+ #include "configdialog.h"
++#include <qwt_compat.h>
+
+ using namespace std;
+
+@@ -59,7 +60,6 @@ public:
+ this->insertLegend(legend, QwtPlot::BottomLegend);
+ ActCanvas = canvas();
+ CanvasZoomer = new QwtPlotZoomer( QwtPlot::xBottom, QwtPlot::yLeft, ActCanvas);
+- CanvasZoomer->setSelectionFlags( QwtPicker::DragSelection );
+ CanvasZoomer->setTrackerMode(QwtPicker::AlwaysOn);
+ CanvasZoomer->setMousePattern(QwtEventPattern::MouseSelect2,
+ Qt::NoButton, Qt::ControlModifier);
+@@ -92,7 +92,6 @@ public:
+
+ delete CanvasZoomer;
+ CanvasZoomer = new QwtPlotZoomer( QwtPlot::xBottom, QwtPlot::yLeft, ActCanvas);
+- CanvasZoomer->setSelectionFlags( QwtPicker::DragSelection );
+ CanvasZoomer->setTrackerMode(QwtPicker::AlwaysOn);
+ }
+ else
+@@ -132,8 +131,8 @@ class ItemCurveInfo
+ QCANCostumPlotCurve *PlotCurve;
+
+ CANSignal *pSignal;
+- QwtArray<double> x;
+- QwtArray<double> y;
++ QVector<double> x;
++ QVector<double> y;
+ };
+
+ namespace Ui {
+diff --git a/qcancostumplotcurve.h b/qcancostumplotcurve.h
+index a0dc16d..f9f5ad0 100644
+--- a/qcancostumplotcurve.h
++++ b/qcancostumplotcurve.h
+@@ -156,7 +156,6 @@ public:
+ };
+
+ PrivateData():
+- curveType(Yfx),
+ style(QwtPlotCurve::Lines),
+ reference(0.0),
+ attributes(0),
+@@ -173,7 +172,6 @@ public:
+ delete curveFitter;
+ }
+
+- QwtPlotCurve::CurveType curveType;
+ QwtPlotCurve::CurveStyle style;
+ double reference;
+
+--
+1.8.3.2
+
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver/0003-messagebufferinterface-include-unistd.h-for-read-wri.patch b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0003-messagebufferinterface-include-unistd.h-for-read-wri.patch
new file mode 100644
index 0000000000..d111957378
--- /dev/null
+++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0003-messagebufferinterface-include-unistd.h-for-read-wri.patch
@@ -0,0 +1,39 @@
+From 3d2d2f586c7a1498ab6a4376b128eaa86a9904b0 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 29 Aug 2013 12:29:32 +0200
+Subject: [PATCH] include unistd.h for read, write, close, usleep
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ messagebufferinterface.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/messagebufferinterface.cpp b/messagebufferinterface.cpp
+index 116564c..93f3ce7 100644
+--- a/messagebufferinterface.cpp
++++ b/messagebufferinterface.cpp
+@@ -18,6 +18,7 @@
+ #include "messagebufferinterface.h"
+ #include "errordialog.h"
+ #include <stdio.h>
++#include <unistd.h>
+ #include <fcntl.h>
+
+ #include <string.h>
+diff --git a/graphicwindow.cpp b/graphicwindow.cpp
+index 7db6069..f1690c6 100644
+--- a/graphicwindow.cpp
++++ b/graphicwindow.cpp
+@@ -21,6 +21,7 @@
+ #include "extrect.h"
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include<sys/types.h>
+ #include<sys/stat.h>
+ #include <string.h>
+--
+1.8.3.2
+