Compare commits

..

No commits in common. "bc3579cbda7556785b33ca1553bdee1409dc3658" and "d8ef1ea89ec4317b7a72feb6dc21b131f2ebc987" have entirely different histories.

5 changed files with 33 additions and 76 deletions

View File

@ -2,45 +2,39 @@
%global qt_module qtserialbus %global qt_module qtserialbus
Summary: Qt5 - SerialBus component Name: qt5-%{qt_module}
Name: qt5-%{qt_module} Version: 5.11.1
Version: 5.15.10 Release: 5
Release: 1 Summary: QtSerialbus component for qt5
License: LGPLv2 with exceptions or GPLv3 with exceptions
URL: http://www.qt.io
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details %global major_minor %(echo %{version} | cut -d. -f1-2)
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Source0: https://download.qt.io/archive/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz
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
## upstreamable patches BuildRequires: qt5-qtbase-devel >= %{version}
# workaround FTBFS against kernel-header-5.2.0+ BuildRequires: qt5-qtbase-private-devel
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}} %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
BuildRequires: qt5-qtserialport-devel >= %{version} BuildRequires: qt5-qtserialport-devel >= %{version}
%description
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 %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa} 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 %description devel
%{summary}. Development files for %{name}
%package examples
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
%description help
Examples files for %{name}
%prep %prep
%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 %autosetup -n %{qt_module}-everywhere-src-%{version} -p1
@ -49,53 +43,36 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build %build
mkdir %{_target_platform} mkdir %{_target_platform}
pushd %{_target_platform} pushd %{_target_platform}
%{qmake_qt5} .. \ %{qmake_qt5} .. %{?_qt5_examplesdir:CONFIG+=qt_example_installs}
%{?_qt5_examplesdir:CONFIG+=qt_example_installs}
%make_build %make_build
%install %install
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%ldconfig_scriptlets %ldconfig_scriptlets
%files %files
%license LICENSE.* %license LICENSE.*
%{_qt5_libdir}/libQt5SerialBus.so.5*
%{_qt5_bindir}/canbusutil %{_qt5_bindir}/canbusutil
%{_qt5_libdir}/libQt5SerialBus.so.5*
%{_qt5_plugindir}/canbus %{_qt5_plugindir}/canbus
%files devel %files devel
%{_qt5_headerdir}/QtSerialBus/ %{_qt5_headerdir}/QtSerialBus/
%{_qt5_libdir}/libQt5SerialBus.so
%{_qt5_libdir}/libQt5SerialBus.prl %{_qt5_libdir}/libQt5SerialBus.prl
%{_qt5_libdir}/libQt5SerialBus.so
%dir %{_qt5_libdir}/cmake/Qt5SerialBus/ %dir %{_qt5_libdir}/cmake/Qt5SerialBus/
%{_qt5_archdatadir}/mkspecs/modules/*
%{_qt5_libdir}/cmake/Qt5SerialBus %{_qt5_libdir}/cmake/Qt5SerialBus
%{_qt5_libdir}/pkgconfig/Qt5SerialBus.pc %{_qt5_libdir}/pkgconfig/Qt5SerialBus.pc
%{_qt5_archdatadir}/mkspecs/modules/*
%exclude %{_qt5_libdir}/libQt5SerialBus.la %exclude %{_qt5_libdir}/libQt5SerialBus.la
# no examples, yet %files help
%if 0%{?_qt5_examplesdir:1}
%files examples
%{_qt5_examplesdir}/ %{_qt5_examplesdir}/
%endif
%changelog %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 * Fri Feb 14 2020 lingsheng <lingsheng@huawei.com> - 5.11.1-5
- Package init - Package init

View File

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

Binary file not shown.

View File

@ -1,16 +0,0 @@
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