diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile index 389c297eb257..805e564d13f9 100644 --- a/astro/qlandkartegt/Makefile +++ b/astro/qlandkartegt/Makefile @@ -6,20 +6,19 @@ # PORTNAME= qlandkartegt -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.2 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION} MAINTAINER= i@levsha.me COMMENT= The ultimate outdoor aficionado's tool +LICENSE= GPLv2 + LIB_DEPENDS= gdal:${PORTSDIR}/graphics/gdal \ proj.6:${PORTSDIR}/graphics/proj \ gps.20:${PORTSDIR}/astro/gpsd -LICENSE= GPLv2 - USE_CMAKE= yes USE_QT_VER= 4 QT_COMPONENTS= gui opengl network sql xml linguist_build \ diff --git a/astro/qlandkartegt/distinfo b/astro/qlandkartegt/distinfo index f286f16b152c..f675c7c63370 100644 --- a/astro/qlandkartegt/distinfo +++ b/astro/qlandkartegt/distinfo @@ -1,2 +1,2 @@ -SHA256 (qlandkartegt-1.1.1.tar.gz) = 0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9 -SIZE (qlandkartegt-1.1.1.tar.gz) = 3963101 +SHA256 (qlandkartegt-1.2.2.tar.gz) = 37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d +SIZE (qlandkartegt-1.2.2.tar.gz) = 4300356 diff --git a/astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp b/astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp deleted file mode 100644 index 94fa67203790..000000000000 --- a/astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp +++ /dev/null @@ -1,47 +0,0 @@ -Index: src/CDeviceGPSD.cpp -=================================================================== ---- src/CDeviceGPSD.cpp (revision 2719) -+++ src/CDeviceGPSD.cpp (working copy) -@@ -138,6 +138,7 @@ - log_mutex( new QMutex() ), - pipe_fd( _pipe_fd ) - { -+ gpsdata = NULL; - } - - -@@ -149,7 +150,14 @@ - - void CGPSDThread::run() - { -+#if GPSD_API_MAJOR_VERSION >= 5 -+ int socket; -+ -+ if( gpsdata = new gps_data_t ) -+ socket = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata ); -+#else - gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT ); -+#endif - if( !gpsdata ) - { - // TODO: message box (from other thread) -@@ -187,13 +195,20 @@ - } // if - else if( FD_ISSET( gpsdata->gps_fd, &fds ) ) - { -+#if GPSD_API_MAJOR_VERSION >= 5 -+ gps_read( gpsdata ); -+#else - gps_poll( gpsdata ); -+#endif - if( !decodeData() ) break; - } // else if - } // else if - } // while - - gps_close( gpsdata ); -+#if GPSD_API_MAJOR_VERSION >= 5 -+ delete gpsdata; -+#endif - qDebug() << "thread done"; - } diff --git a/astro/qlandkartegt/pkg-plist b/astro/qlandkartegt/pkg-plist index c9f7f3a5e0e8..3a8b3db2cc8e 100644 --- a/astro/qlandkartegt/pkg-plist +++ b/astro/qlandkartegt/pkg-plist @@ -1,10 +1,11 @@ +bin/map2gcm bin/qlandkartegt bin/qlandkartegt.bin share/applications/qlandkartegt.desktop share/pixmaps/qlandkartegt.png -%%DATADIR%%/translations/qlandkartegt_de_DE.qm +%%DATADIR%%/translations/qlandkartegt_de.qm %%DATADIR%%/translations/qlandkartegt_es_ES.qm -%%DATADIR%%/translations/qlandkartegt_fr_FR.qm +%%DATADIR%%/translations/qlandkartegt_fr.qm %%DATADIR%%/translations/qlandkartegt_it_IT.qm %%DATADIR%%/translations/qlandkartegt_nl_NL.qm %%DATADIR%%/translations/qlandkartegt_ru_RU.qm