Attachment 200106 Details for Bug 234001 – Proposed patch (since 487272 revision)

[patch] Proposed patch (since 487272 revision)

focuswriter.diff (text/plain), 2.31 KB, created by lightside on 2018-12-14 08:59:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2018-12-14 08:59:18 UTC

Size: 2.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 487272)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	focuswriter
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.6.16
>-PORTREVISION=	1
>+DISTVERSION=	1.7.0
> CATEGORIES=	editors
> 
> MAINTAINER=	lightside@gmx.com
>@@ -17,7 +16,7 @@
> 
> LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell
> 
>-USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5
>+USES=		compiler:c++11-lib desktop-file-utils gl pkgconfig qmake qt:5
> USE_GITHUB=	yes
> GH_ACCOUNT=	gottcode
> USE_GL=		gl
>Index: distinfo
>===================================================================
>--- distinfo	(revision 487272)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1535991368
>-SHA256 (gottcode-focuswriter-v1.6.16_GH0.tar.gz) = a413363c8de76bfb112450ef30fec5b7b13ab78d565eba0eb8344536a9738396
>-SIZE (gottcode-focuswriter-v1.6.16_GH0.tar.gz) = 10497184
>+TIMESTAMP = 1544553725
>+SHA256 (gottcode-focuswriter-v1.7.0_GH0.tar.gz) = b6221598eee1ca375c8d4ec7901d73a5ee7a9e39d4df0f1d36dfb80e74962f10
>+SIZE (gottcode-focuswriter-v1.7.0_GH0.tar.gz) = 10501746
>Index: files/patch-src_qtsingleapplication_qtlocalpeer.cpp
>===================================================================
>--- files/patch-src_qtsingleapplication_qtlocalpeer.cpp	(nonexistent)
>+++ files/patch-src_qtsingleapplication_qtlocalpeer.cpp	(working copy)
>@@ -0,0 +1,24 @@
>+# Some workaround after v1.7.0 update, because previous (1.6.16) version of
>+# focuswriter application may create empty /tmp/qtsingleapp-*-lockfile file
>+# after first run, which may prevent newer application to run.
>+
>+--- src/qtsingleapplication/qtlocalpeer.cpp.orig	2018-12-11 18:42:05 UTC
>++++ src/qtsingleapplication/qtlocalpeer.cpp
>+@@ -95,6 +95,17 @@ QtLocalPeer::QtLocalPeer(QObject* parent
>+     QString lockName = QDir(QDir::tempPath()).absolutePath()
>+                        + QLatin1Char('/') + socketName
>+                        + QLatin1String("-lockfile");
>++#if defined(Q_OS_UNIX)
>++{
>++    QFile file(lockName);
>++    if (file.exists() && file.open(QIODevice::ReadOnly)) {
>++        bool isEmpty = (file.size() == 0);
>++        file.close();
>++        if (isEmpty)
>++            QFile::remove(lockName);
>++    }
>++}
>++#endif
>+     lockFile = new QLockFile(lockName);
>+     lockFile->setStaleLockTime(0);
>+ #if defined(Q_OS_WIN)

Flags:

lightside: maintainer-approval+

Actions: View | Diff

Attachments on bug 234001: 200099 | 200106 | 200127 | 200180 | 200197