Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtwebview for
openSUSE:Factory checked in at 2022-06-29 16:01:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebview (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebview.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebview"
Wed Jun 29 16:01:15 2022 rev:19 rq:985501 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebview/libqt5-qtwebview.changes
2021-06-26 21:25:36.839355261 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebview.new.1548/libqt5-qtwebview.changes
2022-06-29 16:02:33.224718183 +0200
@@ -1,0 +2,13 @@
+Mon Jun 27 13:10:55 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Revert "Update commercial license headers"
+ * Do the pre-initialization steps after the plugin paths are set
+ * Update commercial license headers
+ * Add export-ignore for .gitignore to .gitattributes
+ * Add gitignore file
+ * Sync with window visibilty due to offscreen windows in use
+ * Only generate the qrc file and add qmldir to it if we are static
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtwebview-everywhere-src-5.15.2+kde2.obscpio
New:
----
qtwebview-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebview.spec ++++++
--- /var/tmp/diff_new_pack.YvJ1rx/_old 2022-06-29 16:02:33.808718960 +0200
+++ /var/tmp/diff_new_pack.YvJ1rx/_new 2022-06-29 16:02:33.812718965 +0200
@@ -19,19 +19,17 @@
%define qt5_snapshot 1
%define libname libQt5WebView5
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtwebview-everywhere-src-%{version}
Name: libqt5-qtwebview
-Version: 5.15.2+kde2
+Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 WebView Library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
Group: Development/Libraries/X11
URL: https://www.qt.io
Source: %{tar_version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
BuildRequires: libqt5-qtwebengine-private-headers-devel >= %{real_version}
BuildRequires: pkgconfig
++++++ _service ++++++
--- /var/tmp/diff_new_pack.YvJ1rx/_old 2022-06-29 16:02:33.852719019 +0200
+++ /var/tmp/diff_new_pack.YvJ1rx/_new 2022-06-29 16:02:33.852719019 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtwebview.git</param>
<param name="scm">git</param>
<param name="filename">qtwebview-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtwebview-everywhere-src-5.15.2+kde2.obscpio ->
qtwebview-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/.gitattributes
new/qtwebview-everywhere-src-5.15.5+kde0/.gitattributes
--- old/qtwebview-everywhere-src-5.15.2+kde2/.gitattributes 2020-10-28
12:48:59.000000000 +0100
+++ new/qtwebview-everywhere-src-5.15.5+kde0/.gitattributes 2022-06-02
21:59:24.000000000 +0200
@@ -1,2 +1,3 @@
.tag export-subst
+.gitignore export-ignore
.gitattributes export-ignore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/.gitignore
new/qtwebview-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtwebview-everywhere-src-5.15.2+kde2/.gitignore 1970-01-01
01:00:00.000000000 +0100
+++ new/qtwebview-everywhere-src-5.15.5+kde0/.gitignore 2022-06-02
21:59:24.000000000 +0200
@@ -0,0 +1,4 @@
+Makefile
+.qmake.cache
+.qmake.super
+*.pro.user*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/.qmake.conf
new/qtwebview-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtwebview-everywhere-src-5.15.2+kde2/.qmake.conf 2020-10-28
12:48:59.000000000 +0100
+++ new/qtwebview-everywhere-src-5.15.5+kde0/.qmake.conf 2022-06-02
21:59:24.000000000 +0200
@@ -2,4 +2,4 @@
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebview-everywhere-src-5.15.2+kde2/examples/webview/minibrowser/doc/src/minibrowser.qdoc
new/qtwebview-everywhere-src-5.15.5+kde0/examples/webview/minibrowser/doc/src/minibrowser.qdoc
---
old/qtwebview-everywhere-src-5.15.2+kde2/examples/webview/minibrowser/doc/src/minibrowser.qdoc
2020-10-28 12:48:59.000000000 +0100
+++
new/qtwebview-everywhere-src-5.15.5+kde0/examples/webview/minibrowser/doc/src/minibrowser.qdoc
2022-06-02 21:59:24.000000000 +0200
@@ -37,8 +37,8 @@
couple of controls to navigate through the browsing history.
\note When using the Qt WebView module it is necessary to call
QtWebView::initialize()
- before creating the QGuiApplication instance. Calling
QtWebView::initialize() will
- ensure that the necessary pre-setup steps are run.
+ immediately before creating the QGuiApplication instance. Calling
QtWebView::initialize()
+ will ensure that the necessary pre-setup steps are run.
\snippet minibrowser/main.cpp 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/.gitignore
new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/.gitignore
--- old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/.gitignore
1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/.gitignore
2022-06-02 21:59:24.000000000 +0200
@@ -0,0 +1,2 @@
+# Created during builds:
+/qmldir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/imports.pro
new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/imports.pro
--- old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/imports.pro
2020-10-28 12:48:59.000000000 +0100
+++ new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/imports.pro
2022-06-02 21:59:24.000000000 +0200
@@ -21,6 +21,8 @@
"</qresource>" \
"</RCC>"
-write_file($$OUT_PWD/qmake_QtWebView.qrc, webview_qrc)|error()
-RESOURCES = $$OUT_PWD/qmake_QtWebView.qrc
+static {
+ write_file($$OUT_PWD/qmake_QtWebView.qrc, webview_qrc)|error()
+ RESOURCES = $$OUT_PWD/qmake_QtWebView.qrc
+}
OTHER_FILES += qmldir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qquickviewcontroller.cpp
new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qquickviewcontroller.cpp
---
old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qquickviewcontroller.cpp
2020-10-28 12:48:59.000000000 +0100
+++
new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qquickviewcontroller.cpp
2022-06-02 21:59:24.000000000 +0200
@@ -260,7 +260,9 @@
connect(window, &QWindow::yChanged, this,
&QQuickViewController::scheduleUpdatePolish);
connect(window, &QQuickWindow::sceneGraphInitialized, this,
&QQuickViewController::scheduleUpdatePolish);
connect(window, &QQuickWindow::sceneGraphInvalidated, this,
&QQuickViewController::onSceneGraphInvalidated);
- connect(window, &QWindow::visibleChanged, this, [this](bool visible) {
m_view->setVisible(visible); });
+ connect(window, &QWindow::visibilityChanged, this,
[this](QWindow::Visibility visibility)
+ { m_view->setVisible(visibility != QWindow::Hidden); });
+ m_view->setVisible(window->visibility() != QWindow::Hidden);
m_view->setParentView(window);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qtwebviewfunctions.cpp
new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qtwebviewfunctions.cpp
--- old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qtwebviewfunctions.cpp
2020-10-28 12:48:59.000000000 +0100
+++ new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qtwebviewfunctions.cpp
2022-06-02 21:59:24.000000000 +0200
@@ -38,6 +38,7 @@
#include "qwebviewfactory_p.h"
#include "qwebviewplugin_p.h"
+#include <QtCore/qcoreapplication.h>
QT_BEGIN_NAMESPACE
@@ -48,26 +49,42 @@
\inheaderfile QtWebView
*/
+// This is a separate function so we can be sure that in non-static cases it
can be registered
+// as a pre hook for QCoreApplication, ensuring this is called after the
plugin paths have
+// been set to their defaults. For static builds then this will be called
explicitly when
+// QtWebView::initialize() is called by the application
+
+static void initializeImpl()
+{
+ if (QWebViewFactory::requiresExtraInitializationSteps()) {
+ // There might be plugins available, but their dependencies might not
be met,
+ // so make sure we have a valid plugin before using it.
+ // Note: A warning will be printed later if we're unable to load the
plugin.
+ QWebViewPlugin *plugin = QWebViewFactory::getPlugin();
+ if (plugin)
+ plugin->prepare();
+ }
+}
+
+#ifndef QT_STATIC
+Q_COREAPP_STARTUP_FUNCTION(initializeImpl);
+#endif
+
/*!
\fn void QtWebView::initialize()
\keyword qtwebview-initialize
This function initializes resources or sets options that are required by
the different back-ends.
- \note The \c initialize() function needs to be called immediately after
the QGuiApplication
+ \note The \c initialize() function needs to be called immediately before
the QGuiApplication
instance is created.
*/
void QtWebView::initialize()
{
- if (QWebViewFactory::requiresExtraInitializationSteps()) {
- // There might be plugins available, but their dependencies might not
be met,
- // so make sure we have a valid plugin before using it.
- // Note: A warning will be printed later if we're unable to load the
plugin.
- QWebViewPlugin *plugin = QWebViewFactory::getPlugin();
- if (plugin)
- plugin->prepare();
- }
+#ifdef QT_STATIC
+ initializeImpl();
+#endif
}
QT_END_NAMESPACE
++++++ qtwebview-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.YvJ1rx/_old 2022-06-29 16:02:34.008719227 +0200
+++ /var/tmp/diff_new_pack.YvJ1rx/_new 2022-06-29 16:02:34.012719232 +0200
@@ -1,6 +1,5 @@
name: qtwebview-everywhere-src
-version: 5.15.2+kde2
-mtime: 1603885739
-commit: 920de5f1cd9f9001cfef1bfd2c19e6720793362f
-
+version: 5.15.5+kde0
+mtime: 1654199964
+commit: 429096eb954672d3727a3e8cc83832bc79cf7967
