On Fri, January 13, 2012 10:58, Sebastian Reitenbach wrote: > Hi, > > On Friday, January 6, 2012 20:00 CET, "Sebastian Reitenbach" > <sebas...@l00-bugdead-prods.de> wrote: > >> >> On Friday, December 30, 2011 09:07 CET, "Sebastian Reitenbach" >> <sebas...@l00-bugdead-prods.de> wrote: >> >> > Hi, >> > >> > attached patch updates geo/qlandkartegt to version 1.3.1. Most notably >> change is a faster loading of the OSM maps. >> > Here the link to the announcement mail: >> https://sourceforge.net/mailarchive/forum.php?thread_name=4ED7DD16.3040701%40gmx.de&forum_name=qlandkartegt-users >> > >> > Further added two new dependencies: >> > * devel/libdmtx to allow creation of barcodes for waypoints (not yet in >> ports, still needs review/OK, sent to ports@ on December 24.) >> > * geo/gpsbabel to allow to open a truckload of more file types when >> loading geo data >> > >> > comments or OK? >> >> no interest in this one? >> >> please comment or OK. > > Meanwhile qlandkartegt 1.3.2 released. Tested and works well on macppc and > i386. > Release announcement for the new version can be found here: > https://sourceforge.net/mailarchive/forum.php?thread_name=1325710298.2032.0%40antares&forum_name=qlandkartegt-users > > Still would need graphics/libdmtx as new dependency which I just resent. > > Comments or OK?
Hi. I've tested your previous patch to 1.3.1. Builds, starts and shows OSM map on amd64. Didn't test it with my garmin yet. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/geo/qlandkartegt/Makefile,v > retrieving revision 1.8 > diff -u -r1.8 Makefile > --- Makefile 22 Dec 2011 17:49:06 -0000 1.8 > +++ Makefile 13 Jan 2012 07:47:52 -0000 > @@ -3,7 +3,7 @@ > 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 @@ > 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> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/geo/qlandkartegt/distinfo,v > retrieving revision 1.7 > diff -u -r1.7 distinfo > --- distinfo 22 Dec 2011 17:49:06 -0000 1.7 > +++ distinfo 13 Jan 2012 07:47:52 -0000 > @@ -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 > Index: patches/patch-src_CMainWindow_cpp > =================================================================== > RCS file: patches/patch-src_CMainWindow_cpp > diff -N patches/patch-src_CMainWindow_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_CMainWindow_cpp 13 Jan 2012 07:47:52 -0000 > @@ -0,0 +1,24 @@ > +$OpenBSD$ > + > +fix detechtion of gpsbabel and conversios 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; > + } > > > > > > >
