gentoo resync : 25.04.2020

3 files changed, 78 insertions, 0 deletions

diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index ea5bf6fbb325..4e5c38b28d3c 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,4 +1,7 @@
 AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
+AUX focuswriter-1.7.5-qt-5.15-build.patch 617 BLAKE2B 447181cde3df87ab181982afd45f1f2472440324d0dfe58de81f37cb07683923544943c755752e6562f0f566f273b2858bef17c0d787decd70431025b4613d29 SHA512 2426de757e0b26378c21032be5127fe9468e7fdeec2d287b2a0be3c830980c4d1087f1c297e7ecdc2863a5c407cb5f7ddae1293e1ad602d3726ea26ea5f02db0
 DIST focuswriter-1.7.2-src.tar.bz2 10310759 BLAKE2B 92f0cd0ec2bb29c41f2c98e52dcb2187a70bc1c0641aed521b3d577302937cf6560f3adf422372019c8726ca29a9978b5b4d9e56e4c0c26a65fdc5d6aa0b7767 SHA512 195ddf6579aa00af120644ef1ddc88a6aaf0a6003feefb7b3dd3ca72c4bb17440553a171ad469f2d25d90416fc0e1a03f1b9d43e3b5790dac180f18b4ed657bf
+DIST focuswriter-1.7.5-src.tar.bz2 10311298 BLAKE2B c495aced12e2e4deea1b602a0d1e2f97adbf2c91edf94302978fbeca9e33807e20fc05db2758ee05fc4c54ee7281cca10b6c01b70f2859899a6b227235e7aed0 SHA512 b9b533180160c5395eee8b921cf05f56e13eb48db402d352359854b419bd5367f21bac1b07fb80d4bb59ab019a7051bb9aeb1321e35a8f9d250a9584475def8b
 EBUILD focuswriter-1.7.2.ebuild 914 BLAKE2B cefbcd3addb8d18a80e419984d003275b16c3c6d5ba6bfd552687e540d846e7a075f7bb0f3d6fa6ff91bed484676c2370ce5275cde33fc0b6cc0030b477fdead SHA512 e835fa1bb106885f9abcf733363e4b463f60bd8d315b00b7f46b4c71bc6d2892e4630812209d471f8360e328f3a806b1b2c942bae49b1c511a9ec57138f6b5ea
+EBUILD focuswriter-1.7.5.ebuild 964 BLAKE2B 10be3ed8961f4c9fcc11e624dc263007c86c2831207adf6cefae23f992e237a0b54b4cb705740bb3c64aa00b43628161fddb098de086d3baade772cb573ddc81 SHA512 2c410cee655a68e181821018eb36e78a3bf76639920c310ec64e6f81d38535a5cb9e84a501ac82bde67a9d05e8e5fd627e902efe61918e5a817f9d1c40148d3c
 MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch b/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch
new file mode 100644
index 000000000000..c59946f354fa
--- /dev/null
+++ b/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch
@@ -0,0 +1,26 @@
+From 026fb9b1fbfa8040815ac524b6002f93b6411d45 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Mon, 20 Apr 2020 22:58:48 +0300
+Subject: [PATCH] Fix build against Qt 5.15.
+
+Due to a change in Qt, 'QPainterPath' needs to be explicitly
+included.
+---
+ src/theme.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/theme.cpp b/src/theme.cpp
+index 4708338..59551ea 100644
+--- a/src/theme.cpp
++++ b/src/theme.cpp
+@@ -27,6 +27,7 @@
+ #include <QFile>
+ #include <QImageReader>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSettings>
+ #include <QTextEdit>
+ #include <QUuid>
+-- 
+2.26.1
+
diff --git a/app-editors/focuswriter/focuswriter-1.7.5.ebuild b/app-editors/focuswriter/focuswriter-1.7.5.ebuild
new file mode 100644
index 000000000000..de11e6825890
--- /dev/null
+++ b/app-editors/focuswriter/focuswriter-1.7.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Fullscreen and distraction-free word processor"
+HOMEPAGE="https://gottcode.org/focuswriter/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-text/hunspell:=
+	>=dev-qt/qtcore-5.11:5
+	>=dev-qt/qtgui-5.11:5
+	>=dev-qt/qtmultimedia-5.11:5
+	>=dev-qt/qtprintsupport-5.11:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	>=dev-qt/qtwidgets-5.11:5
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+DOCS=( ChangeLog CREDITS README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch"
+	"${FILESDIR}/${PN}-1.7.5-qt-5.15-build.patch"
+)
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}