[packages/qt6] up to 6.4.1
atler
atler at pld-linux.org
Wed Nov 16 14:56:56 CET 2022
commit 3e09bc4733ba895167a5cf379b0bcf413721a23b
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Nov 16 10:43:40 2022 +0100
up to 6.4.1
- package more files (todo updated)
github-crash.patch | 34 --------------------------
llvm15.patch | 70 ------------------------------------------------------
qt6.spec | 40 ++++++++++++++++++-------------
3 files changed, 23 insertions(+), 121 deletions(-)
---
diff --git a/qt6.spec b/qt6.spec
index 10826f4..c3fecfe 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -12,18 +12,12 @@
# /usr/lib64/cmake/Qt6Bundled_Clip2Tri/Qt6Bundled_Clip2TriDependencies.cmake
#
# /usr/lib64/objects-PLD/QmlCompilerPrivate_resources_1/.rcc/qrc_builtins.cpp.o
-# /usr/lib64/qt6/bin/instancer
-# /usr/lib64/qt6/bin/materialeditor
# /usr/lib64/qt6/bin/qt-configure-module
-# /usr/lib64/qt6/bin/shadergen
-# /usr/lib64/qt6/bin/shapegen
# /usr/lib64/qt6/libexec/gn
# /usr/lib64/qt6/mkspecs/modules/README
# /usr/lib64/qt6/mkspecs/qtdoc_dummy_file.txt
# android:
# /usr/lib64/qt6/libexec/android_emulator_launcher.sh
-# /usr/lib64/qt6/plugins/networkinformation/libqglib.so
-# /usr/lib64/qt6/plugins/networkinformation/libqnetworkmanager.so
#
# Conditional build:
# -- build targets
@@ -102,19 +96,17 @@
Summary: Qt6 Library
Summary(pl.UTF-8): Biblioteka Qt6
Name: qt6
-Version: 6.4.0
-Release: 2
+Version: 6.4.1
+Release: 1
License: LGPL v3 or GPL v2 or GPL v3 or commercial
Group: X11/Libraries
Source0: https://download.qt.io/official_releases/qt/6.4/%{version}/single/qt-everywhere-src-%{version}.tar.xz
-# Source0-md5: b45c32495e87cffa4739b24b5d062c50
+# Source0-md5: ae18c8d4c2d0b8fb757c6881f6e273ea
Patch0: system-cacerts.patch
Patch1: ninja-program.patch
Patch2: %{name}-gn.patch
Patch3: no-implicit-sse2.patch
Patch4: x32.patch
-Patch5: llvm15.patch
-Patch6: github-crash.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -3361,12 +3353,6 @@ narzędzia.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-cd qttools
-%patch5 -p1
-cd ..
-cd qtwebengine
-%patch6 -p1
-cd ..
%{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
@@ -4806,6 +4792,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQt6MultimediaWidgets.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libQt6MultimediaWidgets.so.6
+%dir %{qt6dir}/plugins/multimedia
+%attr(755,root,root) %{qt6dir}/plugins/multimedia/libffmpegmediaplugin.so
%files -n Qt6MultimediaWidgets-devel
%defattr(644,root,root,755)
@@ -4823,6 +4811,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQt6Network.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libQt6Network.so.6
+%dir %{qt6dir}/plugins/networkinformation
+%attr(755,root,root) %{qt6dir}/plugins/networkinformation/libqglib.so
+%attr(755,root,root) %{qt6dir}/plugins/networkinformation/libqnetworkmanager.so
%files -n Qt6Network-devel
%defattr(644,root,root,755)
@@ -5767,6 +5758,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n qt6-quick3d
%defattr(644,root,root,755)
%attr(755,root,root) %{qt6dir}/bin/balsamui
+%{?with_qtquick3dphysics:%attr(755,root,root) %{qt6dir}/bin/cooker}
%attr(755,root,root) %{qt6dir}/bin/instancer
%attr(755,root,root) %{qt6dir}/bin/materialeditor
%attr(755,root,root) %{qt6dir}/bin/shadergen
@@ -6193,19 +6185,33 @@ rm -rf $RPM_BUILD_ROOT
%files -n Qt6SpatialAudio
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQt6Quick3DSpatialAudio.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt6Quick3DSpatialAudio.so.6
%attr(755,root,root) %{_libdir}/libQt6SpatialAudio.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libQt6SpatialAudio.so.6
+%dir %{qt6dir}/qml/QtQuick3D/SpatialAudio
+%{qt6dir}/qml/QtQuick3D/SpatialAudio/qmldir
+%{qt6dir}/qml/QtQuick3D/SpatialAudio/plugins.qmltypes
+%attr(755,root,root) %{qt6dir}/qml/QtQuick3D/SpatialAudio/libquick3dspatialaudioplugin.so
+
%files -n Qt6SpatialAudio-devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQt6Quick3DSpatialAudio.so
%attr(755,root,root) %{_libdir}/libQt6SpatialAudio.so
+%{_libdir}/libQt6Quick3DSpatialAudio.prl
%{_libdir}/libQt6SpatialAudio.prl
+%{_includedir}/qt6/QtQuick3DSpatialAudio
%{_includedir}/qt6/QtSpatialAudio
+%{_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate
%{_libdir}/cmake/Qt6SpatialAudio
+%{_libdir}/metatypes/qt6quick3dspatialaudioprivate_pld_metatypes.json
%{_libdir}/metatypes/qt6spatialaudio_pld_metatypes.json
%{_pkgconfigdir}/Qt6SpatialAudio.pc
+%{qt6dir}/mkspecs/modules/qt_lib_quick3dspatialaudio_private.pri
%{qt6dir}/mkspecs/modules/qt_lib_spatialaudio.pri
%{qt6dir}/mkspecs/modules/qt_lib_spatialaudio_private.pri
+%{_datadir}/qt6/modules/Quick3DSpatialAudioPrivate.json
%{_datadir}/qt6/modules/SpatialAudio.json
%files -n qt6-shadertools
diff --git a/github-crash.patch b/github-crash.patch
deleted file mode 100644
index d49470f..0000000
--- a/github-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001
-From: Martin Negyokru <negyokru at inf.u-szeged.hu>
-Date: Mon, 3 Oct 2022 12:20:00 +0200
-Subject: Do not intercept websocket connection when there is no associated
- frame
-
-This fix is based on chrome's implementation.
-
-Fixes: QTBUG-107144
-Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen at qt.io>
-(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
----
- src/core/content_browser_client_qt.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
-index 020ae916a..99a3aa3f4 100644
---- a/src/core/content_browser_client_qt.cpp
-+++ b/src/core/content_browser_client_qt.cpp
-@@ -1237,8 +1237,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati
-
- bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame)
- {
-- Q_UNUSED(frame);
-- return true; // It is probably not worth it to only intercept when interceptors are installed
-+ return frame != nullptr;
- }
-
- QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame)
---
-cgit v1.2.1
-
diff --git a/llvm15.patch b/llvm15.patch
deleted file mode 100644
index 6fd893b..0000000
--- a/llvm15.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 01cae372619369d1a5a04f4d0f87817011029b78 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern at hazardy.de>
-Date: Sat, 1 Oct 2022 07:19:52 +0200
-Subject: lupdate: Fix build with clang 15+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The signature of InclusionDirective changed for clang 15.
-
-Change-Id: Ic259b3508088671b40f6f615524137ce8837c487
-Reviewed-by: Jörg Bornemann <joerg.bornemann at qt.io>
-(cherry picked from commit 6495329e6de803025e6e4e8291b648f94893551c)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
----
- src/linguist/lupdate/lupdatepreprocessoraction.cpp | 13 +++++++++++--
- src/linguist/lupdate/lupdatepreprocessoraction.h | 7 ++++++-
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-index d7446c364..9733f20d2 100644
---- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-@@ -156,14 +156,23 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
- // To list the included files
- void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
- const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/,
-- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
-+ clang::CharSourceRange /*filenameRange*/,
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+ const clang::Optional<clang::FileEntryRef> file,
-+#else
-+ const clang::FileEntry *file,
-+#endif
- clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
- const clang::Module */*imported*/, clang::SrcMgr::CharacteristicKind /*fileType*/)
- {
- if (!file)
- return;
-
-- clang::StringRef fileNameRealPath = file->tryGetRealPathName();
-+ clang::StringRef fileNameRealPath = file->
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+ getFileEntry().
-+#endif
-+ tryGetRealPathName();
- if (!LupdatePrivate::isFileSignificant(fileNameRealPath.str()))
- return;
-
-diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h
-index b1ee468d4..3e44cee83 100644
---- a/src/linguist/lupdate/lupdatepreprocessoraction.h
-+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
-@@ -51,7 +51,12 @@ private:
- void SourceRangeSkipped(clang::SourceRange sourceRange, clang::SourceLocation endifLoc) override;
- void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/,
- clang::StringRef /*fileName*/, bool /*isAngled*/,
-- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
-+ clang::CharSourceRange /*filenameRange*/,
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+ const clang::Optional<clang::FileEntryRef> file,
-+#else
-+ const clang::FileEntry *file,
-+#endif
- clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
- const clang::Module */*imported*/,
- clang::SrcMgr::CharacteristicKind /*fileType*/) override;
---
-cgit v1.2.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/6ee89184faa47a59d5990377422f7d8401904252
More information about the pld-cvs-commit
mailing list