Hi,

attached updated to current 1.7.7 version of QLGT.

1.7.6 announcement: 
http://sourceforge.net/p/qlandkartegt/mailman/message/31977305/
1.7.7 announcement: 
http://sourceforge.net/p/qlandkartegt/mailman/message/32580833/

most notably change is the drop of the OSM support, but there is a new File 
submenu
called "Load Online Map", where you can choose the OSM street browser.

Including a few patches from upstream that did not made it into 1.7.7.

OK?

Sebastian

Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/qlandkartegt/Makefile,v
retrieving revision 1.19
diff -u -p -u -r1.19 Makefile
--- Makefile    27 Aug 2014 12:50:07 -0000      1.19
+++ Makefile    28 Aug 2014 10:44:44 -0000
@@ -2,8 +2,7 @@
 
 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/
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/qlandkartegt/distinfo,v
retrieving revision 1.12
diff -u -p -u -r1.12 distinfo
--- distinfo    19 Oct 2013 16:51:29 -0000      1.12
+++ distinfo    28 Aug 2014 10:44:44 -0000
@@ -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
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt        28 Aug 2014 10:44:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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)
Index: patches/patch-src_CDeviceGarminBulk_cpp
===================================================================
RCS file: patches/patch-src_CDeviceGarminBulk_cpp
diff -N patches/patch-src_CDeviceGarminBulk_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_CDeviceGarminBulk_cpp     28 Aug 2014 10:44:44 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+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";
+ }
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_CMakeLists_txt    28 Aug 2014 10:44:44 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+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}
Index: patches/patch-src_CMouseMoveMap_cpp
===================================================================
RCS file: patches/patch-src_CMouseMoveMap_cpp
diff -N patches/patch-src_CMouseMoveMap_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_CMouseMoveMap_cpp 28 Aug 2014 10:44:44 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+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);
+ }
+ 
Index: patches/patch-src_CWptDB_cpp
===================================================================
RCS file: patches/patch-src_CWptDB_cpp
diff -N patches/patch-src_CWptDB_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_CWptDB_cpp        28 Aug 2014 10:44:44 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+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;
+         }
+     }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/qlandkartegt/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -r1.7 PLIST
--- pkg/PLIST   27 Aug 2014 12:50:07 -0000      1.7
+++ pkg/PLIST   28 Aug 2014 10:44:44 -0000
@@ -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


Reply via email to