Compare commits

..

No commits in common. "e82f96910a45638f51c03f6109f7808be5fe67fd" and "dd70b6f143f3178dae45b5d0cf7ec1282387c66f" have entirely different histories.

5 changed files with 27 additions and 53 deletions

View File

@ -1,12 +0,0 @@
diff --git a/src/websockets/qwebsocketprotocol.cpp b/src/websockets/qwebsocketprotocol.cpp
index df87a93..9556d18 100644
--- a/src/websockets/qwebsocketprotocol.cpp
+++ b/src/websockets/qwebsocketprotocol.cpp
@@ -38,6 +38,7 @@
****************************************************************************/
#include "qwebsocketprotocol_p.h"
+#include <limits>
#include <QtCore/QString>
#include <QtCore/QSet>
#include <QtCore/QtEndian>

View File

@ -1,44 +1,44 @@
# spec file for qt5-qtwebsockets
%global qt_module qtwebsockets
Summary: Qt5 - WebSockets component
Name: qt5-%{qt_module}
Version: 5.15.10
Release: 1
Summary: Qt5 - WebSockets component
Name: qt5-%{qt_module}
Version: 5.11.1
Release: 5
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://qt-project.org/
%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
Patch0: %{name}-gcc11.patch
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/
%global major_minor %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/archive/qt/%{major_minor}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
BuildRequires: make
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
BuildRequires: qt5-qtdeclarative-devel
%description
The QtWebSockets module implements the WebSocket protocol as specified in RFC
6455. It solely depends on Qt (no external dependencies).
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
%description devel
%{summary}.
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
%package examples
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
%package help
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description
This module implements the WebSocket protocol as specified in RFC
6455. It depends on Qt solely.
%description devel
This package include development files for %{name}
%description help
This package include examples for %{name}
%prep
%setup -q -n %{qt_module}-everywhere-src-%{version}
%patch0 -p1
%build
@ -50,8 +50,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%install
make install INSTALL_ROOT=%{buildroot}
## .prl/.la file love
# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
pushd %{buildroot}%{_qt5_libdir}
for prl_file in libQt5*.prl ; do
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" "${prl_file}"
@ -73,24 +71,16 @@ popd
%{_qt5_headerdir}/QtWebSockets/
%{_qt5_libdir}/libQt5WebSockets.so
%{_qt5_libdir}/libQt5WebSockets.prl
%dir %{_qt5_libdir}/cmake/Qt5WebSockets/
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_websockets*.pri
%{_qt5_libdir}/cmake/Qt5WebSockets/Qt5WebSocketsConfig*.cmake
%{_qt5_libdir}/pkgconfig/Qt5WebSockets.pc
%{_qt5_libdir}/qt5/qml/QtWebSockets/
%files examples
%files help
%{_qt5_examplesdir}/
%changelog
* Wed Aug 23 2023 peijiankang <peijiankang@kylinos.cn> - 5.15.10-1
- update to upstream version 5.15.10
* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
- update to upstream version 5.15.2
* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-6
- Fix Source0
* Fri Feb 14 2020 Ling Yang <lingyang2@huawei.com> - 5.11.1-5
- Package init

View File

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

Binary file not shown.