Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/focuswriter/files/, app-editors/focuswriter/
Date: Sat, 25 Apr 2020 19:30:25
Message-Id: 1587842995.5b706fc4ce6cd068a71b13a1df3a6a581e0309a6.asturm@gentoo
1 commit: 5b706fc4ce6cd068a71b13a1df3a6a581e0309a6
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 21 15:15:09 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 25 19:29:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b706fc4
7
8 app-editors/focuswriter: remove version 1.7.5
9
10 Also drop the now unneeded patch.
11
12 Package-Manager: Portage-2.3.99, Repoman-2.3.22
13 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 app-editors/focuswriter/Manifest | 1 -
17 .../files/focuswriter-1.7.5-qt-5.15-build.patch | 26 ------------
18 app-editors/focuswriter/focuswriter-1.7.5.ebuild | 49 ----------------------
19 3 files changed, 76 deletions(-)
20
21 diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
22 index f19139a7a88..f1d1561f5d1 100644
23 --- a/app-editors/focuswriter/Manifest
24 +++ b/app-editors/focuswriter/Manifest
25 @@ -1,3 +1,2 @@
26 DIST focuswriter-1.7.2-src.tar.bz2 10310759 BLAKE2B 92f0cd0ec2bb29c41f2c98e52dcb2187a70bc1c0641aed521b3d577302937cf6560f3adf422372019c8726ca29a9978b5b4d9e56e4c0c26a65fdc5d6aa0b7767 SHA512 195ddf6579aa00af120644ef1ddc88a6aaf0a6003feefb7b3dd3ca72c4bb17440553a171ad469f2d25d90416fc0e1a03f1b9d43e3b5790dac180f18b4ed657bf
27 -DIST focuswriter-1.7.5-src.tar.bz2 10311298 BLAKE2B c495aced12e2e4deea1b602a0d1e2f97adbf2c91edf94302978fbeca9e33807e20fc05db2758ee05fc4c54ee7281cca10b6c01b70f2859899a6b227235e7aed0 SHA512 b9b533180160c5395eee8b921cf05f56e13eb48db402d352359854b419bd5367f21bac1b07fb80d4bb59ab019a7051bb9aeb1321e35a8f9d250a9584475def8b
28 DIST focuswriter-1.7.6-src.tar.bz2 10311965 BLAKE2B a1f1627df988d7660f6b90cf984d725ff2366754f01b0ce78e23756a98c716acafa8b4076f4749f117cba6eaabcb6ec61516c032a7ae770eb1b06466a358595e SHA512 45e0bc9b20c73b260aa42dcc9ee79515d3ad95d4c9586f60ab75fb404f73c7443484f238b3705ba3224b852a0d9b8b8db17d9145aebb77513f8597a01ab01d3b
29
30 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
31 deleted file mode 100644
32 index c59946f354f..00000000000
33 --- a/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch
34 +++ /dev/null
35 @@ -1,26 +0,0 @@
36 -From 026fb9b1fbfa8040815ac524b6002f93b6411d45 Mon Sep 17 00:00:00 2001
37 -From: Jimi Huotari <chiitoo@g.o>
38 -Date: Mon, 20 Apr 2020 22:58:48 +0300
39 -Subject: [PATCH] Fix build against Qt 5.15.
40 -
41 -Due to a change in Qt, 'QPainterPath' needs to be explicitly
42 -included.
43 ----
44 - src/theme.cpp | 1 +
45 - 1 file changed, 1 insertion(+)
46 -
47 -diff --git a/src/theme.cpp b/src/theme.cpp
48 -index 4708338..59551ea 100644
49 ---- a/src/theme.cpp
50 -+++ b/src/theme.cpp
51 -@@ -27,6 +27,7 @@
52 - #include <QFile>
53 - #include <QImageReader>
54 - #include <QPainter>
55 -+#include <QPainterPath>
56 - #include <QSettings>
57 - #include <QTextEdit>
58 - #include <QUuid>
59 ---
60 -2.26.1
61 -
62
63 diff --git a/app-editors/focuswriter/focuswriter-1.7.5.ebuild b/app-editors/focuswriter/focuswriter-1.7.5.ebuild
64 deleted file mode 100644
65 index de11e682589..00000000000
66 --- a/app-editors/focuswriter/focuswriter-1.7.5.ebuild
67 +++ /dev/null
68 @@ -1,49 +0,0 @@
69 -# Copyright 1999-2020 Gentoo Authors
70 -# Distributed under the terms of the GNU General Public License v2
71 -
72 -EAPI=7
73 -
74 -inherit qmake-utils xdg
75 -
76 -DESCRIPTION="Fullscreen and distraction-free word processor"
77 -HOMEPAGE="https://gottcode.org/focuswriter/"
78 -SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
79 -
80 -LICENSE="GPL-3 LGPL-3"
81 -SLOT="0"
82 -KEYWORDS="~amd64 ~x86"
83 -IUSE=""
84 -
85 -BDEPEND="
86 - dev-qt/linguist-tools:5
87 - virtual/pkgconfig
88 -"
89 -RDEPEND="
90 - app-text/hunspell:=
91 - >=dev-qt/qtcore-5.11:5
92 - >=dev-qt/qtgui-5.11:5
93 - >=dev-qt/qtmultimedia-5.11:5
94 - >=dev-qt/qtprintsupport-5.11:5
95 - dev-qt/qtsingleapplication[qt5(+),X]
96 - >=dev-qt/qtwidgets-5.11:5
97 - sys-libs/zlib
98 -"
99 -DEPEND="${RDEPEND}
100 - dev-qt/qtconcurrent:5
101 -"
102 -
103 -DOCS=( ChangeLog CREDITS README )
104 -
105 -PATCHES=(
106 - "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch"
107 - "${FILESDIR}/${PN}-1.7.5-qt-5.15-build.patch"
108 -)
109 -
110 -src_configure() {
111 - eqmake5 PREFIX="${EPREFIX}"/usr
112 -}
113 -
114 -src_install() {
115 - emake INSTALL_ROOT="${D}" install
116 - einstalldocs
117 -}