commit 2b4d821e0cee5e147852c5836270185a4f16ec36 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Jan 5 15:00:20 2019 +1100 qtwebengine: 5.12.0 <-- 5.11.3 downgraded due to clang dependency on qdoc can not be disabled in qt5 diff --git a/qtwebengine/.footprint b/qtwebengine/.footprint index 58ccfe21c..5a0676ba0 100644 --- a/qtwebengine/.footprint +++ b/qtwebengine/.footprint @@ -2,30 +2,28 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/qt5/ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.12.0/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebengineaction_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebengineaction_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginecertificateerror_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginedialogrequests_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginedownloaditem_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginehistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginehistory_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebengineloadrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginenavigationrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginenewviewrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebengineprofile_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginescript_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginesettings_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginesingleton_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebenginetestsupport_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebengineview_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qquickwebengineview_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/qtwebengineglobal_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.11.3/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginecertificateerror_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginedialogrequests_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginedownloaditem_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginehistory_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginehistory_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebengineloadrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginenavigationrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginenewviewrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebengineprofile_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginescript_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginesettings_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginesingleton_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebenginetestsupport_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebengineview_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qquickwebengineview_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.11.3/QtWebEngine/private/qtwebengineglobal_p.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineProfile -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineScript -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QtWebEngine @@ -36,14 +34,14 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.12.0/QtWebEngine/private/ -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/qtwebengineglobal.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/qtwebengineversion.h drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.12.0/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/private/ --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/private/qtwebenginecore-config_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/private/qtwebenginecoreglobal_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/private/qwebenginecallback_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/private/qwebenginecookiestore_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.11.3/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.11.3/QtWebEngineCore/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.11.3/QtWebEngineCore/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.11.3/QtWebEngineCore/private/qtwebenginecoreglobal_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.11.3/QtWebEngineCore/private/qwebenginebrowsercontext_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.11.3/QtWebEngineCore/private/qwebenginecallback_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.11.3/QtWebEngineCore/private/qwebenginecookiestore_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.11.3/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCallback -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCookieStore -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineHttpRequest @@ -52,12 +50,10 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/priv -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineUrlRequestInfo -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineUrlRequestInterceptor -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineUrlRequestJob --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineUrlScheme -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineUrlSchemeHandler -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QtWebEngineCore -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QtWebEngineCoreDepends -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QtWebEngineCoreVersion --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qtwebenginecore-config.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qtwebenginecoreglobal.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qtwebenginecoreversion.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebenginecallback.h @@ -68,20 +64,18 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.12.0/QtWebEngineCore/priv -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlrequestinfo.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlrequestinterceptor.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlrequestjob.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlscheme.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlschemehandler.h drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/private/qwebenginehistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/private/qwebenginepage_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/private/qwebengineprofile_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidgets/private/qwebengineview_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/private/qwebenginehistory_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/private/qwebenginepage_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/private/qwebengineprofile_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.11.3/QtWebEngineWidgets/private/qwebengineview_p.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineCertificateError --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineClientCertificateSelection -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineContextMenuData -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineDownloadItem -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineFullScreenRequest @@ -99,7 +93,6 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.12.0/QtWebEngineWidget -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/qtwebenginewidgetsglobal.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/qtwebenginewidgetsversion.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/qwebenginecertificateerror.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/qwebengineclientcertificateselection.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/qwebenginecontextmenudata.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/qwebenginedownloaditem.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/qwebenginefullscreenrequest.h @@ -125,22 +118,22 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5WebEngineWidgets/ -rw-r--r-- root/root usr/lib/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake -rw-r--r-- root/root usr/lib/libQt5WebEngine.la -rw-r--r-- root/root usr/lib/libQt5WebEngine.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.12.0 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.12.0 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.12 -> libQt5WebEngine.so.5.12.0 --rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.12.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.11.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.11.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.11 -> libQt5WebEngine.so.5.11.3 +-rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.11.3 -rw-r--r-- root/root usr/lib/libQt5WebEngineCore.la -rw-r--r-- root/root usr/lib/libQt5WebEngineCore.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.12.0 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.12.0 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.12 -> libQt5WebEngineCore.so.5.12.0 --rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.12.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.11.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.11.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.11 -> libQt5WebEngineCore.so.5.11.3 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.11.3 -rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.la -rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.12.0 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.12.0 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.12 -> libQt5WebEngineWidgets.so.5.12.0 --rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.12.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.11.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.11.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.11 -> libQt5WebEngineWidgets.so.5.11.3 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.11.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngine.pc -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngineCore.pc diff --git a/qtwebengine/.signature b/qtwebengine/.signature index 4fb2020ca..e0dcfd374 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TSoz+f7AfuqyVsgobRYN9ARnYHKTXcPfRtgzyYaTvWLYG0IhcFze9OCBEuKnvmRW5VYPasMt3TpqTBGgYOqpQE= -SHA256 (Pkgfile) = 204f3629786b4bfec7133eda4be1a6a03ce52f8f4a12ab0b56311f69e736c3d4 -SHA256 (.footprint) = 5fd5761dc6bc9396475d66ab7b0916dcb37292787e20f02626634f287e874f4a -SHA256 (qtwebengine-everywhere-src-5.12.0.tar.xz) = bd581e390a30e0f74d41b0e3334b3cf612dd4af23de36a3bf5931d5b4453687c -SHA256 (qtbug-71370.patch) = 58aaec357311fcf72b1d94c40f5159b84c835bbf41fcf9a0977368c99bea70f4 -SHA256 (qtbug-69605.patch) = 8f44545a6acd1bc58c7ddd8ff369a818102b6a1fecd132eb2508b18fd1433d8b +RWSE3ohX2g5d/fQEP193evnPkfGFUIp8nhI8u1syeVbXyO+pvY/iy+eorAFyzdGTXNYKc+2k7iJN38KxU0fJDgUvseMQKnP26wg= +SHA256 (Pkgfile) = 1c670224ccf3c3b2d8304804b5c9cff85890b0208cad729c0d6b59e2ee825580 +SHA256 (.footprint) = 4d1819ec55dbdb26dfa7bbca54620d230029a93ef67f862f77b23e2f1e195843 +SHA256 (qtwebengine-everywhere-src-5.11.3.tar.xz) = 5bb49ead71b851db4dc56f8fd97e0db72a268b22104129a06bac201d55d3b8fe diff --git a/qtwebengine/Pkgfile b/qtwebengine/Pkgfile index dff39010b..13db16773 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -4,21 +4,13 @@ # Depends on: nss qt5 xorg-libxscrnsaver xorg-libxtst name=qtwebengine -version=5.12.0 +version=5.11.3 release=1 -source=(https://download.qt.io/official_releases/qt/${version::4}/$version/submodules/$name-everywhere-src-$version.tar.xz - qtbug-71370.patch - qtbug-69605.patch) +source=(https://download.qt.io/official_releases/qt/${version::4}/$version/submodules/$name-everywhere-src-$version.tar.xz) build() { cd $name-everywhere-src-$version - # https://bugreports.qt.io/browse/QTBUG-71370 - patch -p1 -i $SRC/qtbug-71370.patch - - # https://bugreports.qt.io/browse/QTBUG-69605 - patch -p1 -i $SRC/qtbug-69605.patch - # Ninja, by default, sets the number of jobs to the number of availalble threads test -n "$JOBS" && export NINJAFLAGS+=" -j $JOBS" diff --git a/qtwebengine/qtbug-69605.patch b/qtwebengine/qtbug-69605.patch deleted file mode 100644 index 5b690f224..000000000 --- a/qtwebengine/qtbug-69605.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 721cd2d24995df8f7960cc5e8a96be1d2cd05f29 Mon Sep 17 00:00:00 2001 -From: Michal Klocek <michal.klocek@qt.io> -Date: Tue, 27 Nov 2018 12:07:00 +0100 -Subject: Fix missing TransportSecurityPersister -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit d603b7055 introduced TrasnsportSecurityPersister, -however it did not survive merge form 5.11 to 5.12. - -Task-number: QTBUG-69605 -Change-Id: I6357af25afcfd5c08aae77695bd2131f1cef6b71 -Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> ---- - src/core/profile_io_data_qt.cpp | 19 +++++++++++++++++-- - src/core/profile_io_data_qt.h | 3 +++ - 2 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp -index 7aaddc35..0a0d242a 100644 ---- a/src/core/profile_io_data_qt.cpp -+++ b/src/core/profile_io_data_qt.cpp -@@ -59,6 +59,7 @@ - #include "net/http/http_cache.h" - #include "net/http/http_server_properties_impl.h" - #include "net/http/http_network_session.h" -+#include "net/http/transport_security_persister.h" - #include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h" - #include "net/proxy_resolution/pac_file_fetcher_impl.h" - #include "net/proxy_resolution/proxy_config_service.h" -@@ -267,6 +268,7 @@ void ProfileIODataQt::generateStorage() - // we need to get rid of dangling pointer due to coming storage deletion - m_urlRequestContext->set_http_transaction_factory(0); - m_httpNetworkSession.reset(); -+ m_transportSecurityPersister.reset(); - } - - m_storage.reset(new net::URLRequestContextStorage(m_urlRequestContext.get())); -@@ -299,8 +301,20 @@ void ProfileIODataQt::generateStorage() - m_networkDelegate.get())); - - m_storage->set_ssl_config_service(std::make_unique<net::SSLConfigServiceDefaults>()); -- m_storage->set_transport_security_state(std::unique_ptr<net::TransportSecurityState>( -- new net::TransportSecurityState())); -+ m_storage->set_transport_security_state(std::make_unique<net::TransportSecurityState>()); -+ -+ if (!m_dataPath.isEmpty()) { -+ scoped_refptr<base::SequencedTaskRunner> background_task_runner( -+ base::CreateSequencedTaskRunnerWithTraits( -+ {base::MayBlock(), -+ base::TaskPriority::BACKGROUND, -+ base::TaskShutdownBehavior::BLOCK_SHUTDOWN})); -+ m_transportSecurityPersister = -+ std::make_unique<net::TransportSecurityPersister>( -+ m_urlRequestContext->transport_security_state(), -+ toFilePath(m_dataPath), -+ background_task_runner); -+ }; - - if (!m_httpAuthPreferences) - m_httpAuthPreferences.reset(new net::HttpAuthPreferences()); -@@ -566,6 +580,7 @@ void ProfileIODataQt::setFullConfiguration() - m_httpCachePath = m_profileAdapter->httpCachePath(); - m_httpCacheMaxSize = m_profileAdapter->httpCacheMaxSize(); - m_customUrlSchemes = m_profileAdapter->customUrlSchemes(); -+ m_dataPath = m_profileAdapter->dataPath(); - } - - void ProfileIODataQt::updateStorageSettings() -diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h -index 60f4d2d1..6961e2ad 100644 ---- a/src/core/profile_io_data_qt.h -+++ b/src/core/profile_io_data_qt.h -@@ -58,6 +58,7 @@ class ProxyConfigService; - class URLRequestContext; - class URLRequestContextStorage; - class URLRequestJobFactoryImpl; -+class TransportSecurityPersister; - } - - namespace QtWebEngineCore { -@@ -113,6 +114,7 @@ private: - std::unique_ptr<net::DhcpPacFileFetcherFactory> m_dhcpPacFileFetcherFactory; - std::unique_ptr<net::HttpAuthPreferences> m_httpAuthPreferences; - std::unique_ptr<net::URLRequestJobFactory> m_jobFactory; -+ std::unique_ptr<net::TransportSecurityPersister> m_transportSecurityPersister; - base::WeakPtr<ProfileIODataQt> m_weakPtr; - scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate; - content::URLRequestInterceptorScopedVector m_requestInterceptors; -@@ -141,6 +143,7 @@ private: - bool m_updateUserAgent = false; - bool m_ignoreCertificateErrors = false; - base::WeakPtrFactory<ProfileIODataQt> m_weakPtrFactory; // this should be always the last member -+ QString m_dataPath; - DISALLOW_COPY_AND_ASSIGN(ProfileIODataQt); - }; - } // namespace QtWebEngineCore --- -cgit v1.2.1 - diff --git a/qtwebengine/qtbug-71370.patch b/qtwebengine/qtbug-71370.patch deleted file mode 100644 index 734f33643..000000000 --- a/qtwebengine/qtbug-71370.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 20238f2c472af7b94d48a837d7723a209a87fd9e Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 14 Nov 2018 16:29:35 +0100 -Subject: Fix autoscrolling - -We were missing the connection between on begin frame and progressing -auto-scroll. - -Change-Id: I651b35c031afedc9aeef1dc6a16547757b869633 -Fixes: QTBUG-71370 -Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> ---- - src/core/compositor.cpp | 11 +++++++---- - src/core/compositor.h | 4 +++- - src/core/render_widget_host_view_qt.cpp | 7 ++++++- - src/core/render_widget_host_view_qt.h | 1 + - 4 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/src/core/compositor.cpp b/src/core/compositor.cpp -index 5dd05371..f7a5e651 100644 ---- a/src/core/compositor.cpp -+++ b/src/core/compositor.cpp -@@ -40,15 +40,17 @@ - #include "compositor.h" - - #include "delegated_frame_node.h" -+#include "render_widget_host_view_qt.h" - --#include <components/viz/common/resources/returned_resource.h> --#include <content/public/browser/browser_thread.h> --#include <services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h> -+#include "components/viz/common/resources/returned_resource.h" -+#include "content/public/browser/browser_thread.h" -+#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h" - - namespace QtWebEngineCore { - --Compositor::Compositor() -+Compositor::Compositor(RenderWidgetHostViewQt *hostView) - : m_chromiumCompositorData(new ChromiumCompositorData) -+ , m_view(hostView) - { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - -@@ -163,6 +165,7 @@ bool Compositor::OnBeginFrameDerivedImpl(const viz::BeginFrameArgs &args) - { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - -+ m_view->OnBeginFrame(args.frame_time); - m_beginFrameSource->OnUpdateVSyncParameters(args.frame_time, args.interval); - if (m_frameSinkClient) - m_frameSinkClient->OnBeginFrame(args); -diff --git a/src/core/compositor.h b/src/core/compositor.h -index 4852d059..7d7db5d0 100644 ---- a/src/core/compositor.h -+++ b/src/core/compositor.h -@@ -60,6 +60,7 @@ class CompositorFrameSinkClient; - - namespace QtWebEngineCore { - -+class RenderWidgetHostViewQt; - class RenderWidgetHostViewQtDelegate; - class ChromiumCompositorData; - -@@ -84,7 +85,7 @@ class ChromiumCompositorData; - class Compositor final : private viz::BeginFrameObserverBase - { - public: -- explicit Compositor(); -+ explicit Compositor(RenderWidgetHostViewQt *hostView); - ~Compositor() override; - - void setViewDelegate(RenderWidgetHostViewQtDelegate *viewDelegate); -@@ -105,6 +106,7 @@ private: - - std::vector<viz::ReturnedResource> m_resourcesToRelease; - QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData; -+ RenderWidgetHostViewQt *m_view; - RenderWidgetHostViewQtDelegate *m_viewDelegate = nullptr; - std::unique_ptr<viz::SyntheticBeginFrameSource> m_beginFrameSource; - viz::mojom::CompositorFrameSinkClient *m_frameSinkClient = nullptr; -diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp -index 9706ac07..4ed62504 100644 ---- a/src/core/render_widget_host_view_qt.cpp -+++ b/src/core/render_widget_host_view_qt.cpp -@@ -260,7 +260,7 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget - , m_gestureProvider(QtGestureProviderConfig(), this) - , m_sendMotionActionDown(false) - , m_touchMotionStarted(false) -- , m_compositor(new Compositor) -+ , m_compositor(new Compositor(this)) - , m_loadVisuallyCommittedState(NotCommitted) - , m_adapterClient(0) - , m_imeInProgress(false) -@@ -1637,6 +1637,11 @@ void RenderWidgetHostViewQt::SetNeedsBeginFrames(bool needs_begin_frames) - m_compositor->setNeedsBeginFrames(needs_begin_frames); - } - -+void RenderWidgetHostViewQt::OnBeginFrame(base::TimeTicks frame_time) -+{ -+ host()->ProgressFlingIfNeeded(frame_time); -+} -+ - content::RenderFrameHost *RenderWidgetHostViewQt::getFocusedFrameHost() - { - content::RenderViewHostImpl *viewHost = content::RenderViewHostImpl::From(host()); -diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h -index 8db3351f..6dd4d57e 100644 ---- a/src/core/render_widget_host_view_qt.h -+++ b/src/core/render_widget_host_view_qt.h -@@ -112,6 +112,7 @@ public: - RenderWidgetHostViewQtDelegate *delegate() { return m_delegate.get(); } - void setDelegate(RenderWidgetHostViewQtDelegate *delegate); - void setAdapterClient(WebContentsAdapterClient *adapterClient); -+ void OnBeginFrame(base::TimeTicks frame_time); - - void InitAsChild(gfx::NativeView) override; - void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&) override; --- -cgit v1.2.1 -