From 7dab7166fece9d376c8e0b967a02be5bd3f79c3f Mon Sep 17 00:00:00 2001
From: khallebal <khallebal@gmail.com>
Date: Sat, 12 Jan 2019 19:26:31 +0100
Subject: [PATCH] FocusWriter: bump version+drop patchset (#3553)

---
 ...1.6.15.recipe => focuswriter-1.7.1.recipe} |  9 +---
 .../patches/focuswriter-1.6.15.patchset       | 50 -------------------
 2 files changed, 2 insertions(+), 57 deletions(-)
 rename app-editors/focuswriter/{focuswriter-1.6.15.recipe => focuswriter-1.7.1.recipe} (86%)
 delete mode 100644 app-editors/focuswriter/patches/focuswriter-1.6.15.patchset

diff --git a/app-editors/focuswriter/focuswriter-1.6.15.recipe b/app-editors/focuswriter/focuswriter-1.7.1.recipe
similarity index 86%
rename from app-editors/focuswriter/focuswriter-1.6.15.recipe
rename to app-editors/focuswriter/focuswriter-1.7.1.recipe
index 9a976ab50..3e261a1ac 100644
--- a/app-editors/focuswriter/focuswriter-1.6.15.recipe
+++ b/app-editors/focuswriter/focuswriter-1.7.1.recipe
@@ -9,8 +9,7 @@ COPYRIGHT="2008-2018 Graeme Gott"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/gottcode/focuswriter/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="167be0b4e58b4015f74c50d5cc0362cd286fd21fb972d8f74de7c683ae5cb381"
-PATCHES="focuswriter-$portVersion.patchset"
+CHECKSUM_SHA256="172c4dd264caba05121e9db3ca6eb3d4f2c41e6d956670792e213a243d5ddab6"
 ADDITIONAL_FILES="focuswriter.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -62,12 +61,8 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $manDir
 	make install
-	mv $appsDir/FocusWriter/bin/FocusWriter $appsDir/FocusWriter
-	mv $appsDir/FocusWriter/share/man/* $manDir/man1
-	rm -rf $appsDir/FocusWriter/bin
-	rm -rf $appsDir/FocusWriter/share/{icons,applications,man,metainfo,pixmaps}
+
 	local APP_SIGNATURE="application/x-vnd-gottcode.focuswriter"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
diff --git a/app-editors/focuswriter/patches/focuswriter-1.6.15.patchset b/app-editors/focuswriter/patches/focuswriter-1.6.15.patchset
deleted file mode 100644
index c52df9336..000000000
--- a/app-editors/focuswriter/patches/focuswriter-1.6.15.patchset
+++ /dev/null
@@ -1,50 +0,0 @@
-From a0867c0f87ca6d4eb5797559299428d35ac4150b Mon Sep 17 00:00:00 2001
-From: Khaled Berraoui <khallebal@gmail.com>
-Date: Fri, 31 Aug 2018 16:27:18 +0100
-Subject:   Disable qtsingleapplication
-
-
-diff --git a/focuswriter.pro b/focuswriter.pro
-index 31c7315..6e7ab75 100644
---- a/focuswriter.pro
-+++ b/focuswriter.pro
-@@ -38,7 +38,7 @@ VERSION = 1.6.15
- DEFINES += VERSIONSTR=\\\"$${VERSION}\\\"
- 
- # Set program name
--unix: !macx {
-+unix: !macx: !haiku {
- 	TARGET = focuswriter
- } else {
- 	TARGET = FocusWriter
-diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/qtsingleapplication/qtsingleapplication.cpp
-index d0fb15d..189cd8c 100644
---- a/src/qtsingleapplication/qtsingleapplication.cpp
-+++ b/src/qtsingleapplication/qtsingleapplication.cpp
-@@ -239,7 +239,11 @@ QtSingleApplication::QtSingleApplication(Display* dpy, const QString &appId, int
- 
- bool QtSingleApplication::isRunning()
- {
-+#ifdef Q_OS_HAIKU
-+	return false;
-+#else
-     return peer->isClient();
-+#endif
- }
- 
- 
-@@ -258,7 +262,11 @@ bool QtSingleApplication::isRunning()
- */
- bool QtSingleApplication::sendMessage(const QString &message, int timeout)
- {
-+#ifdef Q_OS_HAIKU
-+	return false;
-+#else
-     return peer->sendMessage(message, timeout);
-+#endif
- }
- 
- 
--- 
-2.16.4
-