mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
FocusWriter: bump version+drop patchset (#3553)
This commit is contained in:
@@ -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`"
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user