diff options
| author | Jakob Gahde | 2020-06-09 10:50:59 +0200 |
|---|---|---|
| committer | Jakob Gahde | 2020-06-09 10:50:59 +0200 |
| commit | 70007a18ed4cd07d32818486bda8d0d793836a94 (patch) | |
| tree | 83db473f80a2d1d9a4a96c495b4d530f91634bef | |
| parent | ec1aa300a68667de6504ea9cdb7c3ec5e05dfc36 (diff) | |
| download | aur-ghostwriter.tar.gz | |
ghostwriter 1.8.1-2: Fix build failure with recently released Qt 5.15
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | qt-5.15.patch | 11 |
3 files changed, 26 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = ghostwriter pkgdesc = A cross-platform, aesthetic, distraction-free Markdown editor pkgver = 1.8.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/wereturtle/ghostwriter arch = i686 arch = x86_64 @@ -14,7 +14,9 @@ pkgbase = ghostwriter optdepends = pandoc: For Pandoc supported Markdown flavors and export to various formats optdepends = cmark: For processing and rendering CommonMark source = ghostwriter-1.8.1.tar.gz::https://github.com/wereturtle/ghostwriter/archive/v1.8.1.tar.gz + source = qt-5.15.patch sha512sums = 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521 + sha512sums = 3f62e61560624131088c68ed3b55e68b29c2e747a7db8f7b9b9680df3db780bf9639ff8b630a085a9eace0cbf2322a6b458bd739d872453a6193767bebd1340c pkgname = ghostwriter @@ -5,7 +5,7 @@ pkgname=ghostwriter pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform, aesthetic, distraction-free Markdown editor" arch=('i686' 'x86_64') url="https://github.com/wereturtle/ghostwriter" @@ -15,8 +15,17 @@ makedepends=('qt5-tools') optdepends=('multimarkdown: For alternative converter, superset of Markdown with various output formats' 'pandoc: For Pandoc supported Markdown flavors and export to various formats' 'cmark: For processing and rendering CommonMark') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/wereturtle/ghostwriter/archive/v${pkgver}.tar.gz") -sha512sums=('9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/wereturtle/ghostwriter/archive/v${pkgver}.tar.gz" + "qt-5.15.patch") +sha512sums=('9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521' + '3f62e61560624131088c68ed3b55e68b29c2e747a7db8f7b9b9680df3db780bf9639ff8b630a085a9eace0cbf2322a6b458bd739d872453a6193767bebd1340c') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Backport of https://github.com/wereturtle/ghostwriter/pull/519 + patch -Np1 < "${srcdir}/qt-5.15.patch" +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/qt-5.15.patch b/qt-5.15.patch new file mode 100644 index 000000000000..a2eb199233ee --- /dev/null +++ b/qt-5.15.patch @@ -0,0 +1,11 @@ +diff -aur package.pristine/src/MarkdownEditor.cpp package.new/src/MarkdownEditor.cpp +--- package.pristine/src/MarkdownEditor.cpp 2020-02-23 01:49:46.000000000 +0100 ++++ package.new/src/MarkdownEditor.cpp 2020-06-09 10:45:40.380449821 +0200 +@@ -34,6 +34,7 @@ + #include <QUrl> + #include <QPixmap> + #include <QPainter> ++#include <QPainterPath> + #include <QFileInfo> + #include <QDir> + |