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 2022-04-20 16:55:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-base (Old) and /work/SRC/openSUSE:Factory/.qt6-base.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-base" Wed Apr 20 16:55:24 2022 rev:18 rq:970785 version:6.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-base/qt6-base.changes 2022-03-29 18:14:39.423086099 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-base.new.1941/qt6-base.changes 2022-04-20 16:55:34.290524490 +0200 @@ -1,0 +2,14 @@ +Fri Apr 8 11:56:51 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.3.0: + * https://www.qt.io/blog/qt-6.3-released + +------------------------------------------------------------------- +Tue Mar 29 12:28:29 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.3.0-rc +- Add patch: + * 0001-CMake-Don-t-hardcode-the-library-directory-name.patch +- Update build constraints + +------------------------------------------------------------------- Old: ---- qtbase-everywhere-src-6.2.4.tar.xz New: ---- 0001-CMake-Don-t-hardcode-the-library-directory-name.patch qtbase-everywhere-src-6.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-base.spec ++++++ --- /var/tmp/diff_new_pack.wcwyBw/_old 2022-04-20 16:55:35.866525962 +0200 +++ /var/tmp/diff_new_pack.wcwyBw/_new 2022-04-20 16:55:35.870525966 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt6-base # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define real_version 6.2.4 -%define short_version 6.2 +%define real_version 6.3.0 +%define short_version 6.3 %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.2.4 +Version: 6.3.0 Release: 0 Summary: Qt 6 core components (Core, Gui, Widgets, Network...) # Legal: qtpaths is BSD-3-Clause @@ -39,6 +39,7 @@ 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-CMake-Don-t-hardcode-the-library-directory-name.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: 0001-Tell-the-truth-about-private-API.patch %if 0%{?suse_version} == 1500 @@ -621,6 +622,13 @@ ### Plugins ### +%package -n qt6-networkinformation-glib +Summary: Network information for QNetworkInformation using GNetworkMonitor + +%description -n qt6-networkinformation-glib +Plugin using GNetworkMonitor to get network information such as the +reachability, media type... + %package -n qt6-networkinformation-nm Summary: Network information for QNetworkInformation # Renamed in Qt 6.2 @@ -911,6 +919,7 @@ %{_qt6_libdir}/libQt6Core.so %{_qt6_metatypesdir}/qt6core_*_metatypes.json %{_qt6_mkspecsdir}/modules/qt_lib_core.pri +# workaround for boo#1195368, QTBUG-100370 %{_qt6_mkspecsdir}/modules/qt_lib_core_private.pri %exclude %{_qt6_includedir}/QtCore/%{real_version} @@ -1192,6 +1201,10 @@ ### Plugins ### +%files -n qt6-networkinformation-glib +%dir %{_qt6_pluginsdir}/networkinformation/ +%{_qt6_pluginsdir}/networkinformation/libqglib.so + %files -n qt6-networkinformation-nm %dir %{_qt6_pluginsdir}/networkinformation/ %{_qt6_pluginsdir}/networkinformation/libqnetworkmanager.so ++++++ 0001-CMake-Don-t-hardcode-the-library-directory-name.patch ++++++ >From 84ceaac19b17888059f063acc1934237c9d4727f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Thu, 24 Mar 2022 16:21:21 +0100 Subject: [PATCH] CMake: Don't hardcode the library directory name Using INSTALL_LIBDIR is the only reliable way to get the library install directory. Change-Id: Ib8c4fb8b4d339c63209393d7fdb3d1c3425b03a4 Amends: d1c56073b4c Pick-to: 6.2 6.3 --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index a515fcd43d..c1108f583b 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -806,7 +806,7 @@ macro(qt_examples_build_begin) if(NOT QT_IS_EXTERNAL_EXAMPLES_BUILD OR NOT __qt_all_examples_ported_to_external_projects) qt_internal_set_up_build_dir_package_paths() list(APPEND CMAKE_FIND_ROOT_PATH "${QT_BUILD_DIR}") - list(APPEND QT_EXAMPLES_CMAKE_PREFIX_PATH "${QT_BUILD_DIR}/lib/cmake") + list(APPEND QT_EXAMPLES_CMAKE_PREFIX_PATH "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/cmake") endif() # Because CMAKE_INSTALL_RPATH is empty by default in the repo project, examples need to have -- 2.35.1 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.wcwyBw/_old 2022-04-20 16:55:35.914526007 +0200 +++ /var/tmp/diff_new_pack.wcwyBw/_new 2022-04-20 16:55:35.918526011 +0200 @@ -2,12 +2,37 @@ <constraints> <hardware> <disk> - <size unit="G">15</size> + <size unit="G">12</size> </disk> <memory> - <size unit="M">4000</size> + <size unit="G">4</size> </memory> <processors>4</processors> </hardware> + <overwrite> + <conditions> + <arch>ppc64</arch> + <arch>ppc64le</arch> + </conditions> + <hardware> + <memory> + <size unit="G">5</size> + </memory> + </hardware> + </overwrite> + <!-- relax constraints for qt6-base:docs --> + <overwrite> + <conditions> + <package>qt6-base:docs</package> + </conditions> + <hardware> + <disk> + <size unit="G">3</size> + </disk> + <memory> + <size unit="G">2</size> + </memory> + </hardware> + </overwrite> </constraints> ++++++ qtbase-everywhere-src-6.2.4.tar.xz -> qtbase-everywhere-src-6.3.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-base/qtbase-everywhere-src-6.2.4.tar.xz /work/SRC/openSUSE:Factory/.qt6-base.new.1941/qtbase-everywhere-src-6.3.0.tar.xz differ: char 26, line 1
