Update qlgt to 1.7.7

test, feedback and OK kirby@

geo/qlandkartegt/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2014/08/27 12:50:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2014/08/29 12:01:41 sebastia Exp $
 
 COMMENT =	garmin gps map management tool
 
-DISTNAME =	qlandkartegt-1.7.5
-REVISION =	3
+DISTNAME =	qlandkartegt-1.7.7
 CATEGORIES =	geo x11
 
 HOMEPAGE =	http://www.qlandkarte.org/
@@ -27,4 +26,11 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 		geo/garmindev \
 		geo/gpsbabel
 
+CONFIGURE_ARGS = -DCMAKE_BUILD_TYPE=Release
+
+post-extract:
+	@find ${WRKDIST} -name *.orig -exec rm {} \;
+	@rm ${WRKSRC}/cmake/Modules/FindGDAL.cmake
+	@rm ${WRKSRC}/cmake/Modules/FindJPEG.cmake
+
 .include <bsd.port.mk>

geo/qlandkartegt/distinfo

@@ -1,2 +1,2 @@
-SHA256 (qlandkartegt-1.7.5.tar.gz) = qLVxuoOFaO0ljGH6CrGLNwx9ItJTmmMqACi3j0oiqiw=
-SIZE (qlandkartegt-1.7.5.tar.gz) = 8351098
+SHA256 (qlandkartegt-1.7.7.tar.gz) = Cw1lm+9YC/98aqvVY62b8M8tMkZ/4R5hPOqrWL5zY9A=
+SIZE (qlandkartegt-1.7.7.tar.gz) = 6723780

geo/qlandkartegt/patches/patch-CMakeLists_txt

@@ -0,0 +1,14 @@
+$OpenBSD: patch-CMakeLists_txt,v 1.1 2014/08/29 12:01:41 sebastia Exp $
+
+do not build failing experimental feature
+
+--- CMakeLists.txt.orig	Thu Aug 28 00:18:25 2014
++++ CMakeLists.txt	Thu Aug 28 00:19:56 2014
+@@ -94,7 +94,6 @@ endif (NOT QK_QT5_SERIAL_PORT)
+ 
+ add_subdirectory(3rdparty/QZip)
+ add_subdirectory(3rdparty/QTextHtmlExporter)
+-add_subdirectory(3rdparty/QDeviceWatcher)
+ add_subdirectory(3rdparty/getopt)
+ add_subdirectory(3rdparty/map2gcm)
+ add_subdirectory(3rdparty/map2rmap)

geo/qlandkartegt/patches/patch-src_CDeviceGarminBulk_cpp

@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_CDeviceGarminBulk_cpp,v 1.1 2014/08/29 12:01:41 sebastia Exp $
+
+do not build failing experimental feature
+
+--- src/CDeviceGarminBulk.cpp.orig	Thu Aug 28 00:21:21 2014
++++ src/CDeviceGarminBulk.cpp	Thu Aug 28 00:22:01 2014
+@@ -37,11 +37,9 @@
+ CDeviceGarminBulk::CDeviceGarminBulk(QObject * parent)
+ : IDevice("Garmin Mass Storage", parent)
+ {
+-    deviceWatcher = new QDeviceWatcher(this);
+     connect(deviceWatcher, SIGNAL(deviceAdded(QString)), SLOT(slotDevice(QString)));
+     connect(deviceWatcher, SIGNAL(deviceChanged(QString)), SLOT(slotDevice(QString)));
+     connect(deviceWatcher, SIGNAL(deviceRemoved(QString)), SLOT(slotDevice(QString)));
+-    deviceWatcher->start();
+ 
+     qDebug() << "***************************************CDeviceGarminBulk";
+ }

geo/qlandkartegt/patches/patch-src_CMakeLists_txt

@@ -0,0 +1,24 @@
+$OpenBSD: patch-src_CMakeLists_txt,v 1.1 2014/08/29 12:01:41 sebastia Exp $
+
+fix includes for OpenGL
+do not build failing experimental feature
+
+--- src/CMakeLists.txt.orig	Wed Aug 27 23:36:56 2014
++++ src/CMakeLists.txt	Thu Aug 28 00:19:29 2014
+@@ -672,7 +672,7 @@ endif(UNIX)
+ set(qlandkarte_include_dirs
+   ${CMAKE_BINARY_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
+-  ${OPENGL_INCLUDE_DIRS}
++  ${OPENGL_INCLUDE_DIR}
+   ${GDAL_INCLUDE_DIRS}
+   ${PROJ_INCLUDE_DIRS}
+   ${QT_QTXML_INCLUDE_DIR}
+@@ -800,7 +800,6 @@ set(qlandkarte_link_libs
+     ${GPSD_LIBRARIES}
+     qzip
+     qtexthtmlexporter
+-    qdevicewatcher
+     getopt
+     ${QTSOAP_LIBRARIES}
+     ${PROFILING_LIBRARIES}

geo/qlandkartegt/patches/patch-src_CMouseMoveMap_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_CMouseMoveMap_cpp,v 1.1 2014/08/29 12:01:41 sebastia Exp $
+
+fix crash deleting a waypoint via right mouse button
+from upstream r3982
+
+--- src/CMouseMoveMap.cpp.orig	Thu Aug 28 11:56:09 2014
++++ src/CMouseMoveMap.cpp	Thu Aug 28 11:56:29 2014
+@@ -421,6 +421,9 @@ void CMouseMoveMap::slotDeleteWpt()
+ 
+     CWpt * selWpt = selWpts.first().wpt;
+     QString key = selWpt->getKey();
++
++    selWpts.clear();
++
+     CWptDB::self().delWpt(key);
+ }
+ 

geo/qlandkartegt/patches/patch-src_CWptDB_cpp

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_CWptDB_cpp,v 1.1 2014/08/29 12:01:41 sebastia Exp $
+
+fix crash on aborting waypoint creation
+from upstream r3984
+
+--- src/CWptDB.cpp.orig	Thu Aug 28 12:05:40 2014
++++ src/CWptDB.cpp	Thu Aug 28 12:06:10 2014
+@@ -307,7 +307,7 @@ CWpt * CWptDB::newWpt(float lon, float lat, float ele,
+         CDlgEditWpt dlg(*wpt,theMainWindow->getCanvas());
+         if(dlg.exec() == QDialog::Rejected)
+         {
+-            delete wpt;
++	    wpt->deleteLater();
+             return 0;
+         }
+     }

geo/qlandkartegt/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2014/08/27 12:50:07 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2014/08/29 12:01:41 sebastia Exp $
 @pkgpath geo/qlandkarte
 @bin bin/cache2gtiff
 @bin bin/map2gcm
@@ -14,7 +14,6 @@ share/qlandkartegt/
 share/qlandkartegt/translations/
 share/qlandkartegt/translations/qlandkartegt_cs.qm
 share/qlandkartegt/translations/qlandkartegt_de.qm
-share/qlandkartegt/translations/qlandkartegt_en.qm
 share/qlandkartegt/translations/qlandkartegt_es_ES.qm
 share/qlandkartegt/translations/qlandkartegt_fr.qm
 share/qlandkartegt/translations/qlandkartegt_it_IT.qm