diff --git a/qt5-qtwebsockets-gcc11.patch b/qt5-qtwebsockets-gcc11.patch new file mode 100644 index 0000000..5b33d7b --- /dev/null +++ b/qt5-qtwebsockets-gcc11.patch @@ -0,0 +1,12 @@ +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 + #include + #include + #include diff --git a/qt5-qtwebsockets.spec b/qt5-qtwebsockets.spec index f0d7fee..2b0bb74 100644 --- a/qt5-qtwebsockets.spec +++ b/qt5-qtwebsockets.spec @@ -1,31 +1,32 @@ -# spec file for qt5-qtwebsockets %global qt_module qtwebsockets -Summary: Qt5 - WebSockets component -Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 6 +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 major_minor %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/new_archive/qt/%{major_minor}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +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 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} +%package help +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description This module implements the WebSocket protocol as specified in RFC @@ -39,6 +40,7 @@ This package include examples for %{name} %prep %setup -q -n %{qt_module}-everywhere-src-%{version} +%patch0 -p1 %build @@ -71,7 +73,6 @@ 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 @@ -82,6 +83,9 @@ popd %{_qt5_examplesdir}/ %changelog +* Wed Oct 13 2021 peijiankang - 5.15.2-4 +- update to upstream version 5.15.2 + * Mon Sep 14 2020 liuweibo - 5.11.1-6 - Fix Source0 diff --git a/qt5-qtwebsockets.yaml b/qt5-qtwebsockets.yaml index 3cda74c..892412b 100644 --- a/qt5-qtwebsockets.yaml +++ b/qt5-qtwebsockets.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://code.qt.io/qt/qtwebsockets.git -tag_prefix: ^v -seperator: . +tag_prefix: "^v" +separator: "." diff --git a/qtwebsockets-everywhere-src-5.11.1.tar.xz b/qtwebsockets-everywhere-src-5.11.1.tar.xz deleted file mode 100644 index 3335c8f..0000000 Binary files a/qtwebsockets-everywhere-src-5.11.1.tar.xz and /dev/null differ diff --git a/qtwebsockets-everywhere-src-5.15.2.tar.xz b/qtwebsockets-everywhere-src-5.15.2.tar.xz new file mode 100644 index 0000000..6e5ebed Binary files /dev/null and b/qtwebsockets-everywhere-src-5.15.2.tar.xz differ