From 395fad6f58f2065aa62e1b14624c270c139df52852af21b2f9d55cd2477b229c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 5 Jun 2020 06:04:39 +0000 Subject: [PATCH] Accepting request 811602 from home:cgiboudeaux:branches:editors - Add patch to fix build with Qt 5.15: * 0001-Fix-build-with-Qt-5.15.patch OBS-URL: https://build.opensuse.org/request/show/811602 OBS-URL: https://build.opensuse.org/package/show/editors/ghostwriter?expand=0&rev=49 --- 0001-Fix-build-with-Qt-5.15.patch | 24 ++++++++++++++++++++++++ ghostwriter.changes | 6 ++++++ ghostwriter.spec | 6 ++++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 0001-Fix-build-with-Qt-5.15.patch 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..b4e945f --- /dev/null +++ b/0001-Fix-build-with-Qt-5.15.patch @@ -0,0 +1,24 @@ +From f7e27056d8c935c353de29e7f45a6b04a5be5b2e Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Thu, 4 Jun 2020 19:03:01 +0200 +Subject: [PATCH] Fix build with Qt 5.15 + +--- + src/MarkdownEditor.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp +index 2e4a9a1..39ddadb 100644 +--- a/src/MarkdownEditor.cpp ++++ b/src/MarkdownEditor.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "ColorHelper.h" + #include "MarkdownEditor.h" +-- +2.26.2 + diff --git a/ghostwriter.changes b/ghostwriter.changes index c3b3e6e..086641e 100644 --- a/ghostwriter.changes +++ b/ghostwriter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 4 17:03:38 UTC 2020 - Christophe Giboudeaux + +- Add patch to fix build with Qt 5.15: + * 0001-Fix-build-with-Qt-5.15.patch + ------------------------------------------------------------------- Mon Feb 24 08:19:31 UTC 2020 - Sebastien CHAVAUX diff --git a/ghostwriter.spec b/ghostwriter.spec index f50cbce..9c71ae3 100644 --- a/ghostwriter.spec +++ b/ghostwriter.spec @@ -1,7 +1,7 @@ # # spec file for package ghostwriter # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -24,6 +24,8 @@ License: GPL-3.0-or-later Group: Productivity/Text/Editors URL: https://wereturtle.github.io/ghostwriter Source: https://github.com/wereturtle/ghostwriter/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist @@ -58,7 +60,7 @@ provides a relaxing, distraction-free writing environment. %lang_package %prep -%autosetup +%autosetup -p1 %build lrelease-qt5 %{name}.pro