[gentoo-commits] repo/gentoo:master commit in: app-editors/focuswriter/, app-editors/focuswriter/files/
commit: 9f75c3a0c0983eb37c361d0c883be5550ab97cff
Author: Jimi Huotari gentoo org>
AuthorDate: Mon Apr 20 19:52:38 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 21 09:22:15 2020 +
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 000..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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: app-editors/focuswriter/, app-editors/focuswriter/files/
commit: eabe50595262f1c41a091e9427ed71070375ea83
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Nov 5 10:14:14 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Nov 5 10:14:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabe5059
app-editors/focuswriter: remove old
Package-Manager: portage-2.3.2
app-editors/focuswriter/Manifest | 3 --
...writer-1.5.6-unbundle-qtsingleapplication.patch | 36 --
app-editors/focuswriter/focuswriter-1.5.6.ebuild | 58 --
app-editors/focuswriter/focuswriter-1.5.7.ebuild | 58 --
app-editors/focuswriter/focuswriter-1.6.0.ebuild | 58 --
5 files changed, 213 deletions(-)
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 9bff930..cf921e7 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,5 +1,2 @@
DIST focuswriter-1.5.5-src.tar.bz2 5249014 SHA256
b6a2085587864b2685516d20870d9375803ccdf3472e66bf457382d028c1da0e SHA512
aed6a2e203dcf349ff7fef6caa8e7ab1dbba80da988933c06d6f4ea1ad49ad4c4546b30aaacf9373d1234cb8934daac36f00d0d7b3512d9c3fc4f1e1b273a766
WHIRLPOOL
29795304e6d6687d16d2774cd4d28d0c45382474391d7ad62fa557a134e7c5d11ba6bf81bb81df2b0fb3727b4bb32f705d8fe73a7129f44c8485cc9d8b19b2e1
-DIST focuswriter-1.5.6-src.tar.bz2 5274057 SHA256
ec22ce097ae48d46c9a5c485630a885d67b7a281ca6b760d9d494546ed284b17 SHA512
a8d53d13fc1efb385eb8d9a93cb2ebde688d0d52e7f9ba4cb72cd7181e5ab1cff046358c217e45c939ae5a7f618acfddd57eef4ca0f02e3bb046dfdf361d26b9
WHIRLPOOL
79ec3af30e86ccca46a6c07615b7183541983792f809fdda8a159bd83785f5fe799828d994c23903421dd0628c61a6aa12686826b4d56ca66f601f87f64f
-DIST focuswriter-1.5.7-src.tar.bz2 5274706 SHA256
e2ce4f2be1d76ded2de589e60e40677166e582dc8aa3657167d52deab209c92a SHA512
15bbaf2d34d6232aca50bc10daadbb8eef8aa37336a4373cde0f4b6f638a8832c4ea764a0cc670f77174df200be17ec40406921adc3266d858726a42412107bb
WHIRLPOOL
e9e30a798740deca2f13301846a915b404cc6d89b47700490d0c27a3d40efb9f69fff17eaf7079d09ed1967fdef329ef5b6f63ab58b9c15179d3e87a72e930fc
-DIST focuswriter-1.6.0-src.tar.bz2 10430720 SHA256
174bfe2e076eba3426f24362de40c399094cd480d25353fe01537ae64dede12e SHA512
60921a55bdec7985541fdc4947db879fca60b4d6475644a76cd0de6d7dc70874456c35c852a25066b06176a199fca2860866369de1a5a13e595cfc977faade75
WHIRLPOOL
313011af9e1b52d4ad333c834befabf5da494db60b93875490a70e6caaf287be526fe6fffe69d89bc984471afa0d3f864fc833aedfc0a8aa66eafe556cd7cd63
DIST focuswriter-1.6.2-src.tar.bz2 10205432 SHA256
ac77139b4c9b70d26643e5707a9db9003586a6633779dec20a5c1353602b2655 SHA512
fb665e2bb59b9b449c0b68e3e72cc51c14c6c8b779ac347176bdb521922fba233da6754db4772dbcc80d5c610fb180176ade1ec8dd29c9b004223dce73faa58a
WHIRLPOOL
3913609be7c934795b1e1a73c2a836c88bbbaf6282db0ac70bd685b52b902e7dd085172e489aec6420b37e6b7be769138051df0bb722adeac1676a66ec5e2b3f
diff --git
a/app-editors/focuswriter/files/focuswriter-1.5.6-unbundle-qtsingleapplication.patch
b/app-editors/focuswriter/files/focuswriter-1.5.6-unbundle-qtsingleapplication.patch
deleted file mode 100644
index f22f382..
---
a/app-editors/focuswriter/files/focuswriter-1.5.6-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,36 +0,0 @@
a/focuswriter.pro
-+++ b/focuswriter.pro
-@@ -90,13 +90,14 @@
- src/spelling/dictionary_provider_voikko.cpp
-
- lessThan(QT_MAJOR_VERSION, 5) {
- SOURCES += src/sdl/sound.cpp
- } else {
-+ CONFIG += qtsingleapplication
- SOURCES += src/sound.cpp
- }
- }
-
--INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip
src/spelling
-+INCLUDEPATH += src src/fileformats src/qtzip src/spelling
-
- # Specify program sources
- HEADERS += src/action_manager.h \
-@@ -155,8 +156,6 @@
- src/fileformats/rtf_tokenizer.h \
- src/fileformats/rtf_writer.h \
- src/fileformats/txt_reader.h \
-- src/qtsingleapplication/qtsingleapplication.h \
-- src/qtsingleapplication/qtlocalpeer.h \
- src/qtzip/qtzipreader.h \
- src/qtzip/qtzipwriter.h \
- src/spelling/abstract_dictionary.h \
-@@ -219,8 +218,6 @@
- src/fileformats/rtf_tokenizer.cpp \
- src/fileformats/rtf_writer.cpp \
- src/fileformats/txt_reader.cpp \
-- src/qtsingleapplication/qtsingleapplication.cpp \
-- src/qtsingleapplication/qtlocalpeer.cpp \
- src/qtzip/qtzip.cpp \
- src/spelling/dictionary_dialog.cpp \
- src/spelling/dictionary_manager.cpp \
diff --git a/app-editors/focuswriter/focuswriter-1.5.6.ebuild
b/app-editors/focuswriter/focuswriter-1.5.6.ebuild
deleted file mode 100644
index 9a92566..
--- a/app-editors/focuswriter/focuswriter-1.5.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit fdo-mime gnome2
[gentoo-commits] repo/gentoo:master commit in: app-editors/focuswriter/, app-editors/focuswriter/files/
commit: b28fd7bd5885f0d4b21349ae10465c2d2d155103
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 28 19:27:37 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 28 19:28:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28fd7bd
app-editors/focuswriter: version bump
Package-Manager: portage-2.3.0
app-editors/focuswriter/Manifest | 1 +
...writer-1.6.0-unbundle-qtsingleapplication.patch | 37 ++
app-editors/focuswriter/focuswriter-1.6.0.ebuild | 58 ++
3 files changed, 96 insertions(+)
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index d4b24a1..524203e 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,3 +1,4 @@
DIST focuswriter-1.5.5-src.tar.bz2 5249014 SHA256
b6a2085587864b2685516d20870d9375803ccdf3472e66bf457382d028c1da0e SHA512
aed6a2e203dcf349ff7fef6caa8e7ab1dbba80da988933c06d6f4ea1ad49ad4c4546b30aaacf9373d1234cb8934daac36f00d0d7b3512d9c3fc4f1e1b273a766
WHIRLPOOL
29795304e6d6687d16d2774cd4d28d0c45382474391d7ad62fa557a134e7c5d11ba6bf81bb81df2b0fb3727b4bb32f705d8fe73a7129f44c8485cc9d8b19b2e1
DIST focuswriter-1.5.6-src.tar.bz2 5274057 SHA256
ec22ce097ae48d46c9a5c485630a885d67b7a281ca6b760d9d494546ed284b17 SHA512
a8d53d13fc1efb385eb8d9a93cb2ebde688d0d52e7f9ba4cb72cd7181e5ab1cff046358c217e45c939ae5a7f618acfddd57eef4ca0f02e3bb046dfdf361d26b9
WHIRLPOOL
79ec3af30e86ccca46a6c07615b7183541983792f809fdda8a159bd83785f5fe799828d994c23903421dd0628c61a6aa12686826b4d56ca66f601f87f64f
DIST focuswriter-1.5.7-src.tar.bz2 5274706 SHA256
e2ce4f2be1d76ded2de589e60e40677166e582dc8aa3657167d52deab209c92a SHA512
15bbaf2d34d6232aca50bc10daadbb8eef8aa37336a4373cde0f4b6f638a8832c4ea764a0cc670f77174df200be17ec40406921adc3266d858726a42412107bb
WHIRLPOOL
e9e30a798740deca2f13301846a915b404cc6d89b47700490d0c27a3d40efb9f69fff17eaf7079d09ed1967fdef329ef5b6f63ab58b9c15179d3e87a72e930fc
+DIST focuswriter-1.6.0-src.tar.bz2 10430720 SHA256
174bfe2e076eba3426f24362de40c399094cd480d25353fe01537ae64dede12e SHA512
60921a55bdec7985541fdc4947db879fca60b4d6475644a76cd0de6d7dc70874456c35c852a25066b06176a199fca2860866369de1a5a13e595cfc977faade75
WHIRLPOOL
313011af9e1b52d4ad333c834befabf5da494db60b93875490a70e6caaf287be526fe6fffe69d89bc984471afa0d3f864fc833aedfc0a8aa66eafe556cd7cd63
diff --git
a/app-editors/focuswriter/files/focuswriter-1.6.0-unbundle-qtsingleapplication.patch
b/app-editors/focuswriter/files/focuswriter-1.6.0-unbundle-qtsingleapplication.patch
new file mode 100644
index ..000db83
--- /dev/null
+++
b/app-editors/focuswriter/files/focuswriter-1.6.0-unbundle-qtsingleapplication.patch
@@ -0,0 +1,37 @@
+--- a/focuswriter.pro
b/focuswriter.pro
+@@ -7,6 +7,7 @@
+
+ TEMPLATE = app
+ QT += network widgets printsupport multimedia concurrent
++CONFIG += qtsingleapplication
+ macx {
+ QT += macextras
+ }
+@@ -83,7 +84,7 @@
+ src/spelling/dictionary_provider_voikko.cpp
+ }
+
+-INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip
src/spelling
++INCLUDEPATH += src src/fileformats src/qtzip src/spelling
+
+ # Specify program sources
+ HEADERS += src/action_manager.h \
+@@ -142,8 +143,6 @@
+ src/fileformats/rtf_tokenizer.h \
+ src/fileformats/rtf_writer.h \
+ src/fileformats/txt_reader.h \
+- src/qtsingleapplication/qtsingleapplication.h \
+- src/qtsingleapplication/qtlocalpeer.h \
+ src/qtzip/qtzipreader.h \
+ src/qtzip/qtzipwriter.h \
+ src/spelling/abstract_dictionary.h \
+@@ -207,8 +206,6 @@
+ src/fileformats/rtf_tokenizer.cpp \
+ src/fileformats/rtf_writer.cpp \
+ src/fileformats/txt_reader.cpp \
+- src/qtsingleapplication/qtsingleapplication.cpp \
+- src/qtsingleapplication/qtlocalpeer.cpp \
+ src/qtzip/qtzip.cpp \
+ src/spelling/dictionary_dialog.cpp \
+ src/spelling/dictionary_manager.cpp \
diff --git a/app-editors/focuswriter/focuswriter-1.6.0.ebuild
b/app-editors/focuswriter/focuswriter-1.6.0.ebuild
new file mode 100644
index ..d3c77f6
--- /dev/null
+++ b/app-editors/focuswriter/focuswriter-1.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit fdo-mime gnome2-utils qmake-utils
+
+DESCRIPTION="A fullscreen and distraction-free word processor"
+HOMEPAGE="http://gottcode.org/focuswriter/";
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2";
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ app-text/hunspell:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsingleapplication[qt5,X]
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtconcurrent:5
+ virtual/pkgconfig
+"
+
+DOCS=( ChangeLog CRED
