From 782b26ceaa78bf25f3bed72405d92274bc4422d2 Mon Sep 17 00:00:00 2001 From: Luis Date: Fri, 1 Dec 2023 17:48:11 +0000 Subject: [PATCH] qtwebengine: upgrade to 5.15.17 --- main/qtwebengine/.checksums | 7 +- main/qtwebengine/.pkgfiles | 168 +++++++++--------- .../qtwebengine--build_fixes-1.patch | 7 - .../qtwebengine--ffmpeg5_fixes-1.patch | 7 - main/qtwebengine/qtwebengine--icu_73-1.patch | 7 - .../qtwebengine-5.15.16-icu_74-1.patch | 20 --- ...> qtwebengine-5.15.17-build_fixes-1.patch} | 0 ...qtwebengine-5.15.17-ffmpeg5_fixes-1.patch} | 0 main/qtwebengine/spkgbuild | 32 +++- 9 files changed, 110 insertions(+), 138 deletions(-) delete mode 100644 main/qtwebengine/qtwebengine--build_fixes-1.patch delete mode 100644 main/qtwebengine/qtwebengine--ffmpeg5_fixes-1.patch delete mode 100644 main/qtwebengine/qtwebengine--icu_73-1.patch delete mode 100644 main/qtwebengine/qtwebengine-5.15.16-icu_74-1.patch rename main/qtwebengine/{qtwebengine-5.15.16-build_fixes-1.patch => qtwebengine-5.15.17-build_fixes-1.patch} (100%) rename main/qtwebengine/{qtwebengine-5.15.16-ffmpeg5_fixes-1.patch => qtwebengine-5.15.17-ffmpeg5_fixes-1.patch} (100%) diff --git a/main/qtwebengine/.checksums b/main/qtwebengine/.checksums index e8a4c16d3..e9799c59b 100644 --- a/main/qtwebengine/.checksums +++ b/main/qtwebengine/.checksums @@ -1,4 +1,3 @@ -0ca770181ebbec006511bf40ea8172dd qtwebengine-5.15.16-build_fixes-1.patch -bfa30d1044f118d70164d0a04a76173e qtwebengine-5.15.16-ffmpeg5_fixes-1.patch -53cc6cb376b1fa56aa6657db1ea61872 qtwebengine-5.15.16-icu_74-1.patch -6bb50d47dd854c59d38e67c1ccb6e80d qtwebengine-5.15.16.tar.xz +0ca770181ebbec006511bf40ea8172dd qtwebengine-5.15.17-build_fixes-1.patch +bfa30d1044f118d70164d0a04a76173e qtwebengine-5.15.17-ffmpeg5_fixes-1.patch +9f430acf599605c762a8098000155045 qtwebengine-5.15.17.tar.xz diff --git a/main/qtwebengine/.pkgfiles b/main/qtwebengine/.pkgfiles index da92493c8..cbab92c92 100644 --- a/main/qtwebengine/.pkgfiles +++ b/main/qtwebengine/.pkgfiles @@ -1,19 +1,19 @@ -qtwebengine-5.15.16-2 +qtwebengine-5.15.17-1 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/QtPdf/ -drwxr-xr-x root/root usr/include/qt5/QtPdf/5.15.9/ -drwxr-xr-x root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/ -drwxr-xr-x root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/ --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qpdfdestination_p.h --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qpdfdocument_p.h --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qpdflinkmodel_p.h --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qpdflinkmodel_p_p.h --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qpdfsearchmodel_p.h --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qpdfsearchresult_p.h --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qpdfselection_p.h --rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/qtpdf-config_p.h +drwxr-xr-x root/root usr/include/qt5/QtPdf/5.15.11/ +drwxr-xr-x root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/ +drwxr-xr-x root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/ +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qpdfdestination_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qpdfdocument_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qpdflinkmodel_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qpdflinkmodel_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qpdfsearchmodel_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qpdfsearchresult_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qpdfselection_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdf/5.15.11/QtPdf/private/qtpdf-config_p.h -rw-r--r-- root/root usr/include/qt5/QtPdf/QPdfBookmarkModel -rw-r--r-- root/root usr/include/qt5/QtPdf/QPdfDestination -rw-r--r-- root/root usr/include/qt5/QtPdf/QPdfDocument @@ -40,11 +40,11 @@ drwxr-xr-x root/root usr/include/qt5/QtPdf/5.15.9/QtPdf/private/ -rw-r--r-- root/root usr/include/qt5/QtPdf/qtpdfglobal.h -rw-r--r-- root/root usr/include/qt5/QtPdf/qtpdfversion.h drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/5.15.9/ -drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/5.15.9/QtPdfWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/5.15.9/QtPdfWidgets/private/ --rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/5.15.9/QtPdfWidgets/private/qpdfview_p.h --rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/5.15.9/QtPdfWidgets/private/qtpdfwidgets-config_p.h +drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/5.15.11/ +drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/5.15.11/QtPdfWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/5.15.11/QtPdfWidgets/private/ +-rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/5.15.11/QtPdfWidgets/private/qpdfview_p.h +-rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/5.15.11/QtPdfWidgets/private/qtpdfwidgets-config_p.h -rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/QPdfView -rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/QtPdfWidgets -rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/QtPdfWidgetsDepends @@ -54,33 +54,33 @@ drwxr-xr-x root/root usr/include/qt5/QtPdfWidgets/5.15.9/QtPdfWidgets/private -rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/qtpdfwidgetsglobal.h -rw-r--r-- root/root usr/include/qt5/QtPdfWidgets/qtpdfwidgetsversion.h drwxr-xr-x root/root usr/include/qt5/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.15.9/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/ --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebengineaction_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebengineaction_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginecertificateerror_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginedialogrequests_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginedownloaditem_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginehistory_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginehistory_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebengineloadrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginenavigationrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginenewviewrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebengineprofile_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginescript_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginesettings_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginesingleton_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginetestsupport_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebengineview_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qquickwebengineview_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qtwebengine-config_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/qtwebengineglobal_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.15.11/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebengineaction_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebengineaction_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginecertificateerror_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginedialogrequests_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginedownloaditem_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginehistory_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginehistory_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebengineloadrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginenavigationrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginenewviewrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginescript_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginesettings_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginesingleton_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginetestsupport_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebengineview_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qquickwebengineview_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qtwebengine-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.15.11/QtWebEngine/private/qtwebengineglobal_p.h -rw-r--r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineProfile -rw-r--r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineScript -rw-r--r-- root/root usr/include/qt5/QtWebEngine/QtWebEngine @@ -92,15 +92,15 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.15.9/QtWebEngine/private/ -rw-r--r-- root/root usr/include/qt5/QtWebEngine/qtwebengineglobal.h -rw-r--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.15.9/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/private/ --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/private/qtwebenginecore-config_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/private/qtwebenginecoreglobal_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/private/qwebenginecallback_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/private/qwebenginecookiestore_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.15.11/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/private/qtwebenginecore-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/private/qtwebenginecoreglobal_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/private/qwebenginecallback_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/private/qwebenginecookiestore_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.15.11/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCallback -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineClientCertificateStore -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCookieStore @@ -134,17 +134,17 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.15.9/QtWebEngineCore/p -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlscheme.h -rw-r--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.15.9/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/ --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qwebenginehistory_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qwebenginepage_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qwebengineprofile_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.9/QtWebEngineWidgets/private/qwebengineview_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qwebenginehistory_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qwebenginepage_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.15.11/QtWebEngineWidgets/private/qwebengineview_p.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineCertificateError -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineClientCertificateSelection -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineContextMenuData @@ -198,30 +198,30 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5WebEngineWidgets/ -rw-r--r-- root/root usr/lib/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfig.cmake -rw-r--r-- root/root usr/lib/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake -rw-r--r-- root/root usr/lib/libQt5Pdf.prl -lrwxrwxrwx root/root usr/lib/libQt5Pdf.so -> libQt5Pdf.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5Pdf.so.5 -> libQt5Pdf.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5Pdf.so.5.15 -> libQt5Pdf.so.5.15.9 --rwxr-xr-x root/root usr/lib/libQt5Pdf.so.5.15.9 +lrwxrwxrwx root/root usr/lib/libQt5Pdf.so -> libQt5Pdf.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5Pdf.so.5 -> libQt5Pdf.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5Pdf.so.5.15 -> libQt5Pdf.so.5.15.11 +-rwxr-xr-x root/root usr/lib/libQt5Pdf.so.5.15.11 -rw-r--r-- root/root usr/lib/libQt5PdfWidgets.prl -lrwxrwxrwx root/root usr/lib/libQt5PdfWidgets.so -> libQt5PdfWidgets.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5PdfWidgets.so.5 -> libQt5PdfWidgets.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5PdfWidgets.so.5.15 -> libQt5PdfWidgets.so.5.15.9 --rwxr-xr-x root/root usr/lib/libQt5PdfWidgets.so.5.15.9 +lrwxrwxrwx root/root usr/lib/libQt5PdfWidgets.so -> libQt5PdfWidgets.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5PdfWidgets.so.5 -> libQt5PdfWidgets.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5PdfWidgets.so.5.15 -> libQt5PdfWidgets.so.5.15.11 +-rwxr-xr-x root/root usr/lib/libQt5PdfWidgets.so.5.15.11 -rw-r--r-- root/root usr/lib/libQt5WebEngine.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.15 -> libQt5WebEngine.so.5.15.9 --rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.15.9 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.15 -> libQt5WebEngine.so.5.15.11 +-rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.15.11 -rw-r--r-- root/root usr/lib/libQt5WebEngineCore.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.15 -> libQt5WebEngineCore.so.5.15.9 --rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.15.9 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.15 -> libQt5WebEngineCore.so.5.15.11 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.15.11 -rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.15.9 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.15 -> libQt5WebEngineWidgets.so.5.15.9 --rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.15.9 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.15.11 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.15 -> libQt5WebEngineWidgets.so.5.15.11 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.15.11 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/Qt5Pdf.pc -rw-r--r-- root/root usr/lib/pkgconfig/Qt5PdfWidgets.pc diff --git a/main/qtwebengine/qtwebengine--build_fixes-1.patch b/main/qtwebengine/qtwebengine--build_fixes-1.patch deleted file mode 100644 index 6bdb6631a..000000000 --- a/main/qtwebengine/qtwebengine--build_fixes-1.patch +++ /dev/null @@ -1,7 +0,0 @@ - - -404 Not Found - -

