diff --git a/Fix-missing-define.patch b/Fix-missing-define.patch deleted file mode 100644 index 973bdaf..0000000 --- a/Fix-missing-define.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c930d20484758a6d847a0506caf4bede38043b76 Mon Sep 17 00:00:00 2001 -From: hht8 -Date: Mon, 9 Nov 2020 10:51:17 +0800 -Subject: [PATCH] Add define with SIOCGSTAMP - ---- - 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 74b0d1d..a2da146 100644 ---- a/src/plugins/canbus/socketcan/socketcanbackend.cpp -+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp -@@ -45,6 +45,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.23.0 - diff --git a/qt5-qtserialbus.spec b/qt5-qtserialbus.spec index 2f050a5..c1b4f4f 100644 --- a/qt5-qtserialbus.spec +++ b/qt5-qtserialbus.spec @@ -2,29 +2,30 @@ %global qt_module qtserialbus -Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 7 -Summary: QtSerialbus component for qt5 -License: LGPLv2 with exceptions or GPLv3 with exceptions -URL: http://www.qt.io +Name: qt5-%{qt_module} +Version: 5.15.2 +Release: 1 +Summary: QtSerialbus component for qt5 +License: LGPLv2 with exceptions or GPLv3 with exceptions +Url: http://www.qt.io %global major_minor %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz -Patch6000: Fix-missing-define.patch +Source0: https://download.qt.io/official_releases/qt/%{major_minor}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +Patch0: qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch +BuildRequires: make BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} BuildRequires: qt5-qtserialport-devel >= %{version} %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel%{?_isa} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} %package help -Summary: Programming examples for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description This package provides the functionalities for qt5 which includes configuring, @@ -74,6 +75,9 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} %changelog +* Wed Oct 13 2021 peijiankang - 5.15.2-1 +- update to upstream version 5.15.2 + * Mon Nov 09 2020 huanghaitao - 5.11.1-7 - Fix missing define diff --git a/qt5-qtserialbus.yaml b/qt5-qtserialbus.yaml index ebdf0a3..239a522 100644 --- a/qt5-qtserialbus.yaml +++ b/qt5-qtserialbus.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://code.qt.io/qt/qtserialbus.git -tag_prefix: ^v -seperator: . +tag_prefix: "^v" +separator: "." diff --git a/qtserialbus-everywhere-src-5.11.1.tar.xz b/qtserialbus-everywhere-src-5.11.1.tar.xz deleted file mode 100644 index 9134a92..0000000 Binary files a/qtserialbus-everywhere-src-5.11.1.tar.xz and /dev/null differ diff --git a/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch b/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch new file mode 100644 index 0000000..b37b8d2 --- /dev/null +++ b/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp +index 572fef8..68e8b3f 100644 +--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp ++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp +@@ -56,6 +56,11 @@ + #include + #include + ++// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD ++#ifndef SIOCGSTAMP ++#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ ++#endif ++ + #ifndef CANFD_BRS + # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ + #endif diff --git a/qtserialbus-everywhere-src-5.15.2.tar.xz b/qtserialbus-everywhere-src-5.15.2.tar.xz new file mode 100644 index 0000000..3cdd7b8 Binary files /dev/null and b/qtserialbus-everywhere-src-5.15.2.tar.xz differ