summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-09-02 01:04:27 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-09-02 01:07:24 +0200
commit3d1586fade3f0eda87ce1a830961af79d6d28e0c (patch)
tree31c65159cb20720d74b7d905bece335d7deb2d90 /dev-qt
parentnet-libs/telepathy-accounts-signon: arm64 stable (bug #693210) (diff)
downloadgentoo-3d1586fade3f0eda87ce1a830961af79d6d28e0c.tar.gz
gentoo-3d1586fade3f0eda87ce1a830961af79d6d28e0c.tar.bz2
gentoo-3d1586fade3f0eda87ce1a830961af79d6d28e0c.zip
dev-qt/qtserialbus: Fix build with >=linux-headers-5.2
Bug: https://bugs.gentoo.org/692352 Package-Manager: Portage-2.3.74, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch31
-rw-r--r--dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild4
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch b/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch
new file mode 100644
index 00000000000..54c0b11087c
--- /dev/null
+++ b/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch
@@ -0,0 +1,31 @@
+From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001
+From: Andre Hartmann <aha_1980@gmx.de>
+Date: Mon, 8 Jul 2019 21:35:12 +0200
+Subject: [PATCH] =?utf8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98?=
+ =?utf8?q?SIOCGSTAMP=E2=80=99=20was=20not=20declared"?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes: QTBUG-76957
+Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
+Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
+Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
+---
+ 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 74b0d1d9..a2da146f 100644
+--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
+@@ -45,6 +45,7 @@
+
+ #include <linux/can/error.h>
+ #include <linux/can/raw.h>
++#include <linux/sockios.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <net/if.h>
+--
+2.16.3
diff --git a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
index 4a031a9a92a..a1577e3db33 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
@@ -12,6 +12,10 @@ fi
IUSE=""
+PATCHES+=(
+ "${FILESDIR}/${P}-canbus-missing-header-w-linux-headers.patch" # QTBUG-76957
+)
+
DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtnetwork-${PV}