Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-webview for openSUSE:Factory checked in at 2023-07-26 13:23:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-webview (Old) and /work/SRC/openSUSE:Factory/.qt6-webview.new.15225 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-webview" Wed Jul 26 13:23:14 2023 rev:10 rq:1100021 version:6.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-webview/qt6-webview.changes 2023-07-08 22:47:43.247331654 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-webview.new.15225/qt6-webview.changes 2023-07-26 13:23:53.443980402 +0200 @@ -1,0 +2,6 @@ +Thu Jul 20 09:07:38 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.5.2 + * https://www.qt.io/blog/qt-6.5.2-released-1 + +------------------------------------------------------------------- Old: ---- qtwebview-everywhere-src-6.5.1.tar.xz New: ---- qtwebview-everywhere-src-6.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-webview.spec ++++++ --- /var/tmp/diff_new_pack.kdzbJx/_old 2023-07-26 13:23:54.075984217 +0200 +++ /var/tmp/diff_new_pack.kdzbJx/_new 2023-07-26 13:23:54.079984241 +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 qtwebview-everywhere-src %define tar_suffix %{nil} @@ -27,12 +27,12 @@ %endif # Name: qt6-webview%{?pkg_suffix} -Version: 6.5.1 +Version: 6.5.2 Release: 0 Summary: Qt 6 WebView 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 BuildRequires: qt6-core-private-devel BuildRequires: qt6-gui-private-devel BuildRequires: qt6-quick-private-devel ++++++ qtwebview-everywhere-src-6.5.1.tar.xz -> qtwebview-everywhere-src-6.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.5.1/.cmake.conf new/qtwebview-everywhere-src-6.5.2/.cmake.conf --- old/qtwebview-everywhere-src-6.5.1/.cmake.conf 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/.cmake.conf 2023-07-07 23:29:44.000000000 +0200 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.5.1") +set(QT_REPO_MODULE_VERSION "6.5.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.5.1/.tag new/qtwebview-everywhere-src-6.5.2/.tag --- old/qtwebview-everywhere-src-6.5.1/.tag 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/.tag 2023-07-07 23:29:44.000000000 +0200 @@ -1 +1 @@ -9352b7fa3cf7b8be8486ca3f2fd0549997a3d35b +eecab3086793adec2c48a3ccdb40bddd76a2b058 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.5.1/CMakeLists.txt new/qtwebview-everywhere-src-6.5.2/CMakeLists.txt --- old/qtwebview-everywhere-src-6.5.1/CMakeLists.txt 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/CMakeLists.txt 2023-07-07 23:29:44.000000000 +0200 @@ -15,6 +15,7 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Qml Quick OpenGL WebEngineCore WebEngineQuick ) +qt_internal_project_setup() # Make sure we use the fixed BASE argument of qt_add_resource. set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.5.1/conanfile.py new/qtwebview-everywhere-src-6.5.2/conanfile.py --- old/qtwebview-everywhere-src-6.5.1/conanfile.py 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/conanfile.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +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 QtWebView(ConanFile): - name = "qtwebview" - 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/qtwebview.git"; - description = ( - "Qt WebView provides a way to display web content in a QML application without necessarily " - "including a full web browser stack by using native APIs where it makes sense. " - "This is useful on mobile platforms such as Android and iOS; " - "On iOS the policy dictates that all web content is displayed using the operating " - "system's web view. " - "On Windows and Linux, Qt WebView depends on the Qt WebEngine module to render content." - "On macOS, the system web view is used in the same manner as iOS." - ) - topics = "qt", "qt6", "WebView" - 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/qtwebview-everywhere-src-6.5.1/dependencies.yaml new/qtwebview-everywhere-src-6.5.2/dependencies.yaml --- old/qtwebview-everywhere-src-6.5.1/dependencies.yaml 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/dependencies.yaml 2023-07-07 23:29:44.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtdeclarative: - ref: 65651dc1d333e2aded18b0d6f0b71c35e5b40c1c + ref: f289063ff19588a11dd79213632785cfda2909a0 required: true ../qtwebengine: - ref: 735d2f75d7c2ef01d0ac0a9827dfda2fa4373e84 + ref: ac887518e8243828333e923b5a1e61a007babde5 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.5.1/src/plugins/darwin/qdarwinwebview.mm new/qtwebview-everywhere-src-6.5.2/src/plugins/darwin/qdarwinwebview.mm --- old/qtwebview-everywhere-src-6.5.1/src/plugins/darwin/qdarwinwebview.mm 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/src/plugins/darwin/qdarwinwebview.mm 2023-07-07 23:29:44.000000000 +0200 @@ -112,7 +112,6 @@ - (void)pageDone { Q_EMIT qDarwinWebViewPrivate->loadProgressChanged(qDarwinWebViewPrivate->loadProgress()); - Q_EMIT qDarwinWebViewPrivate->titleChanged(qDarwinWebViewPrivate->title()); } - (void)handleError:(NSError *)error @@ -233,6 +232,8 @@ Q_UNUSED(context); if ([keyPath isEqualToString:@"estimatedProgress"]) { Q_EMIT qDarwinWebViewPrivate->loadProgressChanged(qDarwinWebViewPrivate->loadProgress()); + } else if ([keyPath isEqualToString:@"title"]) { + Q_EMIT qDarwinWebViewPrivate->titleChanged(qDarwinWebViewPrivate->title()); } } @@ -321,6 +322,9 @@ [wkWebView addObserver:wkWebView.navigationDelegate forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptions(NSKeyValueObservingOptionNew) context:nil]; + [wkWebView addObserver:wkWebView.navigationDelegate forKeyPath:@"title" + options:NSKeyValueObservingOptions(NSKeyValueObservingOptionNew) + context:nil]; m_settings = new QDarwinWebViewSettingsPrivate(wkWebView.configuration, this); @@ -335,6 +339,8 @@ [wkWebView stopLoading]; [wkWebView removeObserver:wkWebView.navigationDelegate forKeyPath:@"estimatedProgress" context:nil]; + [wkWebView removeObserver:wkWebView.navigationDelegate forKeyPath:@"title" + context:nil]; [wkWebView.navigationDelegate release]; wkWebView.navigationDelegate = nil; [wkWebView release]; @@ -579,7 +585,7 @@ [cookieStore getAllCookies:^(NSArray *cookies) { NSHTTPCookie *cookie; for (cookie in cookies) { - if (cookie.domain == cookieDomain && cookie.name == cookieName) { + if ([cookie.domain isEqualToString:cookieDomain] && [cookie.name isEqualToString:cookieName]) { [cookieStore deleteCookie:cookie completionHandler:^{ Q_EMIT cookieRemoved(QString::fromNSString(cookie.domain), QString::fromNSString(cookie.name)); }]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.5.1/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp new/qtwebview-everywhere-src-6.5.2/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp --- old/qtwebview-everywhere-src-6.5.1/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp 2023-07-07 23:29:44.000000000 +0200 @@ -100,6 +100,8 @@ { QObject *viewInstance = m_component->create(); QQuickWebView *webView = qobject_cast<QQuickWebView*>(viewInstance); + webView->settings()->setAllowFileAccess(true); + webView->settings()->setLocalContentCanAccessFileUrls(true); return webView; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.5.1/tests/auto/webview/qwebview/tst_qwebview.cpp new/qtwebview-everywhere-src-6.5.2/tests/auto/webview/qwebview/tst_qwebview.cpp --- old/qtwebview-everywhere-src-6.5.1/tests/auto/webview/qwebview/tst_qwebview.cpp 2023-05-16 16:13:40.000000000 +0200 +++ new/qtwebview-everywhere-src-6.5.2/tests/auto/webview/qwebview/tst_qwebview.cpp 2023-07-07 23:29:44.000000000 +0200 @@ -76,6 +76,8 @@ QWebView &view = qview.webView(); #else QWebView view; + view.getSettings()->setAllowFileAccess(true); + view.getSettings()->setLocalContentCanAccessFileUrls(true); #endif QCOMPARE(view.loadProgress(), 0); const QUrl url = QUrl::fromLocalFile(fileName); @@ -153,6 +155,8 @@ QWebView &view = qview.webView(); #else QWebView view; + view.getSettings()->setAllowFileAccess(true); + view.getSettings()->setLocalContentCanAccessFileUrls(true); #endif QCOMPARE(view.loadProgress(), 0); const QUrl url = QUrl::fromLocalFile(fileName); @@ -185,6 +189,8 @@ QWebView &view = qview.webView(); #else QWebView view; + view.getSettings()->setAllowFileAccess(true); + view.getSettings()->setLocalContentCanAccessFileUrls(true); #endif QCOMPARE(view.loadProgress(), 0); QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(const QWebViewLoadRequestPrivate &))); @@ -217,6 +223,9 @@ QWebView & view = qview.webView(); #else QWebView view; + view.getSettings()->setLocalStorageEnabled(true); + view.getSettings()->setAllowFileAccess(true); + view.getSettings()->setLocalContentCanAccessFileUrls(true); #endif QSignalSpy cookieAddedSpy(&view, SIGNAL(cookieAdded(const QString &, const QString &)));
