From 0772e97c5f2b9fc97d84989042cd0bc77dcd0644 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Mon, 27 Nov 2023 20:51:43 +0100 Subject: [PATCH] qt6-webengine: 6.6.0 -> 6.6.1 --- qt6-webengine/.footprint | 178 +++++++++--------- qt6-webengine/.signature | 9 +- qt6-webengine/Pkgfile | 10 +- qt6-webengine/icu74.patch | 18 ++ qt6-webengine/libcxx17.patch | 83 ++++++++ .../qtwebengine-6.5.3-libxml2-2.12.patch | 39 ++++ 6 files changed, 242 insertions(+), 95 deletions(-) create mode 100644 qt6-webengine/icu74.patch create mode 100644 qt6-webengine/libcxx17.patch create mode 100644 qt6-webengine/qtwebengine-6.5.3-libxml2-2.12.patch diff --git a/qt6-webengine/.footprint b/qt6-webengine/.footprint index 002dc0f2e..042d2d39a 100644 --- a/qt6-webengine/.footprint +++ b/qt6-webengine/.footprint @@ -2,17 +2,17 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/qt6/ drwxr-xr-x root/root usr/include/qt6/QtPdf/ -drwxr-xr-x root/root usr/include/qt6/QtPdf/6.6.0/ -drwxr-xr-x root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/ -drwxr-xr-x root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/ --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qpdfdocument_p.h --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qpdffile_p.h --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qpdflink_p.h --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qpdflinkmodel_p.h --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qpdfsearchmodel_p.h --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qpdfselection_p.h --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qtpdf-config_p.h --rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/qtpdfexports_p.h +drwxr-xr-x root/root usr/include/qt6/QtPdf/6.6.1/ +drwxr-xr-x root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/ +drwxr-xr-x root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/ +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qpdfdocument_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qpdffile_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qpdflink_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qpdflinkmodel_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qpdfsearchmodel_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qpdfselection_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qtpdf-config_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdf/6.6.1/QtPdf/private/qtpdfexports_p.h -rw-r--r-- root/root usr/include/qt6/QtPdf/QPdfBookmarkModel -rw-r--r-- root/root usr/include/qt6/QtPdf/QPdfDocument -rw-r--r-- root/root usr/include/qt6/QtPdf/QPdfDocumentRenderOptions @@ -39,27 +39,27 @@ drwxr-xr-x root/root usr/include/qt6/QtPdf/6.6.0/QtPdf/private/ -rw-r--r-- root/root usr/include/qt6/QtPdf/qtpdfglobal.h -rw-r--r-- root/root usr/include/qt6/QtPdf/qtpdfversion.h drwxr-xr-x root/root usr/include/qt6/QtPdfQuick/ -drwxr-xr-x root/root usr/include/qt6/QtPdfQuick/6.6.0/ -drwxr-xr-x root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/ -drwxr-xr-x root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/ --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qquickpdfbookmarkmodel_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qquickpdfdocument_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qquickpdflinkmodel_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qquickpdfpageimage_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qquickpdfpagenavigator_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qquickpdfsearchmodel_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qquickpdfselection_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.0/QtPdfQuick/private/qtpdfquickglobal_p.h +drwxr-xr-x root/root usr/include/qt6/QtPdfQuick/6.6.1/ +drwxr-xr-x root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/ +drwxr-xr-x root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/ +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfbookmarkmodel_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfdocument_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdflinkmodel_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfpageimage_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfpagenavigator_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfsearchmodel_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qquickpdfselection_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfQuick/6.6.1/QtPdfQuick/private/qtpdfquickglobal_p.h -rw-r--r-- root/root usr/include/qt6/QtPdfQuick/QtPdfQuick -rw-r--r-- root/root usr/include/qt6/QtPdfQuick/QtPdfQuickDepends -rw-r--r-- root/root usr/include/qt6/QtPdfQuick/QtPdfQuickVersion -rw-r--r-- root/root usr/include/qt6/QtPdfQuick/qtpdfquickversion.h drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/ -drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/6.6.0/ -drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/6.6.0/QtPdfWidgets/ -drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/6.6.0/QtPdfWidgets/private/ --rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/6.6.0/QtPdfWidgets/private/qpdfpageselector_p.h --rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/6.6.0/QtPdfWidgets/private/qpdfview_p.h +drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/6.6.1/ +drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/6.6.1/QtPdfWidgets/ +drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/6.6.1/QtPdfWidgets/private/ +-rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/6.6.1/QtPdfWidgets/private/qpdfpageselector_p.h +-rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/6.6.1/QtPdfWidgets/private/qpdfview_p.h -rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/QPdfPageSelector -rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/QPdfView -rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/QtPdfWidgets @@ -70,22 +70,22 @@ drwxr-xr-x root/root usr/include/qt6/QtPdfWidgets/6.6.0/QtPdfWidgets/private/ -rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/qtpdfwidgetsglobal.h -rw-r--r-- root/root usr/include/qt6/QtPdfWidgets/qtpdfwidgetsversion.h drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/6.6.0/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/ --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qtwebenginecore-config_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qtwebenginecoreglobal_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginecontextmenurequest_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginecookiestore_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginedownloadrequest_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebengineglobalsettings_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginehistory_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginenewwindowrequest_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginepage_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebengineprofile_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebenginescriptcollection_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h +drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/6.6.1/ +drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/ +drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/ +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qtwebenginecore-config_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qtwebenginecoreglobal_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginecontextmenurequest_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginecookiestore_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginedownloadrequest_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebengineglobalsettings_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginehistory_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginenewwindowrequest_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginepage_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebenginescriptcollection_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/6.6.1/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h -rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/QWebEngineCertificateError -rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/QWebEngineClientCertificateSelection -rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/QWebEngineClientCertificateStore @@ -151,30 +151,30 @@ drwxr-xr-x root/root usr/include/qt6/QtWebEngineCore/6.6.0/QtWebEngineCore/priva -rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/qwebengineurlscheme.h -rw-r--r-- root/root usr/include/qt6/QtWebEngineCore/qwebengineurlschemehandler.h drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/6.6.0/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/ --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebengineaction_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebengineaction_p_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebengineclientcertificateselection_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginedownloadrequest_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebengineforeigntypes_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginenewwindowrequest_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebengineprofile_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginescriptcollection_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginescriptcollection_p_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginesettings_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginesingleton_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginetouchhandle_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebengineview_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qquickwebengineview_p_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qtwebenginequick-config_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/private/qtwebenginequickglobal_p.h +drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/6.6.1/ +drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/ +drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/ +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineaction_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineaction_p_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineclientcertificateselection_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginedownloadrequest_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineforeigntypes_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginenewwindowrequest_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginescriptcollection_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginescriptcollection_p_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginesettings_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginesingleton_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchhandle_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebenginetouchselectionmenurequest_p_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineview_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qquickwebengineview_p_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qtwebenginequick-config_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/6.6.1/QtWebEngineQuick/private/qtwebenginequickglobal_p.h -rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/QQuickWebEngineProfile -rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/QQuickWebEngineViewAccessible -rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/QtWebEngineQuick @@ -188,14 +188,14 @@ drwxr-xr-x root/root usr/include/qt6/QtWebEngineQuick/6.6.0/QtWebEngineQuick/pri -rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/render_widget_host_view_qt_delegate_quickwindow.h -rw-r--r-- root/root usr/include/qt6/QtWebEngineQuick/ui_delegates_manager.h drwxr-xr-x root/root usr/include/qt6/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/QtWebEngineWidgets/private/ --rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/QtWebEngineWidgets/private/autofillpopupwidget_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/QtWebEngineWidgets/private/qwebengineview_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/QtWebEngineWidgets/private/touchhandlewidget_p.h --rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.0/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h +drwxr-xr-x root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/ +drwxr-xr-x root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/ +drwxr-xr-x root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/ +-rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/autofillpopupwidget_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/qwebengineview_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/touchhandlewidget_p.h +-rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/6.6.1/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h -rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/QWebEngineView -rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/QWebEngineViewAccessible -rw-r--r-- root/root usr/include/qt6/QtWebEngineWidgets/QtWebEngineWidgets @@ -325,32 +325,32 @@ drwxr-xr-x root/root usr/lib/cmake/Qt6WebEngineWidgets/ -rw-r--r-- root/root usr/lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake -rw-r--r-- root/root usr/lib/libQt6Pdf.prl lrwxrwxrwx root/root usr/lib/libQt6Pdf.so -> libQt6Pdf.so.6 -lrwxrwxrwx root/root usr/lib/libQt6Pdf.so.6 -> libQt6Pdf.so.6.6.0 --rwxr-xr-x root/root usr/lib/libQt6Pdf.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libQt6Pdf.so.6 -> libQt6Pdf.so.6.6.1 +-rwxr-xr-x root/root usr/lib/libQt6Pdf.so.6.6.1 -rw-r--r-- root/root usr/lib/libQt6PdfQuick.prl lrwxrwxrwx root/root usr/lib/libQt6PdfQuick.so -> libQt6PdfQuick.so.6 -lrwxrwxrwx root/root usr/lib/libQt6PdfQuick.so.6 -> libQt6PdfQuick.so.6.6.0 --rwxr-xr-x root/root usr/lib/libQt6PdfQuick.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libQt6PdfQuick.so.6 -> libQt6PdfQuick.so.6.6.1 +-rwxr-xr-x root/root usr/lib/libQt6PdfQuick.so.6.6.1 -rw-r--r-- root/root usr/lib/libQt6PdfWidgets.prl lrwxrwxrwx root/root usr/lib/libQt6PdfWidgets.so -> libQt6PdfWidgets.so.6 -lrwxrwxrwx root/root usr/lib/libQt6PdfWidgets.so.6 -> libQt6PdfWidgets.so.6.6.0 --rwxr-xr-x root/root usr/lib/libQt6PdfWidgets.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libQt6PdfWidgets.so.6 -> libQt6PdfWidgets.so.6.6.1 +-rwxr-xr-x root/root usr/lib/libQt6PdfWidgets.so.6.6.1 -rw-r--r-- root/root usr/lib/libQt6WebEngineCore.prl lrwxrwxrwx root/root usr/lib/libQt6WebEngineCore.so -> libQt6WebEngineCore.so.6 -lrwxrwxrwx root/root usr/lib/libQt6WebEngineCore.so.6 -> libQt6WebEngineCore.so.6.6.0 --rwxr-xr-x root/root usr/lib/libQt6WebEngineCore.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libQt6WebEngineCore.so.6 -> libQt6WebEngineCore.so.6.6.1 +-rwxr-xr-x root/root usr/lib/libQt6WebEngineCore.so.6.6.1 -rw-r--r-- root/root usr/lib/libQt6WebEngineQuick.prl lrwxrwxrwx root/root usr/lib/libQt6WebEngineQuick.so -> libQt6WebEngineQuick.so.6 -lrwxrwxrwx root/root usr/lib/libQt6WebEngineQuick.so.6 -> libQt6WebEngineQuick.so.6.6.0 --rwxr-xr-x root/root usr/lib/libQt6WebEngineQuick.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libQt6WebEngineQuick.so.6 -> libQt6WebEngineQuick.so.6.6.1 +-rwxr-xr-x root/root usr/lib/libQt6WebEngineQuick.so.6.6.1 -rw-r--r-- root/root usr/lib/libQt6WebEngineQuickDelegatesQml.prl lrwxrwxrwx root/root usr/lib/libQt6WebEngineQuickDelegatesQml.so -> libQt6WebEngineQuickDelegatesQml.so.6 -lrwxrwxrwx root/root usr/lib/libQt6WebEngineQuickDelegatesQml.so.6 -> libQt6WebEngineQuickDelegatesQml.so.6.6.0 --rwxr-xr-x root/root usr/lib/libQt6WebEngineQuickDelegatesQml.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libQt6WebEngineQuickDelegatesQml.so.6 -> libQt6WebEngineQuickDelegatesQml.so.6.6.1 +-rwxr-xr-x root/root usr/lib/libQt6WebEngineQuickDelegatesQml.so.6.6.1 -rw-r--r-- root/root usr/lib/libQt6WebEngineWidgets.prl lrwxrwxrwx root/root usr/lib/libQt6WebEngineWidgets.so -> libQt6WebEngineWidgets.so.6 -lrwxrwxrwx root/root usr/lib/libQt6WebEngineWidgets.so.6 -> libQt6WebEngineWidgets.so.6.6.0 --rwxr-xr-x root/root usr/lib/libQt6WebEngineWidgets.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libQt6WebEngineWidgets.so.6 -> libQt6WebEngineWidgets.so.6.6.1 +-rwxr-xr-x root/root usr/lib/libQt6WebEngineWidgets.so.6.6.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/Qt6Pdf.pc -rw-r--r-- root/root usr/lib/pkgconfig/Qt6PdfQuick.pc diff --git a/qt6-webengine/.signature b/qt6-webengine/.signature index e1cc725bf..4585684a4 100644 --- a/qt6-webengine/.signature +++ b/qt6-webengine/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YIu8GkoJEAOkkapbaH2E6vDJi0/34w6kgC2w2+Axa+ieR3mol5Y0Wltqj1GIx8zhQM9SyaabgHrBOW79DTkigc= -SHA256 (Pkgfile) = 94070cef31d61fdaa67b6e1290aab31009ce2903189e5a3db97d7cdbddb10de7 -SHA256 (.footprint) = 9641c6c76ff72b6e86eff471b238e94eb99c21830a7ae5ba36ce3f92e1102dec -SHA256 (qtwebengine-everywhere-src-6.6.0.tar.xz) = d5dc9ff05a2c57adbf99cbf0c7cb6f19527f67216caf627b0cc160a1d253b780 +RWSE3ohX2g5d/Vd4tUbTwBXsgLFBbtltZIZWIWf6e/fUFREaDi3pL2WcXanmJAPOocs3r+VCv8oQ2KyuxsDienwG3s5fEsGniAA= +SHA256 (Pkgfile) = 263ac55b1ad8b2a72c7a445d246dab5baa7344c75e0d62e11955cafe3d550998 +SHA256 (.footprint) = ab1bd1c780bf7f6f7c1b7ea5e3703e30e96d3871f6365a31b85eb1e27b8f8662 +SHA256 (qtwebengine-everywhere-src-6.6.1.tar.xz) = 7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691 +SHA256 (qtwebengine-6.5.3-libxml2-2.12.patch) = ebd59e3406385871c0ae69e3fdd67b8c5f7c1abc4057f7c7cb85a99ffc4fd2ea diff --git a/qt6-webengine/Pkgfile b/qt6-webengine/Pkgfile index 657e58f33..88886d053 100644 --- a/qt6-webengine/Pkgfile +++ b/qt6-webengine/Pkgfile @@ -5,9 +5,10 @@ # Optional: dav1d fdk-aac gnutls graphite2 keyutils krb5 lame lcms2 libpcre2 libvdpau numactl pipewire x264 x265 name=qt6-webengine -version=6.6.0 +version=6.6.1 release=1 -source=(https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtwebengine-everywhere-src-$version.tar.xz) +source=(https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtwebengine-everywhere-src-$version.tar.xz + qtwebengine-6.5.3-libxml2-2.12.patch) build() { if [[ ! -e /usr/include/xkbcommon/xkbcommon-x11.h ]]; then @@ -28,6 +29,11 @@ build() { prt-get isinst sccache && echo "${PATH}" | grep --invert-match '/usr/lib/ccache' && \ PKGMK_QT6+=' -D CMAKE_C_COMPILER_LAUNCHER=sccache -D CMAKE_CXX_COMPILER_LAUNCHER=sccache' + patch -Np1 -d qtwebengine-everywhere-src-$version -i $SRC/qtwebengine-6.5.3-libxml2-2.12.patch + + sed -e 's/^#define BA_LB_COUNT.*$/#define BA_LB_COUNT 40/' \ + -i qtwebengine-everywhere-src-$version/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc + PYTHON=/usr/bin/python3 \ cmake -S qtwebengine-everywhere-src-$version -B build -G Ninja $PKGMK_QT6 \ -D CMAKE_BUILD_TYPE=Release \ diff --git a/qt6-webengine/icu74.patch b/qt6-webengine/icu74.patch new file mode 100644 index 000000000..9717e05c5 --- /dev/null +++ b/qt6-webengine/icu74.patch @@ -0,0 +1,18 @@ +Patch status: likely be handled when chromium bumps bundled ICU + +Quick fix for a static_assert failure with icu74. Still waiting +for a proper upstream fix that handles these additions properly, +but this is an extension of [1] (is now 48 rather than 43). + +https://bugs.gentoo.org/917633 + +[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc +@@ -163,3 +163,5 @@ + +-#if U_ICU_VERSION_MAJOR_NUM >= 58 ++#if U_ICU_VERSION_MAJOR_NUM >= 74 ++#define BA_LB_COUNT (U_LB_COUNT - 8) ++#elif U_ICU_VERSION_MAJOR_NUM >= 58 + #define BA_LB_COUNT (U_LB_COUNT - 3) diff --git a/qt6-webengine/libcxx17.patch b/qt6-webengine/libcxx17.patch new file mode 100644 index 000000000..8acbbf446 --- /dev/null +++ b/qt6-webengine/libcxx17.patch @@ -0,0 +1,83 @@ +Patch status: fixed in >=chromium-116.0.5809.0 + +Backport of [2][3] in order to fix building with libcxx-17 +(and hopefully runtime if upgrade from 16->17 without rebuilding). + +In order to apply cleanly, also needed [4] which seems fine to have. + +[1] https://crbug.com/1449299 +[2] https://crrev.com/9bfbbffdba73668fdb483e5a850911d2b64c35d7 +[3] https://crrev.com/4878976cd7391fbc02f87af4b7fb539b5c1f3817 +[4] https://crrev.com/5b5551edd3961481e617e510276b9f015a35b861 +--- a/src/3rdparty/chromium/base/containers/checked_iterators.h ++++ b/src/3rdparty/chromium/base/containers/checked_iterators.h +@@ -24,4 +24,7 @@ + using reference = T&; + using iterator_category = std::random_access_iterator_tag; ++#if defined(__cpp_lib_ranges) ++ using iterator_concept = std::contiguous_iterator_tag; ++#endif + + // Required for converting constructor below. +@@ -31,8 +34,6 @@ + // Required for certain libc++ algorithm optimizations that are not available + // for NaCl. +-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) + template + friend struct std::pointer_traits; +-#endif + + constexpr CheckedContiguousIterator() = default; +@@ -147,4 +148,10 @@ + } + ++ constexpr friend CheckedContiguousIterator operator+( ++ difference_type lhs, ++ const CheckedContiguousIterator& rhs) { ++ return rhs + lhs; ++ } ++ + constexpr CheckedContiguousIterator& operator-=(difference_type rhs) { + if (rhs < 0) { +@@ -218,5 +225,4 @@ + } // namespace base + +-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) + // Specialize both std::__is_cpp17_contiguous_iterator and std::pointer_traits + // for CCI in case we compile with libc++ outside of NaCl. The former is +@@ -236,11 +242,28 @@ + // [2] https://wg21.link/std.iterator.tags + // [3] https://wg21.link/pointer.traits.optmem +-namespace std { ++ ++#if defined(_LIBCPP_VERSION) ++ ++_LIBCPP_BEGIN_NAMESPACE_STD + + template ++struct __is_cpp17_contiguous_iterator; ++template + struct __is_cpp17_contiguous_iterator<::base::CheckedContiguousIterator> + : true_type {}; + + template ++struct __libcpp_is_contiguous_iterator; ++template ++struct __libcpp_is_contiguous_iterator<::base::CheckedContiguousIterator> ++ : true_type {}; ++ ++_LIBCPP_END_NAMESPACE_STD ++ ++#endif ++ ++namespace std { ++ ++template + struct pointer_traits<::base::CheckedContiguousIterator> { + using pointer = ::base::CheckedContiguousIterator; +@@ -261,5 +284,4 @@ + + } // namespace std +-#endif + + #endif // BASE_CONTAINERS_CHECKED_ITERATORS_H_ diff --git a/qt6-webengine/qtwebengine-6.5.3-libxml2-2.12.patch b/qt6-webengine/qtwebengine-6.5.3-libxml2-2.12.patch new file mode 100644 index 000000000..d725f3209 --- /dev/null +++ b/qt6-webengine/qtwebengine-6.5.3-libxml2-2.12.patch @@ -0,0 +1,39 @@ +Patch status: fixed in >=chromium-121.0.6104.0 with caveat + +Fix build failure[1] with libxml2-2.12 due xmlError changes. + +For convenience, use LIBXML_VERSION like webkit did[2] rather than +chromium's upstream fix[3] which relies on bundled libxml2 always +being 2.12.x (spares having to use has_version). + +When fix lands in qtwebengine, will need to depend on >=libxml2-2.12 +unless Qt decides to do something different considering that cmake +uses system libxml2 by default and it may be too early to enforce it. + +[1] https://bugs.gentoo.org/917601 +[2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b +[3] https://crrev.com/871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h +@@ -78,5 +78,9 @@ + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void ParseErrorFunc(void* user_data, const xmlError*); ++#else + static void ParseErrorFunc(void* user_data, xmlError*); ++#endif + static void GenericErrorFunc(void* user_data, const char* msg, ...); + +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc +@@ -67,5 +67,9 @@ + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { ++#else + void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { ++#endif + FrameConsole* console = static_cast(user_data); + if (!console)