diff options
| author | Andrzej Telszewski <andrzej@telszewski.com> | 2021-04-09 16:04:39 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-04-10 17:04:36 +0700 |
| commit | b0087204328197edaf2b1cef4f2fbd921a05d0d3 (patch) | |
| tree | 0c8ecdc73b40ed703da168884fd253e51ab589c4 /office | |
| parent | 27d0fc87a9932639aaf2a5cb08f4f45db9d3f0cd (diff) | |
| download | slackbuilds-b0087204328197edaf2b1cef4f2fbd921a05d0d3.tar.gz | |
office/ghostwriter: Fix for -current.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'office')
| -rw-r--r-- | office/ghostwriter/fix-build-with-qt5.15.patch | 21 | ||||
| -rw-r--r-- | office/ghostwriter/ghostwriter.SlackBuild | 8 | ||||
| -rw-r--r-- | office/ghostwriter/ghostwriter.info | 2 |
3 files changed, 28 insertions, 3 deletions
diff --git a/office/ghostwriter/fix-build-with-qt5.15.patch b/office/ghostwriter/fix-build-with-qt5.15.patch new file mode 100644 index 0000000000..358e8bd21c --- /dev/null +++ b/office/ghostwriter/fix-build-with-qt5.15.patch @@ -0,0 +1,21 @@ +commit ecad6c28195e535ae8ea8a29a91fa14f5e39faa9 +Author: Andrzej Telszewski <andrzej@telszewski.com> +Date: Wed Apr 7 22:55:57 2021 +0200 + + Fix build error with Qt 5.15 + + Shamelessly based on upstream patch: + https://github.com/wereturtle/ghostwriter/commit/f8f4ec0a1b53d1f3e670817f051c59444851cf7f + +diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp +index 2e4a9a1..45fc3e4 100644 +--- a/src/MarkdownEditor.cpp ++++ b/src/MarkdownEditor.cpp +@@ -34,6 +34,7 @@ + #include <QUrl> + #include <QPixmap> + #include <QPainter> ++#include <QPainterPath> + #include <QFileInfo> + #include <QDir> + diff --git a/office/ghostwriter/ghostwriter.SlackBuild b/office/ghostwriter/ghostwriter.SlackBuild index 5abab5fafe..f9b6b2b7aa 100644 --- a/office/ghostwriter/ghostwriter.SlackBuild +++ b/office/ghostwriter/ghostwriter.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ghostwriter -# Copyright 2020 Andrzej Telszewski, Szczecin +# Copyright 2021 Andrzej Telszewski, Szczecin # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=ghostwriter VERSION=${VERSION:-1.8.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -67,6 +67,10 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-st,u+rwX,go-w+rX . +# Fix build error with Qt 5.15 + +cat $CWD/fix-build-with-qt5.15.patch | patch -p1 + # Adjust docs location. sed -i $PRGNAM.pro -e "s|man\.path.*$|man.path = /usr/man/man1|" diff --git a/office/ghostwriter/ghostwriter.info b/office/ghostwriter/ghostwriter.info index e2471bb7e6..cbc1933ccf 100644 --- a/office/ghostwriter/ghostwriter.info +++ b/office/ghostwriter/ghostwriter.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" MAINTAINER="Andrzej Telszewski" -EMAIL="atelszewski@gmail.com" +EMAIL="andrzej@telszewski.com" |