head	1.2;
access;
symbols
	pkgsrc-2020Q2:1.1.0.56
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.36
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.58
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.54
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.52
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.50
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.48
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.46
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.44
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.42
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.40
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.38
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.34
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.32
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.30
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.28
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.26
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.24
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.22
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.20
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.18
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.16
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.14
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.12
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.10
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.8
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2020.09.02.00.24.26;	author gdt;	state dead;
branches;
next	1.1;
commitid	KgIB0WwipXUMfpmC;

1.1
date	2013.05.25.23.43.25;	author joerg;	state Exp;
branches;
next	;
commitid	0QWvIVq2ho4Qo4Rw;


desc
@@


1.2
log
@geography/merkaator: Update to 0.18.4

Update originally by Ben Gergely, with modifications by gdt, from PR
pkg/55592.

pkgsrc changes:
  - Adjust dependencies to qt5
  - Require gcc6, due to gcc5 lossage with -Wno-registers

Upstream NEWS:

  - Support for qt5
  - Lots of bugfixes and minor improvements
@
text
@$NetBSD: patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp,v 1.1 2013/05/25 23:43:25 joerg Exp $

--- 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp.orig	2013-05-25 19:14:26.000000000 +0000
+++ 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
@@@@ -59,6 +59,8 @@@@ static PProcessIdToSessionId pProcessIdT
 #include <time.h>
 #endif
 
+#include <unistd.h>
+
 namespace QtLP_Private {
 #include "qtlockedfile.cpp"
 #if defined(Q_OS_WIN)
@


1.1
log
@Add missing include.
@
text
@d1 1
a1 1
$NetBSD$
@