Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
7acc61e2e5
!8 [sync] PR-7: update to upstream version 5.15.2
Merge pull request !8 from openeuler-sync-bot/sync-pr7-master-to-openEuler-22.03-LTS-Next
2022-01-24 08:27:09 +00:00
pei-jiankang
16a26ae4af update to upstream version 5.15.2
(cherry picked from commit 5a45fc90c1fbd290e701e93a2be703dae88ee360)
2022-01-17 14:56:34 +08:00
openeuler-ci-bot
84aa377f7f !6 Fix missing define
From: @hht8
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-11-09 14:38:37 +08:00
hht8
deb9c9d6f9 Fix missing define 2020-11-09 11:11:22 +08:00
openeuler-ci-bot
dbe3a4dbac !3 Fix Source0
From: @kkkl12
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-09-14 15:09:45 +08:00
kkkl12
f2662581e3 Fix Source0 2020-09-14 14:59:29 +08:00
openeuler-ci-bot
281aa33441 !2 add yaml file
Merge pull request !2 from sugarfillet/master
2020-05-15 10:39:51 +08:00
sugarfillet
a0b75def50 add yaml file 2020-05-08 15:59:20 +08:00
openeuler-ci-bot
d8ef1ea89e !1 package init
Merge pull request !1 from ultra_planet/new
2020-02-14 17:51:25 +08:00
ultra_planet
e7109ebbc9 package init 2020-02-14 15:03:17 +08:00
4 changed files with 108 additions and 0 deletions

88
qt5-qtserialbus.spec Normal file
View File

@ -0,0 +1,88 @@
# spec file for qt5-qtserialbus
%global qt_module qtserialbus
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/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}
%package help
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description
This package provides the functionalities for qt5 which includes configuring,
I/O operations, getting and setting the control signals of the RS-232 pinouts.
%description devel
Development files for %{name}
%description help
Examples files for %{name}
%prep
%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{qmake_qt5} .. %{?_qt5_examplesdir:CONFIG+=qt_example_installs}
%make_build
%install
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%ldconfig_scriptlets
%files
%license LICENSE.*
%{_qt5_bindir}/canbusutil
%{_qt5_libdir}/libQt5SerialBus.so.5*
%{_qt5_plugindir}/canbus
%files devel
%{_qt5_headerdir}/QtSerialBus/
%{_qt5_libdir}/libQt5SerialBus.prl
%{_qt5_libdir}/libQt5SerialBus.so
%dir %{_qt5_libdir}/cmake/Qt5SerialBus/
%{_qt5_archdatadir}/mkspecs/modules/*
%{_qt5_libdir}/cmake/Qt5SerialBus
%{_qt5_libdir}/pkgconfig/Qt5SerialBus.pc
%exclude %{_qt5_libdir}/libQt5SerialBus.la
%files help
%{_qt5_examplesdir}/
%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
* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-6
- Fix Source0
* Fri Feb 14 2020 lingsheng <lingsheng@huawei.com> - 5.11.1-5
- Package init

4
qt5-qtserialbus.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: git
src_repo: https://code.qt.io/qt/qtserialbus.git
tag_prefix: "^v"
separator: "."

View 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

Binary file not shown.