update to 6.3.0 [release 6.3.0-1mamba;Thu Apr 14 2022]
This commit is contained in:
parent
91ee8ddf9a
commit
b4649610f9
38
qt6-qtwebengine-6.3.0-icu-71.1.patch
Normal file
38
qt6-qtwebengine-6.3.0-icu-71.1.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Burtsev <kirill.burtsev@qt.io>
|
||||
Date: Thu, 31 Mar 2022 19:45:39 +0200
|
||||
Subject: [FIXUP] Fix compilation with system ICU
|
||||
|
||||
As of chromium 92.0.4480.0 after a set of fixes ending with a
|
||||
https://chromium-review.googlesource.com/c/chromium/src/+/2830820
|
||||
the need to override UCHAR_TYPE was dropped with the result that
|
||||
codebase is ready for default 'char16_t'. Override was already dropped
|
||||
for 98-based, which already builds fine for system ICU 70.1
|
||||
|
||||
Task-number: QTBUG-100495
|
||||
Change-Id: I0e6d422f77b77015840647b52247f51736dd8a41
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
---
|
||||
chromium/third_party/icu/BUILD.gn | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
|
||||
index d5b136168ef..269de02eaaa 100644
|
||||
--- a/chromium/third_party/icu/BUILD.gn
|
||||
+++ b/chromium/third_party/icu/BUILD.gn
|
||||
@@ -410,12 +410,6 @@ config("system_icu_config") {
|
||||
"USING_SYSTEM_ICU=1",
|
||||
"ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
|
||||
]
|
||||
-
|
||||
- if (is_win) {
|
||||
- defines += [ "UCHAR_TYPE=wchar_t" ]
|
||||
- } else {
|
||||
- defines += [ "UCHAR_TYPE=uint16_t" ]
|
||||
- }
|
||||
}
|
||||
|
||||
if (use_system_icu) {
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
@ -1,6 +1,6 @@
|
||||
%define majver %(echo %version | cut -d. -f1-2)
|
||||
Name: qt6-qtwebengine
|
||||
Version: 6.2.4
|
||||
Version: 6.3.0
|
||||
Release: 1mamba
|
||||
Summary: Qt6 WebEngine component
|
||||
Group: System/Libraries
|
||||
@ -10,6 +10,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: https://www.qt.io/
|
||||
Source: https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtwebengine-everywhere-src-%{version}.tar.xz
|
||||
Patch0: qt6-qtwebengine-6.2.3-ffmpeg-5.0.patch
|
||||
Patch1: qt6-qtwebengine-6.3.0-icu-71.1.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -55,6 +56,8 @@ BuildRequires: libxshmfence-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: qt6-qtbase-devel
|
||||
BuildRequires: qt6-qtdeclarative-devel
|
||||
BuildRequires: qt6-qtpositioning-devel
|
||||
BuildRequires: qt6-qtwebchannel-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: qt6-qtdeclarative-devel = %{version}
|
||||
|
||||
@ -76,7 +79,8 @@ This package contains libraries and header files for developing applications tha
|
||||
#-D -T
|
||||
#:<< _EOF
|
||||
cd src/3rdparty
|
||||
%patch0 -p1 -b .ffmpèeg-5.0
|
||||
#%patch0 -p1 -b .ffmpeg-5.0
|
||||
%patch1 -p1 -b .icu-71.1
|
||||
cd ../..
|
||||
|
||||
%build
|
||||
@ -120,37 +124,35 @@ DESTDIR="%{buildroot}" cmake --install build
|
||||
%files
|
||||
#-f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/qt6/plugins/imageformats/libqpdf.so
|
||||
%{_datadir}/qt6/resources/qtwebengine_devtools_resources.pak
|
||||
%{_datadir}/qt6/resources/qtwebengine_resources.pak
|
||||
%{_datadir}/qt6/resources/qtwebengine_resources_100p.pak
|
||||
%{_datadir}/qt6/resources/qtwebengine_resources_200p.pak
|
||||
%dir %{_datadir}/qt6/translations/qtwebengine_locales
|
||||
%{_datadir}/qt6/translations/qtwebengine_locales/*.pak
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libQt6WebEngineCore.so.*
|
||||
%{_libdir}/libQt6WebEngineWidgets.so.*
|
||||
%{_libdir}/libQt6WebEngineQuick.so.*
|
||||
%{_libdir}/libQt6WebEngineQuickDelegatesQml.so.*
|
||||
%{_libdir}/libQt6Pdf.so.*
|
||||
%{_libdir}/libQt6PdfQuick.so.*
|
||||
%{_libdir}/libQt6PdfWidgets.so.*
|
||||
%{_libdir}/qt6/libexec/*
|
||||
%{_datadir}/qt6/modules/WebEngine*.json
|
||||
%dir %{_libdir}/qml/QtWebEngine
|
||||
%{_libdir}/qml/QtWebEngine/*
|
||||
%{_libdir}/metatypes/qt6webengine*.json
|
||||
%dir %{_libdir}/qml/QtQuick/Pdf
|
||||
%{_libdir}/qml/QtQuick/Pdf/*
|
||||
%{_libdir}/metatypes/qt6*.json
|
||||
%{_datadir}/qt6/modules/Pdf*.json
|
||||
%doc LICENSE.GPL3 LICENSE.GPL3-EXCEPT
|
||||
%doc LICENSE.LGPL3 LICENSE.Chromium LICENSE.FDL
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/qt6/QtWebEngineQuick
|
||||
%{_includedir}/qt6/QtWebEngineQuick/*
|
||||
%dir %{_includedir}/qt6/QtWebEngineCore
|
||||
%{_includedir}/qt6/QtWebEngineCore/*
|
||||
%dir %{_includedir}/qt6/QtWebEngineWidgets
|
||||
%{_includedir}/qt6/QtWebEngineWidgets/*
|
||||
%dir %{_libdir}/cmake/Qt6WebEngineCore
|
||||
%{_libdir}/cmake/Qt6WebEngineCore/*.cmake
|
||||
%{_libdir}/cmake/Qt6/Find*.cmake
|
||||
%dir %{_libdir}/cmake/Qt6WebEngineWidgets
|
||||
%dir %{_includedir}/qt6/Qt*
|
||||
%{_includedir}/qt6/Qt*/*
|
||||
%{_libdir}/libQt6WebEngineCore.prl
|
||||
%{_libdir}/libQt6WebEngineCore.so
|
||||
%{_libdir}/libQt6WebEngineWidgets.prl
|
||||
@ -159,21 +161,18 @@ DESTDIR="%{buildroot}" cmake --install build
|
||||
%{_libdir}/libQt6WebEngineQuick.so
|
||||
%{_libdir}/libQt6WebEngineQuickDelegatesQml.prl
|
||||
%{_libdir}/libQt6WebEngineQuickDelegatesQml.so
|
||||
%{_libdir}/qt6/mkspecs/modules/qt_lib_webengine*.pri
|
||||
%dir %{_libdir}/cmake/Qt6WebEngineCoreTools
|
||||
%{_libdir}/cmake/Qt6WebEngineCoreTools/Qt6WebEngineCoreTools*.cmake
|
||||
%dir %{_libdir}/cmake/Qt6WebEngineQuick
|
||||
%{_libdir}/cmake/Qt6WebEngineQuick/Qt6WebEngineQuick*.cmake
|
||||
%dir %{_libdir}/cmake/Qt6WebEngineWidgets
|
||||
%{_libdir}/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgets*.cmake
|
||||
%dir %{_libdir}/cmake/Qt6BuildInternals/StandaloneTests
|
||||
%{_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebEngine*.cmake
|
||||
%dir %{_libdir}/cmake/Qt6Qml/QmlPlugins
|
||||
%{_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6qtwebengine*.cmake
|
||||
%dir %{_libdir}/cmake/Qt6WebEngineQuickDelegatesQml
|
||||
%{_libdir}/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQml*.cmake
|
||||
%{_libdir}/libQt6Pdf*.prl
|
||||
%{_libdir}/libQt6Pdf*.so
|
||||
%{_libdir}/qt6/mkspecs/modules/qt_lib_*.pri
|
||||
%{_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebEngineTestsConfig.cmake
|
||||
%{_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6*.cmake
|
||||
%dir %{_libdir}/cmake/Qt6*
|
||||
%{_libdir}/cmake/Qt6*/*.cmake
|
||||
|
||||
%changelog
|
||||
* Thu Apr 14 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 6.3.0-1mamba
|
||||
- update to 6.3.0
|
||||
|
||||
* Mon Mar 21 2022 Automatic Build System <autodist@mambasoft.it> 6.2.4-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user