Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package qt6-websockets for openSUSE:Factory 
checked in at 2023-07-26 13:23:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-websockets (Old)
 and      /work/SRC/openSUSE:Factory/.qt6-websockets.new.15225 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qt6-websockets"

Wed Jul 26 13:23:14 2023 rev:15 rq:1100020 version:6.5.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-websockets/qt6-websockets.changes    
2023-05-28 19:22:55.068988958 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-websockets.new.15225/qt6-websockets.changes 
2023-07-26 13:23:52.359973861 +0200
@@ -1,0 +2,6 @@
+Thu Jul 20 09:07:37 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Update to 6.5.2
+  * https://www.qt.io/blog/qt-6.5.2-released-1
+
+-------------------------------------------------------------------

Old:
----
  qtwebsockets-everywhere-src-6.5.1.tar.xz

New:
----
  qtwebsockets-everywhere-src-6.5.2.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt6-websockets.spec ++++++
--- /var/tmp/diff_new_pack.zApJMr/_old  2023-07-26 13:23:53.015977819 +0200
+++ /var/tmp/diff_new_pack.zApJMr/_new  2023-07-26 13:23:53.023977868 +0200
@@ -16,7 +16,7 @@
 #
 
 
-%define real_version 6.5.1
+%define real_version 6.5.2
 %define short_version 6.5
 %define tar_name qtwebsockets-everywhere-src
 %define tar_suffix %{nil}
@@ -27,12 +27,12 @@
 %endif
 #
 Name:           qt6-websockets%{?pkg_suffix}
-Version:        6.5.1
+Version:        6.5.2
 Release:        0
 Summary:        Qt 6 WebSockets library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
 URL:            https://www.qt.io
-Source:         
https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
+Source:         
https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
 Source99:       qt6-websockets-rpmlintrc
 BuildRequires:  pkgconfig
 BuildRequires:  qt6-core-private-devel

++++++ qtwebsockets-everywhere-src-6.5.1.tar.xz -> 
qtwebsockets-everywhere-src-6.5.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.5.1/.cmake.conf 
new/qtwebsockets-everywhere-src-6.5.2/.cmake.conf
--- old/qtwebsockets-everywhere-src-6.5.1/.cmake.conf   2023-05-16 
11:46:05.000000000 +0200
+++ new/qtwebsockets-everywhere-src-6.5.2/.cmake.conf   2023-07-07 
14:29:28.000000000 +0200
@@ -1,3 +1,3 @@
-set(QT_REPO_MODULE_VERSION "6.5.1")
+set(QT_REPO_MODULE_VERSION "6.5.2")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
 set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.5.1/.tag 
new/qtwebsockets-everywhere-src-6.5.2/.tag
--- old/qtwebsockets-everywhere-src-6.5.1/.tag  2023-05-16 11:46:05.000000000 
+0200
+++ new/qtwebsockets-everywhere-src-6.5.2/.tag  2023-07-07 14:29:28.000000000 
+0200
@@ -1 +1 @@
-ec6015ec6f9c6e99adf1a69ce14af0d431a9fd46
+6065b3fc2ee7b7fa67539f82bd4eb4cfad8ccb81
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.5.1/CMakeLists.txt 
new/qtwebsockets-everywhere-src-6.5.2/CMakeLists.txt
--- old/qtwebsockets-everywhere-src-6.5.1/CMakeLists.txt        2023-05-16 
11:46:05.000000000 +0200
+++ new/qtwebsockets-everywhere-src-6.5.2/CMakeLists.txt        2023-07-07 
14:29:28.000000000 +0200
@@ -18,6 +18,7 @@
 
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals 
Core Network) # special case
 find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick 
QuickTest) # special case
+qt_internal_project_setup()
 
 if(NOT TARGET Qt::Network)
     message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" 
is not met.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.5.1/conanfile.py 
new/qtwebsockets-everywhere-src-6.5.2/conanfile.py
--- old/qtwebsockets-everywhere-src-6.5.1/conanfile.py  2023-05-16 
11:46:05.000000000 +0200
+++ new/qtwebsockets-everywhere-src-6.5.2/conanfile.py  1970-01-01 
01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-# Copyright (C) 2021 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH 
Qt-GPL-exception-1.0
-
-from conans import ConanFile
-import re
-from pathlib import Path
-
-
-def _parse_qt_version_by_key(key: str) -> str:
-    with open(Path(__file__).parent.resolve() / ".cmake.conf") as f:
-        m = re.search(fr'{key} .*"(.*)"', f.read())
-    return m.group(1) if m else ""
-
-
-def _get_qt_minor_version() -> str:
-    return 
".".join(_parse_qt_version_by_key("QT_REPO_MODULE_VERSION").split(".")[:2])
-
-
-class QtWebSockets(ConanFile):
-    name = "qtwebsockets"
-    license = "LGPL-3.0, GPL-2.0+, Commercial Qt License Agreement"
-    author = "The Qt Company <https://www.qt.io/contact-us>"
-    url = "https://code.qt.io/cgit/qt/qtwebsockets.git";
-    description = (
-        "WebSocket is a web-based protocol designed to enable two-way 
communication "
-        "between a client application and a remote host. It enables the two 
entities "
-        "to send data back and forth if the initial handshake succeeds. 
WebSocket is "
-        "the solution for applications that struggle to get real-time data 
feeds with "
-        "less network latency and minimum data exchange."
-    )
-    topics = "qt", "qt6", "qtwebsockets", "WebSocket"
-    settings = "os", "compiler", "arch", "build_type"
-    # for referencing the version number and prerelease tag and dependencies 
info
-    exports = ".cmake.conf", "dependencies.yaml"
-    exports_sources = "*", "!conan*.*"
-    python_requires = 
f"qt-conan-common/{_get_qt_minor_version()}@qt/everywhere"
-    python_requires_extend = "qt-conan-common.QtLeafModule"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.5.1/dependencies.yaml 
new/qtwebsockets-everywhere-src-6.5.2/dependencies.yaml
--- old/qtwebsockets-everywhere-src-6.5.1/dependencies.yaml     2023-05-16 
11:46:05.000000000 +0200
+++ new/qtwebsockets-everywhere-src-6.5.2/dependencies.yaml     2023-07-07 
14:29:28.000000000 +0200
@@ -1,7 +1,7 @@
 dependencies:
   ../qtbase:
-    ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e
+    ref: af457a9f0f7eb1a2a7d11f495da508faab91a442
     required: true
   ../qtdeclarative:
-    ref: 65651dc1d333e2aded18b0d6f0b71c35e5b40c1c
+    ref: f289063ff19588a11dd79213632785cfda2909a0
     required: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtwebsockets-everywhere-src-6.5.1/src/websockets/qwebsocket_wasm_p.cpp 
new/qtwebsockets-everywhere-src-6.5.2/src/websockets/qwebsocket_wasm_p.cpp
--- old/qtwebsockets-everywhere-src-6.5.1/src/websockets/qwebsocket_wasm_p.cpp  
2023-05-16 11:46:05.000000000 +0200
+++ new/qtwebsockets-everywhere-src-6.5.2/src/websockets/qwebsocket_wasm_p.cpp  
2023-07-07 14:29:28.000000000 +0200
@@ -132,7 +132,6 @@
                              const QWebSocketHandshakeOptions &options, bool 
mask)
 {
     Q_UNUSED(mask);
-    Q_UNUSED(options)
 
     emscripten_websocket_get_ready_state(m_socketContext, &m_readyState);
 
@@ -175,6 +174,8 @@
         }
     }
 
+    setRequest(request, options);
+
     EmscriptenWebSocketCreateAttributes attr;
 
     emscripten_websocket_init_create_attributes(&attr); // memset

Reply via email to