From e7874b8faf4a2ca38c807884b183369a046031683534b73312ab1eff79be26ab Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 8 Jun 2021 08:35:14 +0000 Subject: [PATCH 1/2] Accepting request 898231 from home:trmdi:branches:KDE:Extra Fix build issue on Tumbleweed OBS-URL: https://build.opensuse.org/request/show/898231 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=67 --- gammaray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gammaray.spec b/gammaray.spec index 91e8c6b..952035f 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -71,8 +71,11 @@ BuildRequires: cmake(VTK) = 7.1.0 %endif # Needed to build the user manual BuildRequires: libqt5-qtdoc-devel -# +# Build issue with glslang 11.4.0 +# https://github.com/KDAB/GammaRay/issues/635 +%if 0%{?suse_version} <= 1500 BuildRequires: glslang-devel +%endif BuildRequires: libqt5-qtscxml-private-headers-devel >= 5.8.0 BuildRequires: cmake(KF5SyntaxHighlighting) >= 5.28.0 BuildRequires: cmake(Qt5Scxml) >= 5.8.0 From ed0354427c281e20088ffde6197e615dd60251cff8d3235bf38886f11584ed05 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 8 Jun 2021 08:37:15 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=68 --- gammaray.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gammaray.changes b/gammaray.changes index 463f6d5..463da7d 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 8 08:36:40 UTC 2021 - Christophe Giboudeaux + +- Don't build gammaray with glslang on Tumbleweed. + The glslang 11.4.0 update broke the build. + ------------------------------------------------------------------- Mon Dec 28 02:50:33 UTC 2020 - Wang Jun