update to upstream version 5.15.2
This commit is contained in:
parent
84aa377f7f
commit
5a45fc90c1
@ -1,24 +0,0 @@
|
||||
From c930d20484758a6d847a0506caf4bede38043b76 Mon Sep 17 00:00:00 2001
|
||||
From: hht8 <huanghaitao12138@163.com>
|
||||
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 <linux/can/error.h>
|
||||
#include <linux/can/raw.h>
|
||||
+#include <linux/sockios.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <net/if.h>
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -3,15 +3,16 @@
|
||||
%global qt_module qtserialbus
|
||||
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.11.1
|
||||
Release: 7
|
||||
Version: 5.15.2
|
||||
Release: 1
|
||||
Summary: QtSerialbus component for qt5
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
URL: http://www.qt.io
|
||||
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}}
|
||||
@ -74,6 +75,9 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
|
||||
- update to upstream version 5.15.2
|
||||
|
||||
* Mon Nov 09 2020 huanghaitao <huanghaitao8@huawei.com> - 5.11.1-7
|
||||
- Fix missing define
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
version_control: git
|
||||
src_repo: https://code.qt.io/qt/qtserialbus.git
|
||||
tag_prefix: ^v
|
||||
seperator: .
|
||||
tag_prefix: "^v"
|
||||
separator: "."
|
||||
|
||||
Binary file not shown.
16
qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
Normal file
16
qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
Normal file
@ -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 <sys/ioctl.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
+// 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
|
||||
BIN
qtserialbus-everywhere-src-5.15.2.tar.xz
Normal file
BIN
qtserialbus-everywhere-src-5.15.2.tar.xz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user