Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
bc3579cbda
!10 [sync] PR-9: update to version 5.15.10-1
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-08-30 09:44:00 +00:00
huayadong
de69a9b59f update to version 5.15.10-1
(cherry picked from commit 72dba2e3eab92bdd7a4d1184d443184f72692c9e)
2023-08-25 08:28:20 +08:00
openeuler-ci-bot
2115ed835e
!7 update to upstream version 5.15.2
Merge pull request !7 from pei-jiankang/master
2022-01-14 07:03:17 +00:00
pei-jiankang
5a45fc90c1 update to upstream version 5.15.2 2021-12-30 14:24:48 +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
5 changed files with 75 additions and 32 deletions

View File

@ -2,39 +2,45 @@
%global qt_module qtserialbus
Name: qt5-%{qt_module}
Version: 5.11.1
Release: 5
Summary: QtSerialbus component for qt5
License: LGPLv2 with exceptions or GPLv3 with exceptions
URL: http://www.qt.io
Summary: Qt5 - SerialBus component
Name: qt5-%{qt_module}
Version: 5.15.10
Release: 1
%global major_minor %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/archive/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-private-devel
## upstreamable patches
# workaround FTBFS against kernel-header-5.2.0+
Patch100: qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
BuildRequires: make
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-private-devel
#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit)
%{?_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}
BuildRequires: qt5-qtserialport-devel >= %{version}
%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.
Qt Serial Bus (API) provides classes and functions to access the various
industrial serial buses and protocols, such as CAN, ModBus, and others.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
%description devel
Development files for %{name}
%{summary}.
%package examples
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
%description help
Examples files for %{name}
%prep
%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
@ -43,36 +49,53 @@ Examples files for %{name}
%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{qmake_qt5} .. %{?_qt5_examplesdir:CONFIG+=qt_example_installs}
%{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_bindir}/canbusutil
%{_qt5_plugindir}/canbus
%files devel
%{_qt5_headerdir}/QtSerialBus/
%{_qt5_libdir}/libQt5SerialBus.prl
%{_qt5_libdir}/libQt5SerialBus.so
%{_qt5_libdir}/libQt5SerialBus.prl
%dir %{_qt5_libdir}/cmake/Qt5SerialBus/
%{_qt5_archdatadir}/mkspecs/modules/*
%{_qt5_libdir}/cmake/Qt5SerialBus
%{_qt5_libdir}/pkgconfig/Qt5SerialBus.pc
%{_qt5_archdatadir}/mkspecs/modules/*
%exclude %{_qt5_libdir}/libQt5SerialBus.la
%files help
# no examples, yet
%if 0%{?_qt5_examplesdir:1}
%files examples
%{_qt5_examplesdir}/
%endif
%changelog
* Mon Aug 21 2023 huayadong <huayadong@kylinos.cn> - 5.15.10-1
- update to version 5.15.10-1
* 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: "."

Binary file not shown.

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