Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-base for openSUSE:Factory checked in at 2023-05-28 19:21:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-base (Old) and /work/SRC/openSUSE:Factory/.qt6-base.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-base" Sun May 28 19:21:46 2023 rev:32 rq:1089079 version:6.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-base/qt6-base.changes 2023-04-29 17:28:21.430596583 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-base.new.1533/qt6-base.changes 2023-05-28 19:21:52.648617485 +0200 @@ -1,0 +2,11 @@ +Wed May 24 07:45:34 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.5.1 + * https://www.qt.io/blog/qt-6.5.1-released +- Drop patches, merged upstream: + * 0001-QApplication-Fix-DEPRECATED_VERSION-for-setActiveWin.patch + * 0001-QVariant-Fix-support-for-metatypes-created-by-Qt-6.5.patch +- Add patch + * 0001-CMake-Install-objects-files-into-ARCHDATADIR.patch + +------------------------------------------------------------------- Old: ---- 0001-QApplication-Fix-DEPRECATED_VERSION-for-setActiveWin.patch 0001-QVariant-Fix-support-for-metatypes-created-by-Qt-6.5.patch qtbase-everywhere-src-6.5.0.tar.xz New: ---- 0001-CMake-Install-objects-files-into-ARCHDATADIR.patch qtbase-everywhere-src-6.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-base.spec ++++++ --- /var/tmp/diff_new_pack.V6QNwL/_old 2023-05-28 19:21:54.516628602 +0200 +++ /var/tmp/diff_new_pack.V6QNwL/_new 2023-05-28 19:21:54.520628626 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.0 +%define real_version 6.5.1 %define short_version 6.5 %define tar_name qtbase-everywhere-src %define tar_suffix %{nil} @@ -30,7 +30,7 @@ %global with_gles 1 %endif Name: qt6-base%{?pkg_suffix} -Version: 6.5.0 +Version: 6.5.1 Release: 0 Summary: Qt 6 core components (Core, Gui, Widgets, Network...) # Legal: qtpaths is BSD-3-Clause @@ -39,12 +39,12 @@ Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-base-rpmlintrc # Patches 0-100 are upstream patches # -Patch0: 0001-QApplication-Fix-DEPRECATED_VERSION-for-setActiveWin.patch -Patch1: 0001-QVariant-Fix-support-for-metatypes-created-by-Qt-6.5.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: 0001-Tell-the-truth-about-private-API.patch +# No need to pollute the library dir with object files, install them in the qt6 subfolder +Patch101: 0001-CMake-Install-objects-files-into-ARCHDATADIR.patch %if 0%{?suse_version} == 1500 -Patch101: 0001-Require-GCC-10.patch +Patch102: 0001-Require-GCC-10.patch %endif ## BuildRequires: cmake >= 3.18.3 @@ -577,6 +577,15 @@ ### Static libraries ### +%package -n qt6-exampleicons-devel-static +Summary: Qt ExampleIcons module +# TODO +Requires: qt6-core-private-devel = %{version} +Requires: qt6-gui-private-devel = %{version} + +%description -n qt6-exampleicons-devel-static +Qt icon library for examples. This private library can be used by Qt examples. + %package -n qt6-kmssupport-devel-static Summary: Qt KMSSupport module Requires: qt6-core-private-devel = %{version} @@ -728,6 +737,10 @@ This is a meta package, it does not contain any file EOF +# Work around an issue with zstd CMake files (boo#1211566) +# TODO: Remove when the issue is fixed +sed -i '/zstd CONFIG/d' cmake/FindWrapZSTD.cmake + %build %define _lto_cflags %{nil} @@ -1154,6 +1167,19 @@ ### Static libraries ### +%files -n qt6-exampleicons-devel-static +%doc src/assets/icons/README +%{_qt6_cmakedir}/Qt6ExampleIconsPrivate/ +%{_qt6_descriptionsdir}/ExampleIconsPrivate.json +%{_qt6_includedir}/QtExampleIcons/ +%{_qt6_libdir}/libQt6ExampleIcons.a +%{_qt6_libdir}/libQt6ExampleIcons.prl +# There's no mistake, this folder needs to be installed +# These are CMake objects files which are not part of any library +%dir %{_qt6_archdatadir}/objects-RelWithDebInfo +%{_qt6_archdatadir}/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/ +%{_qt6_metatypesdir}/qt6exampleiconsprivate_*_metatypes.json + %files -n qt6-kmssupport-devel-static %{_qt6_cmakedir}/Qt6KmsSupportPrivate/ %{_qt6_descriptionsdir}/KmsSupportPrivate.json ++++++ 0001-CMake-Install-objects-files-into-ARCHDATADIR.patch ++++++ >From 4e517492a03b6c0b710a2d9a3df05922ac233992 Mon Sep 17 00:00:00 2001 From: Christophe Marin <[email protected]> Date: Wed, 24 May 2023 11:23:39 +0200 Subject: [PATCH] CMake: Install objects files into 'ARCHDATADIR' Change-Id: I917a9ef4d83f93eb5c3e47964bf1814d1b53fdab --- cmake/QtResourceHelpers.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake index 2df1fed50f..e4f34b5ff1 100644 --- a/cmake/QtResourceHelpers.cmake +++ b/cmake/QtResourceHelpers.cmake @@ -38,7 +38,7 @@ function(qt_internal_add_resource target resourceName) if (out_targets) qt_install(TARGETS ${out_targets} EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets" - DESTINATION "${INSTALL_LIBDIR}" + DESTINATION "${INSTALL_ARCHDATADIR}" ) qt_internal_add_targets_to_additional_targets_export_file( TARGETS ${out_targets} @@ -47,7 +47,7 @@ function(qt_internal_add_resource target resourceName) qt_internal_install_resource_pdb_files("${out_targets}") qt_internal_record_rcc_object_files("${target}" "${out_targets}" - INSTALL_DIRECTORY "${INSTALL_LIBDIR}") + INSTALL_DIRECTORY "${INSTALL_ARCHDATADIR}") endif() if (arg_OUTPUT_TARGETS) @@ -77,7 +77,7 @@ function(qt_internal_record_rcc_object_files target resource_targets) # It's comprised of thee following path parts: # # part (1) INSTALL_DIRECTORY. - # A usual value is '${INSTALL_LIBDIR}/' for libraries + # A usual value is '${INSTALL_ARCHDATADIR}/' for libraries # and '${INSTALL_QMLDIR}/foo/bar/' for qml plugin resources. # # part (2) the value computed by CMake's computeInstallObjectDir comprised of an @@ -128,6 +128,6 @@ function(qt_internal_install_resource_pdb_files objlib_targets) _qt_resource_generated_cpp_relative_path) get_filename_component(rel_obj_file_dir "${generated_cpp_file_relative_path}" DIRECTORY) qt_internal_install_pdb_files(${target} - "${INSTALL_LIBDIR}/objects-$<CONFIG>/${target}/${rel_obj_file_dir}") + "${INSTALL_ARCHDATADIR}/objects-$<CONFIG>/${target}/${rel_obj_file_dir}") endforeach() endfunction() -- 2.40.1 ++++++ qt6-base-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.V6QNwL/_old 2023-05-28 19:21:54.584629007 +0200 +++ /var/tmp/diff_new_pack.V6QNwL/_new 2023-05-28 19:21:54.588629030 +0200 @@ -8,3 +8,6 @@ # Only libraries used at link time are guaranteed to work addFilter("shlib-fixed-dependency .*") +# libQt6ExampleIcons.a only contains embedded icons, there's nothing to extract +addFilter("lto-no-text-in-archive .*libQt6ExampleIcons.a") + ++++++ qtbase-everywhere-src-6.5.0.tar.xz -> qtbase-everywhere-src-6.5.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-base/qtbase-everywhere-src-6.5.0.tar.xz /work/SRC/openSUSE:Factory/.qt6-base.new.1533/qtbase-everywhere-src-6.5.1.tar.xz differ: char 26, line 1