Not Found

-

The requested URL was not found on this server.

- diff --git a/main/qtwebengine/qtwebengine--ffmpeg5_fixes-1.patch b/main/qtwebengine/qtwebengine--ffmpeg5_fixes-1.patch deleted file mode 100644 index 6bdb6631a..000000000 --- a/main/qtwebengine/qtwebengine--ffmpeg5_fixes-1.patch +++ /dev/null @@ -1,7 +0,0 @@ - - -404 Not Found - -

Not Found

-

The requested URL was not found on this server.

- diff --git a/main/qtwebengine/qtwebengine--icu_73-1.patch b/main/qtwebengine/qtwebengine--icu_73-1.patch deleted file mode 100644 index 6bdb6631a..000000000 --- a/main/qtwebengine/qtwebengine--icu_73-1.patch +++ /dev/null @@ -1,7 +0,0 @@ - - -404 Not Found - -

Not Found

-

The requested URL was not found on this server.

- diff --git a/main/qtwebengine/qtwebengine-5.15.16-icu_74-1.patch b/main/qtwebengine/qtwebengine-5.15.16-icu_74-1.patch deleted file mode 100644 index bf393842e..000000000 --- a/main/qtwebengine/qtwebengine-5.15.16-icu_74-1.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git 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 -index e34b073..b6e9ec8 100644 ---- 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 -@@ -162,11 +162,15 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar - }; - // clang-format on - -+#if U_ICU_VERSION_MAJOR_NUM >= 74 -+#define BA_LB_COUNT (U_LB_COUNT - 8) -+#else - #if U_ICU_VERSION_MAJOR_NUM >= 58 - #define BA_LB_COUNT (U_LB_COUNT - 3) - #else - #define BA_LB_COUNT U_LB_COUNT - #endif -+#endif - // Line breaking table for CSS word-break: break-all. This table differs from - // asciiLineBreakTable in: - // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking diff --git a/main/qtwebengine/qtwebengine-5.15.16-build_fixes-1.patch b/main/qtwebengine/qtwebengine-5.15.17-build_fixes-1.patch similarity index 100% rename from main/qtwebengine/qtwebengine-5.15.16-build_fixes-1.patch rename to main/qtwebengine/qtwebengine-5.15.17-build_fixes-1.patch diff --git a/main/qtwebengine/qtwebengine-5.15.16-ffmpeg5_fixes-1.patch b/main/qtwebengine/qtwebengine-5.15.17-ffmpeg5_fixes-1.patch similarity index 100% rename from main/qtwebengine/qtwebengine-5.15.16-ffmpeg5_fixes-1.patch rename to main/qtwebengine/qtwebengine-5.15.17-ffmpeg5_fixes-1.patch diff --git a/main/qtwebengine/spkgbuild b/main/qtwebengine/spkgbuild index 3cb45dd84..18b0ce327 100755 --- a/main/qtwebengine/spkgbuild +++ b/main/qtwebengine/spkgbuild @@ -1,32 +1,32 @@ # description : QtWebEngine integrates chromium's web capabilities into Qt -# depends : qt5 nss libwebp libxslt opus ninja ffmpeg alsa-lib libxcomposite libxtst libxcursor nodejs +# depends : ffmpeg libwebp libxcomposite libxcursor libxslt libxtst ninja nodejs nss opus qt5 # optional : krb5 jsoncpp snappy name=qtwebengine -version=5.15.16 -release=2 +version=5.15.17 +release=1 source="https://anduin.linuxfromscratch.org/BLFS/qtwebengine/qtwebengine-$version.tar.xz qtwebengine-$version-build_fixes-1.patch - qtwebengine-$version-ffmpeg5_fixes-1.patch - qtwebengine-$version-icu_74-1.patch" + qtwebengine-$version-ffmpeg5_fixes-1.patch" build() { cd $name-$version - # Fix build with ICU 74 - patch -Np1 -i $SRC/qtwebengine-$version-icu_74-1.patch - # Fix several issues and to force it to use python3 patch -Np1 -i $SRC/qtwebengine-$version-build_fixes-1.patch # Fix build with ffmpeg-5 patch -Np1 -i $SRC/qtwebengine-$version-ffmpeg5_fixes-1.patch + # Fix an issue in shipped ffmpeg causing it fail to build with Binutils 2.41 or later + sed 's/(uint8_t)\(([^)]*)\|shift\)/\1 \& 0x1F/' \ + -i src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h + # Create the required .git directories mkdir -pv .git src/3rdparty/chromium/.git # change to current version of QT5 - sed -e '/^MODULE_VERSION/s/5.*/5.15.9/' -i .qmake.conf + sed -e '/^MODULE_VERSION/s/5.*/5.15.11/' -i .qmake.conf # Local headers find -type f -name "*.pr[io]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' @@ -35,6 +35,20 @@ build() { sed -e 's/\^(?i)/(?i)^/' -i src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py sed -e "s/'rU'/'r'/" -i src/3rdparty/chromium/tools/grit/grit/util.py + # Remove an obsolete instance of and a reference to the six module + sed -e /six.move/d \ + -i src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py + rm -r src/3rdparty/chromium/tools/grit/third_party/six + + # There is also a workaround needed for ICU-74+ + sed -e 's/^#define BA_LB_COUNT.*$/#define BA_LB_COUNT 40/' \ + -i src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc + + # Fix build with libxml2 + sed -e 's/xmlError/const xmlError/' \ + -i src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h \ + -i src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc + # Fix NINJAJOBS environment variable sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro