This commit is contained in:
parent
ce8fa12622
commit
cac2009855
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jun 30 15:13:07 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Update subpackages requirements
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jun 29 11:13:42 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Drop patches, merged upstream:
|
||||||
|
* 0001-Ssl-Copy-the-on-demand-cert-loading-bool-from-defaul.patch
|
||||||
|
* 0001-Schannel-Reject-certificate-not-signed-by-a-configur.patch
|
||||||
|
* 0001-tabbar-fix.patch
|
||||||
|
- Replace 0001-Require-GCC-10.patch with 0001-Require-GCC-12.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jun 7 17:58:46 UTC 2023 - Jonas Kvinge <jonaski@opensuse.org>
|
Wed Jun 7 17:58:46 UTC 2023 - Jonas Kvinge <jonaski@opensuse.org>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file
|
# spec file for package qt6-base
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2023 SUSE LLC
|
||||||
#
|
#
|
||||||
@ -39,23 +39,20 @@ 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
|
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
|
Source99: qt6-base-rpmlintrc
|
||||||
# Patches 0-100 are upstream patches #
|
# Patches 0-100 are upstream patches #
|
||||||
Patch0: 0001-Schannel-Reject-certificate-not-signed-by-a-configur.patch
|
|
||||||
Patch1: 0001-Ssl-Copy-the-on-demand-cert-loading-bool-from-defaul.patch
|
|
||||||
Patch2: 0001-tabbar-fix.patch
|
|
||||||
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
|
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
|
||||||
Patch100: 0001-Tell-the-truth-about-private-API.patch
|
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
|
# 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
|
Patch101: 0001-CMake-Install-objects-files-into-ARCHDATADIR.patch
|
||||||
%if 0%{?suse_version} == 1500
|
%if 0%{?suse_version} == 1500
|
||||||
Patch102: 0001-Require-GCC-10.patch
|
Patch101: 0001-Require-GCC-12.patch
|
||||||
%endif
|
%endif
|
||||||
##
|
##
|
||||||
BuildRequires: cmake >= 3.18.3
|
BuildRequires: cmake >= 3.18.3
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
# The default GCC version in Leap 15 is too old
|
# The default GCC version in Leap 15 is too old
|
||||||
%if 0%{?suse_version} == 1500
|
%if 0%{?suse_version} == 1500
|
||||||
BuildRequires: gcc10-PIE
|
BuildRequires: gcc12-PIE
|
||||||
BuildRequires: gcc10-c++
|
BuildRequires: gcc12-c++
|
||||||
%else
|
%else
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%endif
|
%endif
|
||||||
@ -236,8 +233,8 @@ Requires: libQt6Core6 = %{version}
|
|||||||
Requires: qt6-base-common-devel = %{version}
|
Requires: qt6-base-common-devel = %{version}
|
||||||
%if 0%{?suse_version} == 1500
|
%if 0%{?suse_version} == 1500
|
||||||
# Some public classes require C++ 17 features
|
# Some public classes require C++ 17 features
|
||||||
Requires: gcc10-PIE
|
Requires: gcc12-PIE
|
||||||
Requires: gcc10-c++
|
Requires: gcc12-c++
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description -n qt6-core-devel
|
%description -n qt6-core-devel
|
||||||
@ -327,6 +324,7 @@ Requires: cmake(Qt6DeviceDiscoverySupportPrivate) = %{real_version}
|
|||||||
Requires: cmake(Qt6EglFSDeviceIntegrationPrivate) = %{real_version}
|
Requires: cmake(Qt6EglFSDeviceIntegrationPrivate) = %{real_version}
|
||||||
Requires: cmake(Qt6EglFsKmsSupportPrivate) = %{real_version}
|
Requires: cmake(Qt6EglFsKmsSupportPrivate) = %{real_version}
|
||||||
Requires: cmake(Qt6FbSupportPrivate) = %{real_version}
|
Requires: cmake(Qt6FbSupportPrivate) = %{real_version}
|
||||||
|
Requires: cmake(Qt6Gui) = %{real_version}
|
||||||
Requires: cmake(Qt6InputSupportPrivate) = %{real_version}
|
Requires: cmake(Qt6InputSupportPrivate) = %{real_version}
|
||||||
Requires: pkgconfig(xkbcommon)
|
Requires: pkgconfig(xkbcommon)
|
||||||
|
|
||||||
@ -578,8 +576,8 @@ BuildArch: noarch
|
|||||||
%description -n qt6-docs-common
|
%description -n qt6-docs-common
|
||||||
This package contains common files used for building Qt documentation.
|
This package contains common files used for building Qt documentation.
|
||||||
|
|
||||||
|
|
||||||
### Static libraries ###
|
### Static libraries ###
|
||||||
|
|
||||||
%package -n qt6-exampleicons-devel-static
|
%package -n qt6-exampleicons-devel-static
|
||||||
Summary: Qt ExampleIcons module
|
Summary: Qt ExampleIcons module
|
||||||
# TODO
|
# TODO
|
||||||
@ -636,8 +634,8 @@ Requires: qt6-platformsupport-devel-static = %{version}
|
|||||||
This package provides private headers of libQt6PlatformSupport that do not have
|
This package provides private headers of libQt6PlatformSupport that do not have
|
||||||
any ABI or API guarantees.
|
any ABI or API guarantees.
|
||||||
|
|
||||||
|
|
||||||
### Plugins ###
|
### Plugins ###
|
||||||
|
|
||||||
%package -n qt6-networkinformation-glib
|
%package -n qt6-networkinformation-glib
|
||||||
Summary: Network information for QNetworkInformation using GNetworkMonitor
|
Summary: Network information for QNetworkInformation using GNetworkMonitor
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user