summaryrefslogtreecommitdiff
path: root/dev-qt/qtserialbus
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-09-06 10:28:05 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-09-06 10:28:05 +0100
commitf1af93971b7490792d8541bc790e0d8c6d787059 (patch)
treea38046712bbc3a3844d77452d16c84e716caa3d4 /dev-qt/qtserialbus
parentfc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
gentoo resync : 06.08.2019
Diffstat (limited to 'dev-qt/qtserialbus')
-rw-r--r--dev-qt/qtserialbus/Manifest3
-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
3 files changed, 37 insertions, 1 deletions
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index f111b66b3991..7ca626e5c84e 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,6 @@
+AUX qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch 1081 BLAKE2B 7c4ee33df12a74e947cfe682724faa096524e83e3b1d050ddc7c03c27bf21c9a5a72a44b4590e96346f04335464658cd122918ec0410edce15df5933ad4ef36f SHA512 50c36d47b388391a4805d8e055ec4294903af3b833fba348f77bf99f62bec52d3123155af6c83af174e14cb476cccea81240703fd6cb1ab052f211a43ca31c1d
DIST qtserialbus-everywhere-src-5.12.3.tar.xz 328664 BLAKE2B cea2ebacf8a2ffc6e2f1c1ab54327a50199407ded0338d6bbfd0a3d8672106253bcfc307fd38d2e81acecd87ae69f093f516a52e0e4a864130c8491f596cdba2 SHA512 5f9d477780bfcba1edb4a11592ea6f3a2a1b2e42fbbce898e167b1975b14e93b3840789230e320869cbdb16e33eb76b45310cd27089f2f854a20ac3b7e18d763
DIST qtserialbus-everywhere-src-5.12.4.tar.xz 328808 BLAKE2B 4a3ada386c256c4bbc9d584a6232568adfc705d69d3a9ed505a006b2c494333a75e0ad08210ca45f131cee8060afa380317574fcbed1c052825d168a4e650ae7 SHA512 7d302552780a08444ea676abf9d0503a10b12e976d9ea1c95b8359d16b190f5d75e409cd3c82e4bf711b9906dd1b183169e5746bf6dce65868332bdbbaa33394
EBUILD qtserialbus-5.12.3.ebuild 414 BLAKE2B 23c7ea63be8c4772057ce1dc65ffa7d8182e18aa7a3ff30714cb93ecda441628ea5e7875e941f7e87c907bcc1225334d2cf1ef47a2c4abf4ae8490717e80f3be SHA512 959c1ea2bcc708c31f05526afe89944c8c965df2a77a5e6ca79b464f11e9823efa7121cb8b43ae2e63c9a6fa068417e23cd71d0b5340cd689a7cd5990e140016
-EBUILD qtserialbus-5.12.4.ebuild 414 BLAKE2B ea1f322beb701cf9f49b3172c3e6e7ae5431db17b634554d85e82bb3ea3c39b5d0158d203e328694a98208237761894395344a9025bf36da9e40f4fb55f7bbe4 SHA512 6a11e2731daf1907b3c79502a8d578163fe44b0911bd3c419a5fe343c2c72008a361012dca0a934fb0803aa6a28a547e5b9f89b11d8900884879f8e2e3d11485
+EBUILD qtserialbus-5.12.4.ebuild 506 BLAKE2B 54eba7d020f01a30629dc607fa879a655c79386d58fca258995c5323afb8b5a4cf45c6352f42cf1e4ffed0b526d5c18ccc9ce0629c92879e4a9405de4929981b SHA512 8aa47356ecd7965fd5eb336bf7aee7903114e6cbed247d74aaee143f9e7e4bb96b5a1ae86968c77a96fc022f1a5497795d952fe5708ab9467defa80b266bd524
MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
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 000000000000..54c0b11087c3
--- /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 4a031a9a92a1..a1577e3db334 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}