[crux-commits] ports/opt (3.4): qtwebkit: 5.9.1 -> 5.212.0

commit 6d28ab11f10f0036a000690a3cbda49fefc83793 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Jul 14 00:55:43 2018 +1000 qtwebkit: 5.9.1 -> 5.212.0 diff --git a/qtwebkit/.footprint b/qtwebkit/.footprint index 0b9f829c8..b82507d12 100644 --- a/qtwebkit/.footprint +++ b/qtwebkit/.footprint @@ -2,134 +2,108 @@ 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/QtWebKit/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.1/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/bytearraytestdata.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qhttpheader_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquicknetworkreply_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquicknetworkrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickurlschemedelegate_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebpage_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebpage_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebview_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebview_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qrawwebview_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qrawwebview_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qtwebsecurityorigin_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebchannelwebkittransport_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebdatabase_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebdownloaditem_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebdownloaditem_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebelement_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebhistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebiconimageprovider_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebkittest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebloadrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebnavigationhistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebnavigationhistory_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebnavigationrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebpermissionrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebplugindatabase_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebpreferences_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebpreferences_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebscriptworld.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebscriptworld_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebsecurityorigin_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/testwindow.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/util.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebDatabase --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebElement --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebElementCollection --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebFullScreenVideoHandler --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebHapticFeedbackPlayer --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebHistory --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebHistoryInterface --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebHistoryItem --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebKitPlatformPlugin --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebNotificationData --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebNotificationPresenter --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebPluginFactory --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebSecurityOrigin --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebSelectData --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebSelectMethod --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebSettings --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebSpellChecker --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebTouchModifier --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QtWebKit +drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.212.0/ +drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/ +drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebDatabase +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebElement +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebElementCollection +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebFullScreenRequest +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebFullScreenVideoHandler +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHapticFeedbackPlayer +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHistory +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHistoryInterface +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHistoryItem +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebKitPlatformPlugin +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebNotificationData +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebNotificationPresenter +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebPluginFactory +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSecurityOrigin +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSelectData +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSelectMethod +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSettings +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSpellChecker +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebTouchModifier +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QtWebKit -rw-r--r-- root/root usr/include/qt5/QtWebKit/QtWebKitDepends --rw-rw-r-- root/root usr/include/qt5/QtWebKit/QtWebKitVersion --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qtwebkitversion.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebdatabase.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebelement.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebhistory.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebhistoryinterface.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebkitglobal.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebkitplatformplugin.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebpluginfactory.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebsecurityorigin.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebsettings.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/QtWebKitVersion +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qtwebkitversion.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebdatabase.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebelement.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebfullscreenrequest.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebhistory.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebhistoryinterface.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebkitglobal.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebkitplatformplugin.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebpluginfactory.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebsecurityorigin.h +-rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebsettings.h drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.1/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebframe_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebinspector_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebpage_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebviewaccessible_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QGraphicsWebView --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QWebFrame --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QWebHitTestResult --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QWebInspector --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QWebPage --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QWebView --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets +drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.212.0/ +drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebframe_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebinspector_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebpage_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebviewaccessible_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QGraphicsWebView +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebFrame +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebHitTestResult +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebInspector +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebPage +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebView +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets -rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsDepends --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/qgraphicswebview.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/qwebframe.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/qwebinspector.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/qwebpage.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/qwebview.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qgraphicswebview.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebframe.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebinspector.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebpage.h +-rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebview.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/Qt5WebKit/ -rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/Qt5WebKitConfig.cmake -rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake +-rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/WebKitTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/WebKitTargets.cmake drwxr-xr-x root/root usr/lib/cmake/Qt5WebKitWidgets/ -rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake -rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake --rw-r--r-- root/root usr/lib/libQt5WebKit.la --rw-r--r-- root/root usr/lib/libQt5WebKit.prl -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so -> libQt5WebKit.so.5.9.1 -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5 -> libQt5WebKit.so.5.9.1 -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5.9 -> libQt5WebKit.so.5.9.1 --rwxr-xr-x root/root usr/lib/libQt5WebKit.so.5.9.1 --rw-r--r-- root/root usr/lib/libQt5WebKitWidgets.la --rw-r--r-- root/root usr/lib/libQt5WebKitWidgets.prl -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so -> libQt5WebKitWidgets.so.5.9.1 -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5 -> libQt5WebKitWidgets.so.5.9.1 -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5.9 -> libQt5WebKitWidgets.so.5.9.1 --rwxr-xr-x root/root usr/lib/libQt5WebKitWidgets.so.5.9.1 +-rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake +lrwxrwxrwx root/root usr/lib/libQt5WebKit.so -> libQt5WebKit.so.5 +lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5 -> libQt5WebKit.so.5.212.0 +-rwxr-xr-x root/root usr/lib/libQt5WebKit.so.5.212.0 +lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so -> libQt5WebKitWidgets.so.5 +lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5 -> libQt5WebKitWidgets.so.5.212.0 +-rwxr-xr-x root/root usr/lib/libQt5WebKitWidgets.so.5.212.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebKit.pc -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebKitWidgets.pc drwxr-xr-x root/root usr/lib/qt5/ drwxr-xr-x root/root usr/lib/qt5/libexec/ +-rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebDatabaseProcess +-rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebNetworkProcess -rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebPluginProcess -rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebProcess drwxr-xr-x root/root usr/lib/qt5/mkspecs/ drwxr-xr-x root/root usr/lib/qt5/mkspecs/modules/ -rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkit.pri --rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkit_private.pri -rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri --rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri drwxr-xr-x root/root usr/lib/qt5/qml/ drwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/ drwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/experimental/ -rwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so --rw-rw-r-- root/root usr/lib/qt5/qml/QtWebKit/experimental/qmldir +-rw-r--r-- root/root usr/lib/qt5/qml/QtWebKit/experimental/qmldir -rwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/libqmlwebkitplugin.so --rw-rw-r-- root/root usr/lib/qt5/qml/QtWebKit/plugins.qmltypes --rw-rw-r-- root/root usr/lib/qt5/qml/QtWebKit/qmldir +-rw-r--r-- root/root usr/lib/qt5/qml/QtWebKit/plugins.qmltypes +-rw-r--r-- root/root usr/lib/qt5/qml/QtWebKit/qmldir diff --git a/qtwebkit/.md5sum b/qtwebkit/.md5sum index 0ccc04cb5..696d1ce97 100644 --- a/qtwebkit/.md5sum +++ b/qtwebkit/.md5sum @@ -1 +1,6 @@ -c7a5eb579c2476ff54f8cff2111b0910 qtwebkit-opensource-src-5.9.1.tar.xz +74453a03b63b76f64b73b93a94396bbe qt5-webkit-cmake3.10.patch +12c1be55b7c2269308eb5488b2c8e8e4 qt5-webkit-gcc7.patch +3221a406e92a9b2ad751a39eacb8c444 qt5-webkit-null-pointer-dereference.patch +6b7e3d2ec7adf0dae5425eef358b5300 qt5-webkit-trojita-1.patch +c56b54bb15af9a7b90a8c114aee6f0c6 qt5-webkit-trojita-2.patch +301dd0192b1d7ce0edd75c214706e257 qtwebkit-5.212.0-alpha2.tar.xz diff --git a/qtwebkit/.signature b/qtwebkit/.signature index 581ca52b3..cc41f887b 100644 --- a/qtwebkit/.signature +++ b/qtwebkit/.signature @@ -1,5 +1,10 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fzZqy/RzFDTBm3/H3rfA8YDPxV7xgEiUrbtBuVz4L4Wk+AbsVZO0ZM9Qx3aO4gtLmqmJSlHGMnR+8WrZMcauQE= -SHA256 (Pkgfile) = a402b40e74f9d118005b19f28366a8e4746b9364c53fba7a46d5d92421e4a490 -SHA256 (.footprint) = 4330f1d93669cb4f69124ee8442e60a44fd65690443ceb7321e7e17c0557ef45 -SHA256 (qtwebkit-opensource-src-5.9.1.tar.xz) = 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf +RWSE3ohX2g5d/QdnLhnu9ynAqdarcdUeq5oYYfX+augnoIJ9T5+nxN0peqiAYCv2+mJny0ApXMVO/8wHP3E5WqGxhIHa3fv7cAQ= +SHA256 (Pkgfile) = 592374714bd7b3f5fca2d4ea3e7a2794d3eca8d6a69a1a8b80923d1905e67d62 +SHA256 (.footprint) = ed0c315f99b71f4f3ef3e2a9379ab90dbb8f86a507a7e9b24fee8ea85842c2a7 +SHA256 (qtwebkit-5.212.0-alpha2.tar.xz) = f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a +SHA256 (qt5-webkit-gcc7.patch) = f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720 +SHA256 (qt5-webkit-null-pointer-dereference.patch) = 510e1f78c2bcd76909703a097dbc1d5c9c6ce4cd94883c26138f09cc10121f43 +SHA256 (qt5-webkit-trojita-1.patch) = bd22bd7842d5ad1cb1f5a4b6acb2674509732274d5f9dc51943144dff76996ae +SHA256 (qt5-webkit-trojita-2.patch) = b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3 +SHA256 (qt5-webkit-cmake3.10.patch) = b4e6c85fcb062e7cc141b0e34977bcc4f9c8677c773fc4b310151b85f51e7189 diff --git a/qtwebkit/Pkgfile b/qtwebkit/Pkgfile index b2b7ab24d..f215a9286 100644 --- a/qtwebkit/Pkgfile +++ b/qtwebkit/Pkgfile @@ -1,24 +1,50 @@ # Description: QtWebKit for qt5. # URL: https://www.qt.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: qt5 ruby icu +# Depends on: qt5 ruby icu hyphen name=qtwebkit -version=5.9.1 +version=5.212.0 +_version=$version-alpha2 release=1 -source=(https://download.qt.io/archive/qt/${version::3}/$version/submodules/$name-opensource-src-$version.tar.xz) +source=(https://github.com/annulen/webkit/releases/download/$name-$_version/$name-$_... + qt5-webkit-gcc7.patch + qt5-webkit-null-pointer-dereference.patch + qt5-webkit-trojita-1.patch + qt5-webkit-trojita-2.patch + qt5-webkit-cmake3.10.patch) build() { - cd $name-opensource-src-$version + cd $name-$_version + + # Fix crashes with GCC7 https://bugs.webkit.org/show_bug.cgi?id=173407 + patch -p1 -i ../qt5-webkit-gcc7.patch + + # Fix layout issues in trojita https://github.com/annulen/webkit/issues/511 + patch -p1 -i ../qt5-webkit-trojita-1.patch + patch -p1 -i ../qt5-webkit-trojita-2.patch + + # Fix null point dereference (Fedora) https://github.com/annulen/webkit/issues/573 + patch -p1 -i ../qt5-webkit-null-pointer-dereference.patch + + # Fix build with cmake 3.10 + patch -p1 -i ../qt5-webkit-cmake3.10.patch install -d build cd build - qmake-qt5 .. - make - make INSTALL_ROOT=$PKG install + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DPORT=Qt \ + -DENABLE_TOOLS=OFF - find "$PKG/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + make + make DESTDIR=$PKG install + # Fix pkgconfig files + sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i $PKG/usr/lib/pkgconfig/Qt5WebKit.pc + sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i $PKG/usr/lib/pkgconfig/Qt5WebKitWidgets.pc + sed -e '/Name/a Description: Qt WebKit module' -i $PKG/usr/lib/pkgconfig/Qt5WebKit.pc + sed -e '/Name/a Description: Qt WebKitWidgets module' -i $PKG/usr/lib/pkgconfig/Qt5WebKitWidgets.pc } diff --git a/qtwebkit/qt5-webkit-cmake3.10.patch b/qtwebkit/qt5-webkit-cmake3.10.patch new file mode 100644 index 000000000..5e21f57e9 --- /dev/null +++ b/qtwebkit/qt5-webkit-cmake3.10.patch @@ -0,0 +1,31 @@ +From f51554bf104ab0491370f66631fe46143a23d5c2 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev <annulen@yandex.ru> +Date: Sat, 7 Oct 2017 17:38:32 +0300 +Subject: [PATCH] [cmake] Fix build with CMake 3.10: -frtti was enabled for + wrong file path + +Change-Id: I65d4f491f21c17f6d99a14259988d2ddb0d67105 +--- + Source/WebKit/PlatformQt.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake +index 61433257a767..edfa57e97ac1 100644 +--- a/Source/WebKit/PlatformQt.cmake ++++ b/Source/WebKit/PlatformQt.cmake +@@ -795,6 +795,7 @@ if (COMPILER_IS_GCC_OR_CLANG) + set_source_files_properties( + qt/Api/qwebdatabase.cpp + qt/Api/qwebelement.cpp ++ qt/Api/qwebfullscreenrequest.cpp + qt/Api/qwebhistory.cpp + qt/Api/qwebhistoryinterface.cpp + qt/Api/qwebpluginfactory.cpp +@@ -804,7 +805,6 @@ if (COMPILER_IS_GCC_OR_CLANG) + + qt/WidgetApi/qgraphicswebview.cpp + qt/WidgetApi/qwebframe.cpp +- qt/WidgetApi/qwebfullscreenrequest.cpp + qt/WidgetApi/qwebinspector.cpp + qt/WidgetApi/qwebpage.cpp + qt/WidgetApi/qwebview.cpp diff --git a/qtwebkit/qt5-webkit-gcc7.patch b/qtwebkit/qt5-webkit-gcc7.patch new file mode 100644 index 000000000..bddb6fcee --- /dev/null +++ b/qtwebkit/qt5-webkit-gcc7.patch @@ -0,0 +1,34 @@ +diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h +--- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100 ++++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 13:13:57.801527350 +0200 +@@ -581,29 +581,7 @@ + // FIXME: Does this really belong in StringImpl? + template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters) + { +- if (numCharacters == 1) { +- *destination = *source; +- return; +- } +- +- if (numCharacters <= s_copyCharsInlineCutOff) { +- unsigned i = 0; +-#if (CPU(X86) || CPU(X86_64)) +- const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T); +- +- if (numCharacters > charsPerInt) { +- unsigned stopCount = numCharacters & ~(charsPerInt - 1); +- +- const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source); +- uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination); +- for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j) +- destCharacters[j] = srcCharacters[j]; +- } +-#endif +- for (; i < numCharacters; ++i) +- destination[i] = source[i]; +- } else +- memcpy(destination, source, numCharacters * sizeof(T)); ++ memcpy(destination, source, numCharacters * sizeof(T)); + } + + ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters) diff --git a/qtwebkit/qt5-webkit-null-pointer-dereference.patch b/qtwebkit/qt5-webkit-null-pointer-dereference.patch new file mode 100644 index 000000000..97b9f9ea1 --- /dev/null +++ b/qtwebkit/qt5-webkit-null-pointer-dereference.patch @@ -0,0 +1,17 @@ +diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +--- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-06-09 16:11:36.000000000 +0200 ++++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-10-24 21:44:40.504943501 ++0200 +@@ -390,7 +390,10 @@ + + QString QWebPageAdapter::selectedHtml() const + { +- return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML(); ++ RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange(); ++ if (!range) ++ return QString(); ++ return range->toHTML(); + } + + bool QWebPageAdapter::isContentEditable() const diff --git a/qtwebkit/qt5-webkit-trojita-1.patch b/qtwebkit/qt5-webkit-trojita-1.patch new file mode 100644 index 000000000..b963d5ec4 --- /dev/null +++ b/qtwebkit/qt5-webkit-trojita-1.patch @@ -0,0 +1,34 @@ +From 6faf11215e1af27d35e921ae669aa0251a01a1ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com> +Date: Wed, 13 Nov 2013 18:13:36 +0100 +Subject: [PATCH] Trigger layout after resizing the FrameView. + +There are problems with QGLWidget based web plugins due to the fact +that WebKit forces us to relayout during paint events, which in turn +might resize widgets, causing the shared backing store's QImages to +be corrupted and hence causing crashed. + +This patch triggers a layout upon resizing the FrameView, which reduces +the likely hood of resizing plugins during a subsequent paintEvent. + +Task-number: QTBUG-34277 +Change-Id: Id35c72a3cc68ac6633a74fba0669c2d8fbfabc88 +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> +--- + Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +index e6145b6ffb82..941d8df603d9 100644 +--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp ++++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +@@ -962,6 +962,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size) + ASSERT(view); + view->resize(size); + view->adjustViewSize(); ++ ++ if (view->needsLayout()) ++ view->layout(); + } + + diff --git a/qtwebkit/qt5-webkit-trojita-2.patch b/qtwebkit/qt5-webkit-trojita-2.patch new file mode 100644 index 000000000..51fb78b78 --- /dev/null +++ b/qtwebkit/qt5-webkit-trojita-2.patch @@ -0,0 +1,33 @@ +From 76420459a13d9440b41864c93cb4ebb404bdab55 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev <annulen@yandex.ru> +Date: Thu, 12 Oct 2017 20:15:15 +0300 +Subject: [PATCH] Fix for 451c5a10: run adjustViewSize() after relayout + +Additional note for 451c5a10 + this: + +Since r162515 resize of FrameView that does not have scrollbars (or use +overlay scrollbars) does not lead to automatic re-layout. In Trojita +contentsSize() is called immediately after QWebPage::setViewportSize(), +returning wrong result. + +Change-Id: I543b22d7bbe1514333007e5f99b97a7c12c19c1a +--- + Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +index 941d8df603d9..df28e9f21f2c 100644 +--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp ++++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +@@ -961,10 +961,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size) + FrameView* view = frame->view(); + ASSERT(view); + view->resize(size); +- view->adjustViewSize(); +- + if (view->needsLayout()) + view->layout(); ++ view->adjustViewSize(); + } + +