diff --git a/0001-CMake-Don-t-hardcode-the-library-directory-name.patch b/0001-CMake-Don-t-hardcode-the-library-directory-name.patch new file mode 100644 index 0000000..1d015b5 --- /dev/null +++ b/0001-CMake-Don-t-hardcode-the-library-directory-name.patch @@ -0,0 +1,30 @@ +From 84ceaac19b17888059f063acc1934237c9d4727f Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +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 + diff --git a/_constraints b/_constraints index f120ad7..4ad9428 100644 --- a/_constraints +++ b/_constraints @@ -2,11 +2,36 @@ - 15 + 12 - 4000 + 4 4 + + + ppc64 + ppc64le + + + + 5 + + + + + + + qt6-base:docs + + + + 3 + + + 2 + + + diff --git a/qt6-base.changes b/qt6-base.changes index 0cad52b..fbaa250 100644 --- a/qt6-base.changes +++ b/qt6-base.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Apr 8 11:56:51 UTC 2022 - Christophe Giboudeaux + +- Update to 6.3.0: + * https://www.qt.io/blog/qt-6.3-released + +------------------------------------------------------------------- +Tue Mar 29 12:28:29 UTC 2022 - Christophe Giboudeaux + +- Update to 6.3.0-rc +- Add patch: + * 0001-CMake-Don-t-hardcode-the-library-directory-name.patch +- Update build constraints + ------------------------------------------------------------------- Mon Mar 21 08:46:52 UTC 2022 - Christophe Giboudeaux diff --git a/qt6-base.spec b/qt6-base.spec index 380b887..f61465d 100644 --- a/qt6-base.spec +++ b/qt6-base.spec @@ -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 @@ URL: https://www.qt.io 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 @@ any ABI or API guarantees. ### 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 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit %{_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 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit ### 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 diff --git a/qtbase-everywhere-src-6.2.4.tar.xz b/qtbase-everywhere-src-6.2.4.tar.xz deleted file mode 100644 index 88ba235..0000000 --- a/qtbase-everywhere-src-6.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634 -size 46541252 diff --git a/qtbase-everywhere-src-6.3.0.tar.xz b/qtbase-everywhere-src-6.3.0.tar.xz new file mode 100644 index 0000000..7935af1 --- /dev/null +++ b/qtbase-everywhere-src-6.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 +size 47004304