diff --git a/0001-Fix-build-with-Qt-5.15.patch b/0001-Fix-build-with-Qt-5.15.patch new file mode 100644 index 0000000..f729bd7 --- /dev/null +++ b/0001-Fix-build-with-Qt-5.15.patch @@ -0,0 +1,24 @@ +From ec9fe40808e094b3ee6283256ae18f1a3bb95bb7 Mon Sep 17 00:00:00 2001 +From: Volker Krause +Date: Wed, 18 Mar 2020 09:07:11 +0100 +Subject: [PATCH] Fix build with Qt 5.15 + +--- + plugins/widgetinspector/overlaywidget.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/widgetinspector/overlaywidget.h b/plugins/widgetinspector/overlaywidget.h +index 5e0bb1352..ca102a9ea 100644 +--- a/plugins/widgetinspector/overlaywidget.h ++++ b/plugins/widgetinspector/overlaywidget.h +@@ -30,6 +30,7 @@ + #define GAMMARAY_WIDGETINSPECTOR_OVERLAYWIDGET_H + + #include ++#include + #include + #include + +-- +2.26.0 + diff --git a/gammaray.changes b/gammaray.changes index d820773..d1ed898 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 3 09:15:56 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch: + * 0001-Fix-build-with-Qt-5.15.patch + ------------------------------------------------------------------- Sat Dec 7 09:53:39 UTC 2019 - Christophe Giboudeaux diff --git a/gammaray.spec b/gammaray.spec index 1936969..99e348c 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -1,7 +1,7 @@ # # spec file for package gammaray # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Source: https://github.com/KDAB/GammaRay/releases/download/v%{version}/% Patch0: Fix_icons_installation.patch # PATCH-FIX-UPSTREAM Patch1: 0001-Fix-build-against-Qt-5.14.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: binutils-devel BuildRequires: cmake >= 3.1 BuildRequires: doxygen @@ -105,9 +107,7 @@ frameworks in Qt. Development files. -DQDOC_EXECUTABLE=%{_libqt5_bindir}/qdoc \ -DQHELPGEN_EXECUTABLE=%{_libqt5_bindir}/qhelpgenerator -# Still not available on all leap flavors -# %%cmake_build -%make_jobs +%cmake_build %install %cmake_install