<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[122383] trunk/dports/gis/qlandkartegt</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/122383">122383</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2014-07-21 13:57:39 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>qlandkarteqt: update to 1.7.7 with patches (see issue #44302)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisqlandkartegtPortfile">trunk/dports/gis/qlandkartegt/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/gis/qlandkartegt/files/</li>
<li><a href="#trunkdportsgisqlandkartegtfilespatchremovelegacyDictionaryhdiff">trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff</a></li>
<li><a href="#trunkdportsgisqlandkartegtfilespatchsrcmaincppdiff">trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisqlandkartegtPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/qlandkartegt/Portfile (122382 => 122383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/qlandkartegt/Portfile 2014-07-21 20:39:43 UTC (rev 122382)
+++ trunk/dports/gis/qlandkartegt/Portfile 2014-07-21 20:57:39 UTC (rev 122383)
</span><span class="lines">@@ -5,10 +5,10 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><span class="cx"> name qlandkartegt
</span><del>-version 1.7.6
</del><ins>+version 1.7.7
</ins><span class="cx"> categories gis
</span><span class="cx"> platforms darwin
</span><del>-maintainers puffin.lb.shuttle.de:michael.klein
</del><ins>+maintainers puffin.lb.shuttle.de:michael.klein mk
</ins><span class="cx"> license GPL-3
</span><span class="cx">
</span><span class="cx"> description Use your Garmin GPS with Linux/Mac OS X
</span><span class="lines">@@ -18,10 +18,10 @@
</span><span class="cx"> QLandkarte M, a moving map application for mobile devices.
</span><span class="cx">
</span><span class="cx"> homepage http://www.qlandkarte.org/
</span><del>-master_sites sourceforge:project/qlandkartegt/qlandkartegt/QLandkarte%20GT%20${version}
</del><ins>+master_sites sourceforge:project/qlandkartegt/qlandkartegt/QLandkarteGT%20${version}
</ins><span class="cx">
</span><del>-checksums rmd160 3eda6f83ac1ed89a8b65c850150ca72d29976ffa \
- sha256 ff1e352d07fd136e75a80035d888efe095f1f44ca15d46262169e98e5a14e1c3
</del><ins>+checksums rmd160 b26a7124766dcbba8ced253e59460b2192cc19fd \
+ sha256 0b0d659bef580bff7c6aabd563ad9bf0cf2d32467fe11e613ceaab58be7363d0
</ins><span class="cx">
</span><span class="cx"> depends_lib port:libexif \
</span><span class="cx"> port:gdal \
</span><span class="lines">@@ -31,10 +31,17 @@
</span><span class="cx"> port:libdmtx \
</span><span class="cx"> bin:gpsbabel:gpsbabel
</span><span class="cx">
</span><ins>+patchfiles patch-src-main.cpp.diff \
+ patch-remove-legacy-Dictionary.h.diff
+
+post-patch {
+ # needed by QDeviceWatcher
+ reinplace "s|CoreFoundation|CoreFoundation -framework DiskArbitration|" ${worksrcpath}/src/CMakeLists.txt
+}
+
</ins><span class="cx"> destroot {
</span><span class="cx"> xinstall -d ${destroot}${applications_dir}
</span><span class="cx"> copy "${worksrcpath}/bin/QLandkarte GT.app" ${destroot}${applications_dir}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.url "http://sourceforge.net/api/file/index/project-id/212192/mtime/desc/rss"
</del><span class="cx"> livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span></span></pre></div>
<a id="trunkdportsgisqlandkartegtfilespatchremovelegacyDictionaryhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff (0 => 122383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff (rev 0)
+++ trunk/dports/gis/qlandkartegt/files/patch-remove-legacy-Dictionary.h.diff 2014-07-21 20:57:39 UTC (rev 122383)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+--- 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_);
+
</ins></span></pre></div>
<a id="trunkdportsgisqlandkartegtfilespatchsrcmaincppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff (0 => 122383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff (rev 0)
+++ trunk/dports/gis/qlandkartegt/files/patch-src-main.cpp.diff 2014-07-21 20:57:39 UTC (rev 122383)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- src/main.cpp.orig 2014-04-02 19:23:47.000000000 +0200
++++ src/main.cpp 2014-07-10 20:17:08.000000000 +0200
+@@ -284,15 +284,11 @@
+ GDALAllRegister();
+
+ #ifdef Q_OS_MAC
+- QCoreApplication::setApplicationName("QLandkarte GT");
+ QCoreApplication::setApplicationVersion(VER_STR);
+- QCoreApplication::setOrganizationName("org.qlandkarte");
+- QCoreApplication::setOrganizationDomain("org.qlandkarte");
+-#else
++#endif
+ QCoreApplication::setApplicationName("QLandkarteGT");
+ QCoreApplication::setOrganizationName("QLandkarteGT");
+ QCoreApplication::setOrganizationDomain("qlandkarte.org");
+-#endif
+ QApplication::setWindowIcon(QIcon(":/icons/qlandkartegt.png"));
+
+ #ifdef WIN32
</ins></span></pre>
</div>
</div>
</body>
</html>