import qt5-qtserialbus-5.15.2-1.el8

This commit is contained in:
CentOS Sources 2021-04-21 14:20:39 +00:00 committed by Andrew Lukoshko
parent 688aff0dd0
commit 571354bcd4
4 changed files with 13 additions and 9 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/qtserialbus-everywhere-src-5.12.5.tar.xz
SOURCES/qtserialbus-everywhere-src-5.15.2.tar.xz

View File

@ -1 +1 @@
8d3e72216d094c0a2d73fae643c1dc3c45c7b3e9 SOURCES/qtserialbus-everywhere-src-5.12.5.tar.xz
9e131f1da89407e8e9fc899f8ebbcb493682f137 SOURCES/qtserialbus-everywhere-src-5.15.2.tar.xz

View File

@ -1,8 +1,8 @@
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 74b0d1d..03a3d14 100644
index 572fef8..68e8b3f 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -51,6 +51,11 @@
@@ -56,6 +56,11 @@
#include <sys/ioctl.h>
#include <sys/time.h>
@ -11,6 +11,6 @@ index 74b0d1d..03a3d14 100644
+#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
+#endif
+
#ifndef CANFD_MTU
// CAN FD support was added by Linux kernel 3.6
// For prior kernels we redefine the missing defines here
#ifndef CANFD_BRS
# define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */
#endif

View File

@ -2,9 +2,9 @@
%global build_tests 1
Summary: Qt5 - SerialPort component
Summary: Qt5 - SerialBus component
Name: qt5-%{qt_module}
Version: 5.12.5
Version: 5.15.2
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@ -112,6 +112,10 @@ done
%changelog
* Mon Apr 05 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
- 5.15.2
Resolves: bz#1930053
* Mon Nov 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.12.5
Resolves: bz#1733149