diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 75d2f47..c0c34c8 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -47,7 +47,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.8.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ @@ -96,15 +96,6 @@ Patch56: qtbase-mysql.patch # fix FTBFS against libglvnd-1.3.4+ Patch58: qtbase-libglvnd.patch -# Bug 1954359 - Many emoji don't show up in Qt apps because qt does not handle 'emoji' font family -# FIXME: this change seems to completely break font rendering for some people -# Patch60: qtbase-cache-emoji-font.patch - -%if 0%{?fedora} && 0%{?fedora} < 39 -# Latest QGnomePlatform needs to be specified to be used -Patch100: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch -%endif - ## upstream patches Patch150: qtbase-extract-emoji-data-from-unicode-files.patch Patch151: qtbase-introduce-emoji-segmenter-to-3rdparty-code.patch @@ -184,8 +175,6 @@ BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(libglvnd) BuildRequires: pkgconfig(x11) -# only needed for GLES2 and GLES3 builds -#BuildRequires: pkgconfig(glesv2) %global sqlite 1 BuildRequires: pkgconfig(sqlite3) >= 3.7 @@ -198,7 +187,6 @@ BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig( BuildRequires: pkgconfig(zlib) BuildRequires: perl BuildRequires: perl-generators -# see patch68 BuildRequires: python3 BuildRequires: qt6-rpm-macros @@ -421,8 +409,6 @@ export MAKEFLAGS="%{?_smp_mflags}" -DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \ -DQT_QMAKE_TARGET_MKSPEC=%{platform} -# FIXME -# -DQT_FEATURE_directfb=ON \ %cmake_build @@ -521,16 +507,25 @@ install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10 mkdir -p %{buildroot}%{_qt6_headerdir}/QtXcb install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt6_headerdir}/QtXcb/ -rm %{buildroot}/%{_qt6_libexecdir}/qt-cmake-private-install.cmake +# Copied from OpenSUSE packages +# CMake modules for plugins are not useful +rm %{buildroot}%{_qt6_libdir}/cmake/*/*Plugin{Config,ConfigVersion,Targets*}.cmake +# These files are only useful for the Qt continuous integration +rm %{buildroot}%{_qt6_libexecdir}/ensure_pro_file.cmake +rm %{buildroot}%{_qt6_libexecdir}/qt-android-runner.py +rm %{buildroot}%{_qt6_libexecdir}/qt-testrunner.py +rm %{buildroot}%{_qt6_libexecdir}/sanitizer-testrunner.py + +# Not useful for desktop installs rm -r %{buildroot}%{_qt6_libdir}/cmake/Qt6ExamplesAssetDownloaderPrivate rm -r %{buildroot}%{_qt6_headerdir}/QtExamplesAssetDownloader -rm %{buildroot}%{_qt6_libdir}/qt6/modules/ExamplesAssetDownloaderPrivate.json +rm %{buildroot}%{_qt6_descriptionsdir}/ExamplesAssetDownloaderPrivate.json rm %{buildroot}%{_qt6_libdir}/libQt6ExamplesAssetDownloader.* rm %{buildroot}%{_qt6_libdir}/qt6/metatypes/qt6examplesassetdownloaderprivate_*_metatypes.json -# Use better location for some new scripts in qtbase-6.0.1 -mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake +# This is only for Apple platforms and has a python2 dep +rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit %check # verify Qt6.pc @@ -557,6 +552,7 @@ make check -k ||: %license LICENSES/GPL* %license LICENSES/LGPL* %dir %{_sysconfdir}/xdg/QtProject/ +%{_qt6_archdatadir}/sbom/qtbase-%{qt_version}.spdx %{_qt6_libdir}/libQt6Concurrent.so.6* %{_qt6_libdir}/libQt6Core.so.6* %{_qt6_libdir}/libQt6DBus.so.6* @@ -580,6 +576,7 @@ make check -k ||: %dir %{_qt6_plugindir}/styles/ %{_qt6_plugindir}/networkinformation/libqglib.so %{_qt6_plugindir}/networkinformation/libqnetworkmanager.so +%{_qt6_plugindir}/printsupport/libcupsprintersupport.so %{_qt6_plugindir}/sqldrivers/libqsqlite.so %{_qt6_plugindir}/tls/libqcertonlybackend.so %{_qt6_plugindir}/tls/libqopensslbackend.so @@ -604,16 +601,9 @@ make check -k ||: %dir %{_qt6_libdir}/cmake/Qt6CoreTools %dir %{_qt6_libdir}/cmake/Qt6DBus %dir %{_qt6_libdir}/cmake/Qt6DBusTools -%dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate -%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate -%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate -%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate -%dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate -%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6Gui %dir %{_qt6_libdir}/cmake/Qt6GuiTools %dir %{_qt6_libdir}/cmake/Qt6HostInfo -%dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6Network %dir %{_qt6_libdir}/cmake/Qt6OpenGL %dir %{_qt6_libdir}/cmake/Qt6OpenGLWidgets @@ -643,12 +633,11 @@ make check -k ||: %{_qt6_bindir}/qt-cmake-create %{_qt6_bindir}/qt-configure-module %{_qt6_libexecdir}/qt-cmake-private +%{_qt6_libexecdir}/qt-cmake-private-install.cmake %{_qt6_libexecdir}/qt-cmake-standalone-test %{_qt6_libexecdir}/cmake_automoc_parser %{_qt6_libexecdir}/qt-internal-configure-examples %{_qt6_libexecdir}/qt-internal-configure-tests -%{_qt6_libexecdir}/sanitizer-testrunner.py -%{_qt6_libexecdir}/qt-android-runner.py %{_qt6_libexecdir}/syncqt %{_qt6_libexecdir}/moc %{_qt6_libexecdir}/tracegen @@ -657,13 +646,9 @@ make check -k ||: %{_qt6_libexecdir}/qvkgen %{_qt6_libexecdir}/rcc %{_qt6_libexecdir}/uic -%{_qt6_libexecdir}/qt-testrunner.py -%{_qt6_libdir}/qt6/modules/*.json %{_qt6_headerdir}/QtConcurrent/ %{_qt6_headerdir}/QtCore/ %{_qt6_headerdir}/QtDBus/ -%{_qt6_headerdir}/QtInputSupport -%{_qt6_headerdir}/QtExampleIcons %{_qt6_headerdir}/QtGui/ %{_qt6_headerdir}/QtNetwork/ %{_qt6_headerdir}/QtOpenGL/ @@ -674,10 +659,6 @@ make check -k ||: %{_qt6_headerdir}/QtWidgets/ %{_qt6_headerdir}/QtXcb/ %{_qt6_headerdir}/QtXml/ -%{_qt6_headerdir}/QtEglFSDeviceIntegration -%{_qt6_headerdir}/QtEglFsKmsGbmSupport -%{_qt6_headerdir}/QtEglFsKmsSupport -%{_qt6_mkspecsdir}/ %{_qt6_libdir}/libQt6Concurrent.prl %{_qt6_libdir}/libQt6Concurrent.so %{_qt6_libdir}/libQt6Core.prl @@ -704,10 +685,6 @@ make check -k ||: %{_qt6_libdir}/libQt6XcbQpa.so %{_qt6_libdir}/libQt6Xml.prl %{_qt6_libdir}/libQt6Xml.so -%{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl -%{_qt6_libdir}/libQt6EglFSDeviceIntegration.so -%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.prl -%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/REUSE.toml %{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/REUSE.toml %{_qt6_libdir}/cmake/Qt6/*.h.in @@ -741,17 +718,9 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake %{_qt6_libdir}/cmake/Qt6DBus/*.cmake %{_qt6_libdir}/cmake/Qt6DBusTools/*.cmake -%{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Gui/*.cmake %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake %{_qt6_libdir}/cmake/Qt6HostInfo/*.cmake -%{_qt6_libdir}/cmake/Qt6InputSupportPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6KmsSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Network/*.cmake %{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake %{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake @@ -761,37 +730,106 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6Test/*.cmake %{_qt6_libdir}/cmake/Qt6Widgets/*.cmake %{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake -%{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Xml/*.cmake -%{_qt6_libdir}/qt6/metatypes/*.json -%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o +%{_qt6_descriptionsdir}/Concurrent.json +%{_qt6_descriptionsdir}/Core.json +%{_qt6_descriptionsdir}/DBus.json +%{_qt6_descriptionsdir}/Gui.json +%{_qt6_descriptionsdir}/Network.json +%{_qt6_descriptionsdir}/OpenGL.json +%{_qt6_descriptionsdir}/OpenGLWidgets.json +%{_qt6_descriptionsdir}/PrintSupport.json +%{_qt6_descriptionsdir}/Sql.json +%{_qt6_descriptionsdir}/Test.json +%{_qt6_descriptionsdir}/Widgets.json +%{_qt6_descriptionsdir}/Xml.json +%{_qt6_metatypesdir}/qt6concurrent_*_metatypes.json +%{_qt6_metatypesdir}/qt6core_*_metatypes.json +%{_qt6_metatypesdir}/qt6dbus_*_metatypes.json +%{_qt6_metatypesdir}/qt6gui_*_metatypes.json +%{_qt6_metatypesdir}/qt6network_*_metatypes.json +%{_qt6_metatypesdir}/qt6opengl_*_metatypes.json +%{_qt6_metatypesdir}/qt6openglwidgets_*_metatypes.json +%{_qt6_metatypesdir}/qt6printsupport_*_metatypes.json +%{_qt6_metatypesdir}/qt6sql_*_metatypes.json +%{_qt6_metatypesdir}/qt6test_*_metatypes.json +%{_qt6_metatypesdir}/qt6widgets_*_metatypes.json +%{_qt6_metatypesdir}/qt6xml_*_metatypes.json %{_qt6_libdir}/pkgconfig/*.pc -%{_qt6_libdir}/qt6/sbom/qtbase-%{qt_version}.spdx - -%if 0%{?egl} -%{_qt6_libdir}/libQt6EglFsKmsSupport.prl -%{_qt6_libdir}/libQt6EglFsKmsSupport.so -%endif +%{_qt6_mkspecsdir}/* +%exclude %{_qt6_mkspecsdir}/modules/qt_lib_*_private.pri ## private-devel globs %exclude %{_qt6_headerdir}/*/%{qt_version}/ %files private-devel +%{_qt6_headerdir}/QtEglFSDeviceIntegration +%{_qt6_headerdir}/QtEglFsKmsGbmSupport +%{_qt6_headerdir}/QtEglFsKmsSupport +%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate +%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate +%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate +%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake +%if 0%{?egl} +%{_qt6_libdir}/libQt6EglFsKmsSupport.prl +%{_qt6_libdir}/libQt6EglFsKmsSupport.so +%endif +%{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl +%{_qt6_libdir}/libQt6EglFSDeviceIntegration.so +%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.prl +%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so +%{_qt6_descriptionsdir}/EglFSDeviceIntegrationPrivate.json +%{_qt6_descriptionsdir}/EglFsKmsGbmSupportPrivate.json +%{_qt6_descriptionsdir}/EglFsKmsSupportPrivate.json +%{_qt6_descriptionsdir}/XcbQpaPrivate.json +%{_qt6_metatypesdir}/qt6eglfsdeviceintegrationprivate_*_metatypes.json +%{_qt6_metatypesdir}/qt6eglfskmsgbmsupportprivate_*_metatypes.json +%{_qt6_metatypesdir}/qt6eglfskmssupportprivate_*_metatypes.json +%{_qt6_metatypesdir}/qt6xcbqpaprivate_*_metatypes.json +%{_qt6_mkspecsdir}/modules/qt_lib_*_private.pri %{_qt6_headerdir}/*/%{qt_version}/ %files static +%dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate +%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake +%{_qt6_headerdir}/QtExampleIcons +%{_qt6_libdir}/libQt6ExampleIcons.a +%{_qt6_libdir}/libQt6ExampleIcons.prl +%{_qt6_descriptionsdir}/ExampleIconsPrivate.json +%dir %{_qt6_archdatadir}/objects-* +%{_qt6_archdatadir}/objects-*/ExampleIconsPrivate_resources_1/ +%{_qt6_metatypesdir}/qt6exampleiconsprivate_*_metatypes.json +%dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate +%{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/*.cmake %{_qt6_headerdir}/QtDeviceDiscoverySupport %{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a %{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl -%{_qt6_libdir}/libQt6ExampleIcons.a -%{_qt6_libdir}/libQt6ExampleIcons.prl +%{_qt6_descriptionsdir}/DeviceDiscoverySupportPrivate.json +%{_qt6_metatypesdir}/qt6devicediscoverysupportprivate_*_metatypes.json +%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate +%{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake %{_qt6_headerdir}/QtFbSupport %{_qt6_libdir}/libQt6FbSupport.*a %{_qt6_libdir}/libQt6FbSupport.prl +%{_qt6_descriptionsdir}/FbSupportPrivate.json +%{_qt6_metatypesdir}/qt6fbsupportprivate_*_metatypes.json +%dir %{_qt6_libdir}/cmake/Qt6InputSupportPrivate +%{_qt6_libdir}/cmake/Qt6InputSupportPrivate/*.cmake +%{_qt6_headerdir}/QtInputSupport %{_qt6_libdir}/libQt6InputSupport.*a %{_qt6_libdir}/libQt6InputSupport.prl +%{_qt6_descriptionsdir}/InputSupportPrivate.json +%{_qt6_metatypesdir}/qt6inputsupportprivate_*_metatypes.json +%dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate +%{_qt6_libdir}/cmake/Qt6KmsSupportPrivate/*.cmake %{_qt6_headerdir}/QtKmsSupport %{_qt6_libdir}/libQt6KmsSupport.*a %{_qt6_libdir}/libQt6KmsSupport.prl +%{_qt6_descriptionsdir}/KmsSupportPrivate.json +%{_qt6_metatypesdir}/qt6kmssupportprivate_*_metatypes.json + %if 0%{?examples} %files examples %{_qt6_examplesdir}/ @@ -869,8 +907,6 @@ make check -k ||: # Platformthemes %{_qt6_plugindir}/platformthemes/libqxdgdesktopportal.so %{_qt6_plugindir}/platformthemes/libqgtk3.so -%{_qt6_plugindir}/printsupport/libcupsprintersupport.so - %if 0%{?build_tests} %files tests @@ -878,7 +914,11 @@ make check -k ||: %endif %changelog -* Tue Dec 03 2024 Jan Grulich - 6.8.1-2 +* Thu Dec 05 2024 Jan Grulich - 6.8.1-3 +- Move more stuff into -private-devel + Resolves: RHEL-53982 + +* Tue Dec 03 2024 Jan Grulich - 6.8.1-2 - Do not install ExamplesAssetDownloader Resolves: RHEL-53982