Attachment #200180 for bug #234001

Lines 3-10 Link Here

(-)Makefile (-3 / +2 lines)
3		3
4	PORTNAME= focuswriter	4	PORTNAME= focuswriter
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 1.6.16	6	DISTVERSION= 1.7.0
7	PORTREVISION= 1
8	CATEGORIES= editors	7	CATEGORIES= editors
9		8
10	MAINTAINER= lightside@gmx.com	9	MAINTAINER= lightside@gmx.com
Lines 17-23 Link Here
17		16
18	LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell	17	LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
19		18
20	USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5	19	USES= compiler:c++11-lib desktop-file-utils gl pkgconfig qmake qt:5
21	USE_GITHUB= yes	20	USE_GITHUB= yes
22	GH_ACCOUNT= gottcode	21	GH_ACCOUNT= gottcode
23	USE_GL= gl	22	USE_GL= gl

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535991368	1	TIMESTAMP = 1544553725
2	SHA256 (gottcode-focuswriter-v1.6.16_GH0.tar.gz) = a413363c8de76bfb112450ef30fec5b7b13ab78d565eba0eb8344536a9738396	2	SHA256 (gottcode-focuswriter-v1.7.0_GH0.tar.gz) = b6221598eee1ca375c8d4ec7901d73a5ee7a9e39d4df0f1d36dfb80e74962f10
3	SIZE (gottcode-focuswriter-v1.6.16_GH0.tar.gz) = 10497184	3	SIZE (gottcode-focuswriter-v1.7.0_GH0.tar.gz) = 10501746




# FIXED: Did not launch when incorrect lock file was found.
# https://github.com/gottcode/focuswriter/commit/0c3f463f844af43b9a780955872763c8e33bd001

--- src/qtsingleapplication/qtlocalpeer.cpp.orig	2018-12-11 18:42:05 UTC
+++ src/qtsingleapplication/qtlocalpeer.cpp
@@ -97,9 +97,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent
                        + QLatin1String("-lockfile");
     lockFile = new QLockFile(lockName);
     lockFile->setStaleLockTime(0);
-#if defined(Q_OS_WIN)
     lockFile->removeStaleLockFile();
-#endif
 }
 
 

Return to bug 234001

Line 0 Link Here

(-)files/patch-src_qtsingleapplication_qtlocalpeer.cpp (+15 lines)
	1	# FIXED: Did not launch when incorrect lock file was found.
	2	# https://github.com/gottcode/focuswriter/commit/0c3f463f844af43b9a780955872763c8e33bd001
	3
	4	--- src/qtsingleapplication/qtlocalpeer.cpp.orig 2018-12-11 18:42:05 UTC
	5	+++ src/qtsingleapplication/qtlocalpeer.cpp
	6	@@ -97,9 +97,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent
	7	+ QLatin1String("-lockfile");
	8	lockFile = new QLockFile(lockName);
	9	lockFile->setStaleLockTime(0);
	10	-#if defined(Q_OS_WIN)
	11	lockFile->removeStaleLockFile();
	12	-#endif
	13	}
	14
	15