* [PR PATCH] qt5/qt5-webengine updates
@ 2021-06-26 8:16 Johnnynator
2021-08-13 13:27 ` [PR PATCH] [Closed]: " Johnnynator
0 siblings, 1 reply; 2+ messages in thread
From: Johnnynator @ 2021-06-26 8:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt5-updates
https://github.com/void-linux/void-packages/pull/31661
qt5/qt5-webengine updates
- qt5-webengine: update to 5.15.5.
- qt5: update to 5.15.3+20210625.
<!-- Mark items with [x] where applicable -->
[ci skip]
#### General
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64, x86_64-musl. i686)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
- [x] armv6l
- [x] armv7l
- [x] aarch64
A patch file from https://github.com/void-linux/void-packages/pull/31661.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5-updates-31661.patch --]
[-- Type: text/x-diff, Size: 24700 bytes --]
From 4d38c0a8bfd40ca635205ab40b64df8c578a9683 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 23 Jun 2021 19:10:39 +0200
Subject: [PATCH 1/2] qt5-webengine: update to 5.15.5.
---
.../patches/0120-QTBUG-91773.patch | 372 ------------------
.../0200-invalidate-old-v8-cache.patch | 31 --
srcpkgs/qt5-webengine/template | 16 +-
3 files changed, 9 insertions(+), 410 deletions(-)
delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
- m_adapterClient->loadFinished(false, request.url(), false,
- net::ERR_DISALLOWED_URL_SCHEME,
- QCoreApplication::translate("WebContentsAdapter",
-- "HTTP-POST data can only be sent over HTTP(S) protocol"),
-- false);
-+ "HTTP-POST data can only be sent over HTTP(S) protocol"));
- return;
- }
- params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
-
- GURL dataUrlToLoad(urlString);
- if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
-- m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+ m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
- return;
- }
- content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
- if (m_webContents->IsLoading()) {
- m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
- QStringLiteral("Discarded"));
-+ m_webContentsDelegate->DidStopLoading();
- }
-
- content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
- virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
- virtual void loadCommitted() = 0;
- virtual void loadVisuallyCommitted() = 0;
-- virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage) = 0;
-+ virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
- virtual void focusContainer() = 0;
- virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
- virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
-
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
-- QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
-- int p = qMin(qRound(progress * 100), 100);
--
-- if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p == 100)
-+ if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
- return;
-
-- if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
-- m_loadProgressMap[current_url] = p;
-+ int p = qMin(qRound(progress * 100), 100);
-+ if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+ m_loadingInfo.progress = p;
- m_viewClient->loadProgressChanged(p);
- }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
- }
- }
-
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
-- m_isDocumentEmpty = true;
-- m_viewClient->loadStarted(url, isErrorPage);
-- m_viewClient->updateNavigationActions();
--
-- if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
-- && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
-- && !m_isNavigationCommitted) {
-- m_loadProgressMap.insert(url, 100);
-- m_lastLoadedUrl = url;
-- m_viewClient->loadProgressChanged(100);
-+ // only report first ever load start or separate one for error page only
-+ if (!isErrorPage && m_loadingInfo.isLoading()) // already running
- return;
-- }
-
-- if (!m_loadProgressMap.isEmpty()) {
-- QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
-- while (it != m_loadProgressMap.end()) {
-- if (it.value() == 100) {
-- it = m_loadProgressMap.erase(it);
-- continue;
-- }
-- ++it;
-- }
-+ m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+ if (!isErrorPage) {
-+ m_loadingInfo.progress = 0;
-+ m_viewClient->loadStarted(m_loadingInfo.url, false);
-+ m_viewClient->updateNavigationActions();
-+ m_viewClient->loadProgressChanged(0);
-+ } else {
-+ m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
- }
--
-- m_lastLoadedUrl = url;
-- m_loadProgressMap.insert(url, 0);
-- m_viewClient->loadProgressChanged(0);
- }
-
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
- if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
- navigation_handle->SetSilentlyIgnoreErrors();
-
-- if (!navigation_handle->IsInMainFrame())
-+ if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
- return;
-
-
- m_loadingErrorFrameList.clear();
- m_faviconManager->resetCandidates();
-- EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+ m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+ // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+ bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+ emitLoadStarted(isErrorPage);
- }
-
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
-- Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-- Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
-- // When error page enabled we don't need to send the error page load finished signal
-- if (m_loadProgressMap[url] == 100)
-+ if (!m_loadingInfo.isLoading()) // not currently running
- return;
-
-- m_lastLoadedUrl = url;
-- m_loadProgressMap[url] = 100;
-- m_isNavigationCommitted = false;
-- m_viewClient->loadProgressChanged(100);
-+ Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+ Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+ if (!isErrorPage) {
-+ if (m_loadingInfo.progress < 100) {
-+ m_loadingInfo.progress = 100;
-+ m_viewClient->loadProgressChanged(100);
-+ }
-
-- m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
-- m_viewClient->updateNavigationActions();
-+ m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+ m_viewClient->updateNavigationActions();
-+ } else {
-+ m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+ }
- }
-
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
- m_findTextHelper->handleLoadCommitted();
- m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
- profileAdapter->visitedLinksManager()->addUrl(url);
- }
-
-- m_isNavigationCommitted = true;
-- EmitLoadCommitted();
-+ emitLoadCommitted();
- }
-
- // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
- // Now report we are starting to load an error-page.
- m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
- m_faviconManager->resetCandidates();
-- EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+ emitLoadStarted(true);
-
- // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
- if (navigation_handle->HasCommitted())
-- EmitLoadCommitted();
-+ emitLoadCommitted();
- }
- }
-
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
-
- if (m_loadingState == LoadingState::Loading)
- setLoadingState(LoadingState::Loaded);
-+
-+ emitLoadFinished();
-+ m_loadingInfo.clear();
- }
-
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
- // Delay notifying failure until the error-page is done loading.
- // Error-pages are not loaded on failures due to abort.
- bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
-- EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+ m_loadingInfo.success = false;
-+ m_loadingInfo.url = url;
-+ m_loadingInfo.errorCode = errorCode;
-+ m_loadingInfo.errorDescription = errorDescription;
-+ m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
-
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
- Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
- m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
- m_viewClient->iconChanged(QUrl());
--
-- EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+ emitLoadFinished(/* isErrorPage = */true);
- return;
- }
- // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
- // Trigger LoadFinished signal for main frame's error page only.
- if (!render_frame_host->GetParent()) {
- m_viewClient->iconChanged(QUrl());
-- EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+ emitLoadFinished(/* isErrorPage = */true);
- }
-
- return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
- int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
- bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
- bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
-- EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+ m_loadingInfo.success = http_statuscode < 400;
-+ m_loadingInfo.url = toQt(validated_url);
-+ m_loadingInfo.errorCode = http_statuscode;
-+ m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
-
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
- WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
- const QUrl &url,
- bool user_gesture);
-- void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
-- void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
-- void EmitLoadCommitted();
-+ void emitLoadStarted(bool isErrorPage = false);
-+ void emitLoadFinished(bool isErrorPage = false);
-+ void emitLoadCommitted();
-
- LoadingState determineLoadingState(content::WebContents *contents);
- void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
- int m_desktopStreamCount = 0;
- mutable bool m_pendingUrlUpdate = false;
-
-- QMap<QUrl, int> m_loadProgressMap;
-- QUrl m_lastLoadedUrl;
-- bool m_isNavigationCommitted = false;
-+ struct LoadingInfo {
-+ bool success = false;
-+ int progress = -1;
-+ bool isLoading() const { return progress >= 0; }
-+ QUrl url;
-+ int errorCode = 0;
-+ QString errorDescription;
-+ bool triggersErrorPage = false;
-+ void clear() { *this = LoadingInfo(); }
-+ } m_loadingInfo;
-+
- bool m_isDocumentEmpty = true;
- base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
-
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
- Q_Q(QQuickWebEngineView);
-- Q_UNUSED(triggersErrorPage);
-
- if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
- void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
- void loadCommitted() override;
- void loadVisuallyCommitted() override;
-- void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage) override;
-+ void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
- void focusContainer() override;
- void unhandledKeyEvent(QKeyEvent *event) override;
- QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
- QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
-
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
- Q_Q(QWebEnginePage);
- Q_UNUSED(url);
- Q_UNUSED(errorCode);
- Q_UNUSED(errorDescription);
-
-- if (isErrorPage) {
-- QTimer::singleShot(0, q, [q](){
-- emit q->loadFinished(false);
-- });
-+ if (isErrorPage)
- return;
-- }
-
- isLoading = false;
-- Q_ASSERT((success && !triggersErrorPage) || !success);
-- if (!triggersErrorPage) {
-- QTimer::singleShot(0, q, [q, success](){
-- emit q->loadFinished(success);
-- });
-- }
-+ QTimer::singleShot(0, q, [q, success](){
-+ emit q->loadFinished(success);
-+ });
- }
-
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
- void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
- void loadCommitted() override { }
- void loadVisuallyCommitted() override { }
-- void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage) override;
-+ void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
- void focusContainer() override;
- void unhandledKeyEvent(QKeyEvent *event) override;
- QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
-
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
_commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
build_style=qmake
configure_args="--
-webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
$(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
no_generic_pkgconfig_link=yes
build_options="sndio pipewire"
From 759800753c8c62f05da75b21ce1853a68edf1b03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:57:23 +0200
Subject: [PATCH 2/2] qt5: update to 5.15.3+20210625.
---
srcpkgs/qt5/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e36b463f440d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,9 +1,9 @@
# Template file for 'qt5'
pkgname=qt5
-version=5.15.3+20210429
-# commit d42afef0e48a102334ecfda6a492286fb9fc5996
+version=5.15.3+20210625
+# commit ebeec9f6631799ab1b43327d00aa2d3640f53635
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=1
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
@@ -27,7 +27,7 @@ homepage="https://qt.io/"
# to keep the size smaller qtwebengine, qtwebview, qtdocgallery, qtactiveqt and qtpim
# can be marked with the export-ignore attribute
distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz"
-checksum=6936ecf7c35162832bde5b5685f24c0924868745983f030e377924c1d80f68d1
+checksum=5a3a6cf197163b3b1780f9070a7794e10232f6f23f6e2088bca1f67d611d7455
python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Closed]: qt5/qt5-webengine updates
2021-06-26 8:16 [PR PATCH] qt5/qt5-webengine updates Johnnynator
@ 2021-08-13 13:27 ` Johnnynator
0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2021-08-13 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There's a closed pull request on the void-packages repository
qt5/qt5-webengine updates
https://github.com/void-linux/void-packages/pull/31661
Description:
- qt5-webengine: update to 5.15.5.
- qt5: update to 5.15.3+20210625.
<!-- Mark items with [x] where applicable -->
[ci skip]
#### General
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64, x86_64-musl. i686)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
- [x] armv6l
- [x] armv7l
- [x] aarch64
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-13 13:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-26 8:16 [PR PATCH] qt5/qt5-webengine updates Johnnynator
2021-08-13 13:27 ` [PR PATCH] [Closed]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).