aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qcanobserver
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2011-02-23 21:56:07 +0100
committerKoen Kooi <koen@openembedded.org>2011-02-28 08:56:14 +0100
commit9a6d6f07929e033f2c4f5b4f797b709eb70547fd (patch)
tree5ff267e1b1383b2fa7f10ac255aafad0f71dcc0b /recipes/qcanobserver
parent2de86aa285bee790c9c4171d66b0a03932cb0865 (diff)
downloadopenembedded-9a6d6f07929e033f2c4f5b4f797b709eb70547fd.tar.gz
qcanobserver: move to r43
Signed-off-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/qcanobserver')
-rw-r--r--recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch31
-rw-r--r--recipes/qcanobserver/qcanobserver_svn.bb2
2 files changed, 19 insertions, 14 deletions
diff --git a/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch b/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
index 6a19d8ddbf..7a2b96dfe5 100644
--- a/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
+++ b/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
@@ -13,22 +13,27 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
messagebufferinterface.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
+
diff --git a/messagebufferinterface.cpp b/messagebufferinterface.cpp
-index e26b52d..117ebb4 100644
+index 86e6c87..7f76b56 100644
--- a/messagebufferinterface.cpp
+++ b/messagebufferinterface.cpp
-@@ -19,8 +19,9 @@
- #include "errordialog.h"
- #include <stdio.h>
- #include <fcntl.h>
--#include<sys/types.h>
--#include<sys/stat.h>
+@@ -25,14 +25,15 @@
+ #include <sys/time.h>
+ #include <QFile>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
- #include <string.h>
- #include <stdlib.h>
- #include <sys/time.h>
---
-1.6.6.1
-
++
+ #include <linux/can.h>
+ #include <linux/can/raw.h>
+ #include <syscall.h>
+
+ #include "configdialog.h"
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <sys/stat.h>
+
+
+ void MessageBufferInterface::configChanged(__config cfg)
diff --git a/recipes/qcanobserver/qcanobserver_svn.bb b/recipes/qcanobserver/qcanobserver_svn.bb
index 4a7bd62e99..8b31aaadc9 100644
--- a/recipes/qcanobserver/qcanobserver_svn.bb
+++ b/recipes/qcanobserver/qcanobserver_svn.bb
@@ -6,7 +6,7 @@ inherit qt4x11
DEPENDS += "qwt"
PV = "0.5+svnr${SRCPV}"
-SRCREV = "41"
+SRCREV = "43"
SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;proto=https \
file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \
file://candemo.xml"