From e8239eafcd83691a402067d0381e2d2c45bd9b3b Mon Sep 17 00:00:00 2001
From: sebastia <sebastia@openbsd.org>
Date: Wed, 18 Jan 2012 15:08:33 +0000
Subject: [PATCH] Update to qlgt 1.3.2, new dependencies to libdmtx and
 gpsbabel, allowing to create barcodes for waypoints and opening a lot more
 types of waypoint files.

tested on i386/macppc by me, amd64 by sthen@
Feedback and OK sthen@
---
 geo/qlandkartegt/Makefile                     | 11 +++++----
 geo/qlandkartegt/distinfo                     | 10 ++++----
 .../patches/patch-src_CMainWindow_cpp         | 24 +++++++++++++++++++
 3 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 geo/qlandkartegt/patches/patch-src_CMainWindow_cpp

diff --git a/geo/qlandkartegt/Makefile b/geo/qlandkartegt/Makefile
index ff10fccb924..fc9f037f2ae 100644
--- a/geo/qlandkartegt/Makefile
+++ b/geo/qlandkartegt/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2011/12/22 17:49:06 sebastia Exp $
+# $OpenBSD: Makefile,v 1.9 2012/01/18 15:08:33 sebastia Exp $
 
 VMEM_WARNING =	yes
 COMMENT =	garmin gps map management tool
 
-DISTNAME =	qlandkartegt-1.3.0
+DISTNAME =	qlandkartegt-1.3.2
 CATEGORIES =	geo x11
 
 HOMEPAGE =	http://www.qlandkarte.org/
@@ -19,13 +19,16 @@ PERMIT_DISTFILES_FTP =		Yes
 MODULES =	devel/cmake x11/qt4
 WANTLIB +=	GL GLU ICE SM X11 Xext c m pthread stdc++ z gdal gps>=19
 WANTLIB +=	exif QtDBus QtGui QtNetwork QtOpenGL QtSql QtXml QtCore proj
-WANTLIB +=	QtWebKit QtXmlPatterns phonon jpeg
+WANTLIB +=	QtWebKit QtXmlPatterns phonon jpeg dmtx
+BUILD_DEPENDS +=	geo/gpsbabel
 LIB_DEPENDS +=	devel/proj \
 		x11/qt4 \
+		graphics/libdmtx \
 		graphics/libexif \
 		geo/gdal \
 		misc/gpsd>=2.95
 RUN_DEPENDS =	devel/desktop-file-utils \
-		geo/garmindev
+		geo/garmindev \
+		geo/gpsbabel
 
 .include <bsd.port.mk>
diff --git a/geo/qlandkartegt/distinfo b/geo/qlandkartegt/distinfo
index 9f8003c0fa6..16054060d98 100644
--- a/geo/qlandkartegt/distinfo
+++ b/geo/qlandkartegt/distinfo
@@ -1,5 +1,5 @@
-MD5 (qlandkartegt-1.3.0.tar.gz) = L+yqZCRfJ+dToN9at3jOnw==
-RMD160 (qlandkartegt-1.3.0.tar.gz) = 0QMoZi+NVsmYHlHkuwV5jsYtYdI=
-SHA1 (qlandkartegt-1.3.0.tar.gz) = xkofixDkYDw/X8HlRjOxrCIkMv8=
-SHA256 (qlandkartegt-1.3.0.tar.gz) = m7E5l2rl1IL+GZ9Tqy8hZr9R8BphAT6vFGY1Mzi5GJQ=
-SIZE (qlandkartegt-1.3.0.tar.gz) = 4167340
+MD5 (qlandkartegt-1.3.2.tar.gz) = HcG3KEsVIxl4+dDsY1PPZQ==
+RMD160 (qlandkartegt-1.3.2.tar.gz) = BixPob3flTGUk+LesiUBjPXiHA0=
+SHA1 (qlandkartegt-1.3.2.tar.gz) = OPIgSpS48MR+GuXWk8I4RYauofs=
+SHA256 (qlandkartegt-1.3.2.tar.gz) = M2zLMrZHKDoKSetjhXG+g5czKEalB0kHk/QTp68pre4=
+SIZE (qlandkartegt-1.3.2.tar.gz) = 4549942
diff --git a/geo/qlandkartegt/patches/patch-src_CMainWindow_cpp b/geo/qlandkartegt/patches/patch-src_CMainWindow_cpp
new file mode 100644
index 00000000000..049f5fcee9f
--- /dev/null
+++ b/geo/qlandkartegt/patches/patch-src_CMainWindow_cpp
@@ -0,0 +1,24 @@
+$OpenBSD: patch-src_CMainWindow_cpp,v 1.1 2012/01/18 15:08:33 sebastia Exp $
+
+fix detection of gpsbabel and conversions done with it
+
+--- src/CMainWindow.cpp.orig	Wed Jan  4 14:53:52 2012
++++ src/CMainWindow.cpp	Wed Jan 11 08:21:51 2012
+@@ -936,7 +936,7 @@ bool CMainWindow::convertData(const QString& inFormat,
+         return false;
+     }
+ 
+-    if (!babelProcess->waitForFinished())
++    if (!babelProcess->waitForFinished(-1))
+     {
+         return false;
+     }
+@@ -1536,7 +1536,7 @@ bool CMainWindow::isGPSBabel()
+     bool haveGPSBabel = false;
+     QProcess proc1;
+     proc1.start(GPSBABEL " -V");
+-    proc1.waitForFinished();
++    proc1.waitForFinished(-1);
+     haveGPSBabel = proc1.error() == QProcess::UnknownError;
+     return haveGPSBabel;
+ }