From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29FAB138351 for ; Tue, 21 Apr 2020 09:22:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15782E08E5; Tue, 21 Apr 2020 09:22:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9D57E08E2 for ; Tue, 21 Apr 2020 09:22:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44BDA34F0E0 for ; Tue, 21 Apr 2020 09:22:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C12B19C for ; Tue, 21 Apr 2020 09:22:39 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587460935.9f75c3a0c0983eb37c361d0c883be5550ab97cff.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/focuswriter/, app-editors/focuswriter/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/focuswriter/Manifest app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch app-editors/focuswriter/focuswriter-1.7.5.ebuild X-VCS-Directories: app-editors/focuswriter/ app-editors/focuswriter/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9f75c3a0c0983eb37c361d0c883be5550ab97cff X-VCS-Branch: master Date: Tue, 21 Apr 2020 09:22:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c2971f5-bea6-4bc9-b4c9-aa78fc0f1f72 X-Archives-Hash: b7edf6f47b4d8d044465ca1bf1168138 commit: 9f75c3a0c0983eb37c361d0c883be5550ab97cff Author: Jimi Huotari gentoo org> AuthorDate: Mon Apr 20 19:52:38 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 21 09:22:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f75c3a0 app-editors/focuswriter: add version 1.7.5 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Jimi Huotari gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/15444 Signed-off-by: Andreas Sturmlechner gentoo.org> app-editors/focuswriter/Manifest | 1 + .../files/focuswriter-1.7.5-qt-5.15-build.patch | 26 ++++++++++++ app-editors/focuswriter/focuswriter-1.7.5.ebuild | 49 ++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest index 1ab612b3f48..a0f0a88ddf4 100644 --- a/app-editors/focuswriter/Manifest +++ b/app-editors/focuswriter/Manifest @@ -1 +1,2 @@ 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 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 00000000000..c59946f354f --- /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 +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 + #include + #include ++#include + #include + #include + #include +-- +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 00000000000..de11e682589 --- /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 +}