[133144] trunk/dports/gis/qlandkartegt
mk at macports.org
mk at macports.org
Sat Feb 21 07:05:33 PST 2015
Revision: 133144
https://trac.macports.org/changeset/133144
Author: mk at macports.org
Date: 2015-02-21 07:05:32 -0800 (Sat, 21 Feb 2015)
Log Message:
-----------
qlandkartegt: update to version 1.8.1 (closes #46881)
Modified Paths:
--------------
trunk/dports/gis/qlandkartegt/Portfile
trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff
Removed Paths:
-------------
trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff
Modified: trunk/dports/gis/qlandkartegt/Portfile
===================================================================
--- trunk/dports/gis/qlandkartegt/Portfile 2015-02-21 11:50:45 UTC (rev 133143)
+++ trunk/dports/gis/qlandkartegt/Portfile 2015-02-21 15:05:32 UTC (rev 133144)
@@ -5,7 +5,7 @@
PortGroup cmake 1.0
name qlandkartegt
-version 1.7.7
+version 1.8.1
categories gis
platforms darwin
maintainers puffin.lb.shuttle.de:michael.klein mk
@@ -20,8 +20,8 @@
homepage http://www.qlandkarte.org/
master_sites sourceforge:project/qlandkartegt/qlandkartegt/QLandkarteGT%20${version}
-checksums rmd160 b26a7124766dcbba8ced253e59460b2192cc19fd \
- sha256 0b0d659bef580bff7c6aabd563ad9bf0cf2d32467fe11e613ceaab58be7363d0
+checksums rmd160 df5f6f9e3cdf000ba9fc312d56ece7338dacf13e \
+ sha256 9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7
depends_lib port:libexif \
port:gdal \
@@ -31,14 +31,8 @@
port:libdmtx \
bin:gpsbabel:gpsbabel
-patchfiles patch-src-main.cpp.diff \
- patch-remove-legacy-Dictionary.h.diff
+patchfiles patch-src-main.cpp.diff
-post-patch {
- # needed by QDeviceWatcher
- reinplace "s|CoreFoundation|CoreFoundation -framework DiskArbitration|" ${worksrcpath}/src/CMakeLists.txt
-}
-
destroot {
xinstall -d ${destroot}${applications_dir}
copy "${worksrcpath}/bin/QLandkarte GT.app" ${destroot}${applications_dir}
Deleted: trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff
===================================================================
--- trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff 2015-02-21 11:50:45 UTC (rev 133143)
+++ trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff 2015-02-21 15:05:32 UTC (rev 133144)
@@ -1,94 +0,0 @@
---- src/CGpx.cpp.orig 2014-04-02 19:23:46.000000000 +0200
-+++ src/CGpx.cpp 2014-07-19 14:43:03.000000000 +0200
-@@ -67,7 +67,7 @@
- for (int i=0;;++i)
- {
- QColor trackColor = CTrack::lineColors[i];
-- QString colorName = colorMap.left(trackColor);
-+ QString colorName = colorMap.key(trackColor);
- if (!colorName.isEmpty()) trackColorMap.insert(colorName, i);
- if (trackColor == Qt::transparent) break;
- }
-@@ -80,13 +80,13 @@
- }
-
-
--const Dictionary<QString, QColor>& CGpx::getColorMap() const
-+const QMap<QString, QColor>& CGpx::getColorMap() const
- {
- return colorMap;
- }
-
-
--const Dictionary<QString, int>& CGpx::getTrackColorMap() const
-+const QMap<QString, int>& CGpx::getTrackColorMap() const
- {
- return trackColorMap;
- }
---- src/CGpx.h.orig 2014-04-02 19:23:47.000000000 +0200
-+++ src/CGpx.h 2014-07-19 11:39:24.000000000 +0200
-@@ -24,8 +24,6 @@
- #include <QString>
- #include <QtXml/QDomDocument>
-
--#include "Dictionary.h"
--
- /// handle geo data from GPX files
- class CGpx : public QObject, public QDomDocument
- {
-@@ -68,10 +66,11 @@
- void save(const QString& filename);
- void makeExtensions();
-
-- static QMap<QString,QDomElement> mapChildElements(const QDomNode& parent);
-+ static QMap<QString,QDomElement> mapChildElements(const QDomNode&
-+ parent);
-
-- const Dictionary<QString, QColor>& getColorMap() const;
-- const Dictionary<QString, int>& getTrackColorMap() const;
-+ const QMap<QString, QColor>& getColorMap() const;
-+ const QMap<QString, int>& getTrackColorMap() const;
-
- QDomElement &getExtensions() { return extensions; }
- gpx_version version() { return file_version; }
-@@ -80,8 +79,8 @@
- protected:
- void writeMetadata();
-
-- Dictionary<QString, QColor> colorMap;
-- Dictionary<QString, int> trackColorMap;
-+ QMap<QString, QColor> colorMap;
-+ QMap<QString, int> trackColorMap;
-
- private:
- QDomElement extensions;
---- src/CMakeLists.txt.orig 2014-05-18 15:36:36.000000000 +0200
-+++ src/CMakeLists.txt 2014-07-21 21:45:56.000000000 +0200
-@@ -463,7 +463,6 @@
- CImageViewer.h
- CMapRmp.h
- CMapDEMSlopeSetup.h
-- Dictionary.h
- QFileExt.h
- IExchange.h
- CExchangeGarmin.h
---- src/CTrackDB.cpp.orig 2014-04-02 19:23:46.000000000 +0200
-+++ src/CTrackDB.cpp 2014-07-19 14:49:25.000000000 +0200
-@@ -233,7 +233,7 @@
- tmpelem = trackextensionmap.value(CGpx::gpxx_ns + ":" + "DisplayColor");
- if (!tmpelem.isNull())
- {
-- int colorID = gpx.getTrackColorMap().right(tmpelem.text(), -1);
-+ int colorID = gpx.getTrackColorMap().value(tmpelem.text(), -1);
- if (colorID >= 0) track->setColor(colorID);
- }
- }
-@@ -488,7 +488,7 @@
- QDomElement color = gpx.createElement("gpxx:DisplayColor");
- gpxx_ext.appendChild(color);
-
-- QString colname = gpx.getTrackColorMap().left(track->getColorIdx());
-+ QString colname = gpx.getTrackColorMap().key(track->getColorIdx());
- QDomText _color_ = gpx.createTextNode(colname);
- color.appendChild(_color_);
-
Modified: trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff
===================================================================
--- trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff 2015-02-21 11:50:45 UTC (rev 133143)
+++ trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff 2015-02-21 15:05:32 UTC (rev 133144)
@@ -4,7 +4,7 @@
GDALAllRegister();
#ifdef Q_OS_MAC
-- QCoreApplication::setApplicationName("QLandkarte GT");
+- QCoreApplication::setApplicationName("QLandkarteGT");
QCoreApplication::setApplicationVersion(VER_STR);
- QCoreApplication::setOrganizationName("org.qlandkarte");
- QCoreApplication::setOrganizationDomain("org.qlandkarte");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150221/366c1321/attachment.html>
More information about the macports-changes
mailing list