From 8799d3b71cc9463316a0377913ae707540568e69 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Sep 2019 13:13:05 -0700 Subject: qtserialbus: Fix build with 5.2+ kernel headers Backport relevant patch from upstream Signed-off-by: Khem Raj --- ...ix-compiler-error-SIOCGSTAMP-was-not-decl.patch | 33 ++++++++++++++++++++++ recipes-qt/qt5/qtserialbus_git.bb | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch diff --git a/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch b/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch new file mode 100644 index 00000000..c42af774 --- /dev/null +++ b/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch @@ -0,0 +1,33 @@ +From b835affb7851f9b8bc2554f0a38e4b539505a132 Mon Sep 17 00:00:00 2001 +From: Andre Hartmann +Date: Mon, 8 Jul 2019 21:35:12 +0200 +Subject: [PATCH] =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"?= + =?UTF-8?q?=E2=80=98SIOCGSTAMP=E2=80=99=20was=20not=20declared"?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: QTBUG-76957 +Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b +Reviewed-by: Alex Blasche +Reviewed-by: Denis Shienkov +--- +Upstream-Status: Backport [https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482] + src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp +index 74b0d1d..a2da146 100644 +--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp ++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp +@@ -45,6 +45,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.23.0 + diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 1d48f5b0..b0547923 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" +SRC_URI += "file://0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch" + SRCREV = "b18c452fdbe09c54caacb4323dea65b3746485e5" -- cgit v1.2.3-54-g00ecf