From c6e9be46663ba63c983dd85e65612ee3d9aaa87c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 21 2021 14:20:39 +0000 Subject: import qt5-qtserialbus-5.15.2-1.el8 --- diff --git a/.gitignore b/.gitignore index b0ce639..12d07c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtserialbus-everywhere-src-5.12.5.tar.xz +SOURCES/qtserialbus-everywhere-src-5.15.2.tar.xz diff --git a/.qt5-qtserialbus.metadata b/.qt5-qtserialbus.metadata index 946a925..3328a82 100644 --- a/.qt5-qtserialbus.metadata +++ b/.qt5-qtserialbus.metadata @@ -1 +1 @@ -8d3e72216d094c0a2d73fae643c1dc3c45c7b3e9 SOURCES/qtserialbus-everywhere-src-5.12.5.tar.xz +9e131f1da89407e8e9fc899f8ebbcb493682f137 SOURCES/qtserialbus-everywhere-src-5.15.2.tar.xz diff --git a/SOURCES/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch b/SOURCES/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch index 7809cb8..b37b8d2 100644 --- a/SOURCES/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch +++ b/SOURCES/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch @@ -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 #include @@ -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 diff --git a/SPECS/qt5-qtserialbus.spec b/SPECS/qt5-qtserialbus.spec index c81e9a6..91d2b42 100644 --- a/SPECS/qt5-qtserialbus.spec +++ b/SPECS/qt5-qtserialbus.spec @@ -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 - 5.15.2-1 +- 5.15.2 + Resolves: bz#1930053 + * Mon Nov 18 2019 Jan Grulich - 5.12.5-1 - 5.12.5 Resolves: bz#1733149