Compare commits
No commits in common. "4a757ebe1a1d47738db87640116867c30b055953" and "9625d39efe65c17164065e7527b296aec69cfc5c" have entirely different histories.
4a757ebe1a
...
9625d39efe
36
README.en.md
Normal file
36
README.en.md
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
# qt5-qtwebsockets
|
||||||
|
|
||||||
|
#### Description
|
||||||
|
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
|
||||||
|
|
||||||
|
#### Software Architecture
|
||||||
|
Software architecture description
|
||||||
|
|
||||||
|
#### Installation
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### Instructions
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### Contribution
|
||||||
|
|
||||||
|
1. Fork the repository
|
||||||
|
2. Create Feat_xxx branch
|
||||||
|
3. Commit your code
|
||||||
|
4. Create Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
#### Gitee Feature
|
||||||
|
|
||||||
|
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||||
|
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||||
|
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||||
|
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||||
|
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||||
|
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||||
39
README.md
Normal file
39
README.md
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
# qt5-qtwebsockets
|
||||||
|
|
||||||
|
#### 介绍
|
||||||
|
{**以下是码云平台说明,您可以替换此简介**
|
||||||
|
码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台
|
||||||
|
无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
|
||||||
|
|
||||||
|
#### 软件架构
|
||||||
|
软件架构说明
|
||||||
|
|
||||||
|
|
||||||
|
#### 安装教程
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### 使用说明
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### 参与贡献
|
||||||
|
|
||||||
|
1. Fork 本仓库
|
||||||
|
2. 新建 Feat_xxx 分支
|
||||||
|
3. 提交代码
|
||||||
|
4. 新建 Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
#### 码云特技
|
||||||
|
|
||||||
|
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
|
||||||
|
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||||
|
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
||||||
|
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
|
||||||
|
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||||
|
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||||
@ -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>
|
|
||||||
@ -1,93 +0,0 @@
|
|||||||
%global qt_module qtwebsockets
|
|
||||||
|
|
||||||
Summary: Qt5 - WebSockets component
|
|
||||||
Name: qt5-%{qt_module}
|
|
||||||
Version: 5.15.2
|
|
||||||
Release: 1
|
|
||||||
|
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
|
||||||
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-src-%{version}.tar.xz
|
|
||||||
Patch0: %{name}-gcc11.patch
|
|
||||||
|
|
||||||
%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
|
|
||||||
|
|
||||||
%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 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
|
|
||||||
%{qmake_qt5}
|
|
||||||
|
|
||||||
%make_build
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
make install INSTALL_ROOT=%{buildroot}
|
|
||||||
|
|
||||||
pushd %{buildroot}%{_qt5_libdir}
|
|
||||||
for prl_file in libQt5*.prl ; do
|
|
||||||
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" "${prl_file}"
|
|
||||||
if [[ -f "$(basename ${prl_file} .prl).so" ]]; then
|
|
||||||
rm -fv "$(basename ${prl_file} .prl).la"
|
|
||||||
sed -i -e "/^QMAKE_PRL_LIBS/d" "${prl_file}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
popd
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
|
||||||
|
|
||||||
%files
|
|
||||||
%license LICENSE.*
|
|
||||||
%{_qt5_archdatadir}/qml/Qt/WebSockets/
|
|
||||||
%{_qt5_libdir}/libQt5WebSockets.so.5*
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%{_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 help
|
|
||||||
%{_qt5_examplesdir}/
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* 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
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: git
|
|
||||||
src_repo: https://code.qt.io/qt/qtwebsockets.git
|
|
||||||
tag_prefix: "^v"
|
|
||||||
separator: "."
|
|
||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user