Accepting request 791144 from KDE:Extra
- Add upstream patch: * 0001-Fix-build-with-Qt-5.15.patch OBS-URL: https://build.opensuse.org/request/show/791144 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gammaray?expand=0&rev=15
This commit is contained in:
commit
e0b9c6d73e
24
0001-Fix-build-with-Qt-5.15.patch
Normal file
24
0001-Fix-build-with-Qt-5.15.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From ec9fe40808e094b3ee6283256ae18f1a3bb95bb7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Volker Krause <volker.krause@kdab.com>
|
||||||
|
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 <QLayout>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QPointer>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
--
|
||||||
|
2.26.0
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 3 09:15:56 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add upstream patch:
|
||||||
|
* 0001-Fix-build-with-Qt-5.15.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Dec 7 09:53:39 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
Sat Dec 7 09:53:39 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package gammaray
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# 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
|
Patch0: Fix_icons_installation.patch
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch1: 0001-Fix-build-against-Qt-5.14.patch
|
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: binutils-devel
|
||||||
BuildRequires: cmake >= 3.1
|
BuildRequires: cmake >= 3.1
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -105,9 +107,7 @@ frameworks in Qt. Development files.
|
|||||||
-DQDOC_EXECUTABLE=%{_libqt5_bindir}/qdoc \
|
-DQDOC_EXECUTABLE=%{_libqt5_bindir}/qdoc \
|
||||||
-DQHELPGEN_EXECUTABLE=%{_libqt5_bindir}/qhelpgenerator
|
-DQHELPGEN_EXECUTABLE=%{_libqt5_bindir}/qhelpgenerator
|
||||||
|
|
||||||
# Still not available on all leap flavors
|
%cmake_build
|
||||||
# %%cmake_build
|
|
||||||
%make_jobs
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
Loading…
Reference in New Issue
Block a user