From eb2af0955458a1fcff3727fa2c9df04f8c0100328dc90b4ebfd512b0a92cf857 Mon Sep 17 00:00:00 2001 From: Christophe Marin <christophe+obs@krop.fr> Date: Fri, 30 Jun 2023 15:16:19 +0000 Subject: [PATCH 1/2] Update build requirements OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=47 --- qt6-tools.changes | 6 ++---- qt6-tools.spec | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qt6-tools.changes b/qt6-tools.changes index 38778de..94a933c 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,9 +1,7 @@ ------------------------------------------------------------------- -Wed Jun 21 01:27:39 UTC 2023 - Christophe Marin <christophe@krop.fr> +Fri Jun 30 15:13:16 UTC 2023 - Christophe Marin <christophe@krop.fr> -- Also use llvm 15 on Leap 15.4. A new llvm version was submitted - to 15.4 which caused crashes when trying to run qdoc with an - older version. +- Update subpackages requirements ------------------------------------------------------------------- Wed May 24 07:45:44 UTC 2023 - Christophe Marin <christophe@krop.fr> diff --git a/qt6-tools.spec b/qt6-tools.spec index af5f888..de6851c 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -47,11 +47,15 @@ Source13: org.qt.assistant6.desktop Source14: linguist6.png Source99: qt6-tools-rpmlintrc # clang-devel in Leap 15 points to clang7... -%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150400 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150400 +BuildRequires: clang13-devel +%else +%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150500 BuildRequires: clang15-devel %else BuildRequires: clang-devel >= 8 %endif +%endif BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel @@ -120,6 +124,7 @@ This package contains the Qt 6 Designer Library. Summary: Qt 6 Designer libraries - Development files Requires: libQt6Designer6 = %{version} Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6OpenGL) = %{real_version} Requires: cmake(Qt6OpenGLWidgets) = %{real_version} Requires: cmake(Qt6Widgets) = %{real_version} Requires: cmake(Qt6Xml) = %{real_version} From 6036d4e3529ec2af0a2962c23b029bdec6f89b353cd3b0ae5ab78cea9ac13c30 Mon Sep 17 00:00:00 2001 From: Christophe Marin <christophe+obs@krop.fr> Date: Fri, 30 Jun 2023 18:57:32 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=48 --- qt6-tools.changes | 7 +++++++ qt6-tools.spec | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qt6-tools.changes b/qt6-tools.changes index 94a933c..8ddea31 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -3,6 +3,13 @@ Fri Jun 30 15:13:16 UTC 2023 - Christophe Marin <christophe@krop.fr> - Update subpackages requirements +------------------------------------------------------------------- +Wed Jun 21 01:27:39 UTC 2023 - Christophe Marin <christophe@krop.fr> + +- Also use llvm 15 on Leap 15.4. A new llvm version was submitted + to 15.4 which caused crashes when trying to run qdoc with an + older version. + ------------------------------------------------------------------- Wed May 24 07:45:44 UTC 2023 - Christophe Marin <christophe@krop.fr> diff --git a/qt6-tools.spec b/qt6-tools.spec index de6851c..044d733 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -47,15 +47,11 @@ Source13: org.qt.assistant6.desktop Source14: linguist6.png Source99: qt6-tools-rpmlintrc # clang-devel in Leap 15 points to clang7... -%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150400 -BuildRequires: clang13-devel -%else -%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150500 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150400 BuildRequires: clang15-devel %else BuildRequires: clang-devel >= 8 %endif -%endif BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel