Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtserialbus/, dev-qt/qtserialbus/files/
Date: Sun, 01 Sep 2019 23:07:48
Message-Id: 1567379244.3d1586fade3f0eda87ce1a830961af79d6d28e0c.asturm@gentoo
1 commit: 3d1586fade3f0eda87ce1a830961af79d6d28e0c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 1 23:04:27 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 1 23:07:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1586fa
7
8 dev-qt/qtserialbus: Fix build with >=linux-headers-5.2
9
10 Bug: https://bugs.gentoo.org/692352
11 Package-Manager: Portage-2.3.74, Repoman-2.3.17
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 ...2.4-canbus-missing-header-w-linux-headers.patch | 31 ++++++++++++++++++++++
15 dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild | 4 +++
16 2 files changed, 35 insertions(+)
17
18 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
19 new file mode 100644
20 index 00000000000..54c0b11087c
21 --- /dev/null
22 +++ b/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch
23 @@ -0,0 +1,31 @@
24 +From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001
25 +From: Andre Hartmann <aha_1980@×××.de>
26 +Date: Mon, 8 Jul 2019 21:35:12 +0200
27 +Subject: [PATCH] =?utf8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98?=
28 + =?utf8?q?SIOCGSTAMP=E2=80=99=20was=20not=20declared"?=
29 +MIME-Version: 1.0
30 +Content-Type: text/plain; charset=utf8
31 +Content-Transfer-Encoding: 8bit
32 +
33 +Fixes: QTBUG-76957
34 +Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
35 +Reviewed-by: Alex Blasche <alexander.blasche@××.io>
36 +Reviewed-by: Denis Shienkov <denis.shienkov@×××××.com>
37 +---
38 + src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 +
39 + 1 file changed, 1 insertion(+)
40 +
41 +diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
42 +index 74b0d1d9..a2da146f 100644
43 +--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
44 ++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
45 +@@ -45,6 +45,7 @@
46 +
47 + #include <linux/can/error.h>
48 + #include <linux/can/raw.h>
49 ++#include <linux/sockios.h>
50 + #include <errno.h>
51 + #include <unistd.h>
52 + #include <net/if.h>
53 +--
54 +2.16.3
55
56 diff --git a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
57 index 4a031a9a92a..a1577e3db33 100644
58 --- a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
59 +++ b/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
60 @@ -12,6 +12,10 @@ fi
61
62 IUSE=""
63
64 +PATCHES+=(
65 + "${FILESDIR}/${P}-canbus-missing-header-w-linux-headers.patch" # QTBUG-76957
66 +)
67 +
68 DEPEND="
69 ~dev-qt/qtcore-${PV}
70 ~dev-qt/qtnetwork-${PV}