<!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>[150853] users/devans/GNOME-3/stable/dports/gnome/gnome-maps</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/150853">150853</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-07-30 22:24:15 -0700 (Sat, 30 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: gnome-maps, update to version 3.20.2, 3.18.3 for systems that don't support libc++, now uses maps from MapBox.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomemapsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomemapsfilespatchdisableswitchbetweenstreetandaerialtilesdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomemapsfilespatchstopusingmapquesttilesdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomegnomemapsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile (150852 => 150853)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile 2016-07-31 00:49:07 UTC (rev 150852)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile 2016-07-31 05:24:15 UTC (rev 150853)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup gobject_introspection 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-maps
</span><del>-version 3.20.1
-revision 1
</del><ins>+version 3.20.2
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Map application for GNOME 3.
</span><span class="lines">@@ -21,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 278527a584c46acb7b198ebab9e9c15a8128b2cb \
- sha256 4874d10a3cfdffd5d1db6084d67b5e8dc8c2db2ff995302b80060ecfc5e99bd5
</del><ins>+checksums rmd160 6cb4f05d5b37b34614885f0b8c982130e744e9ce \
+ sha256 e860144795339fdbb2f1239c4db092ad12beb9acaa3f3f8aa1d935c36d86bc3f
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -49,13 +48,6 @@
</span><span class="cx">
</span><span class="cx"> gobject_introspection yes
</span><span class="cx">
</span><del>-# temporary patch
-# mapquest has disabled free public access to map tiles
-# https://bugzilla.gnome.org/show_bug.cgi?id=764841
-
-patchfiles patch-stop-using-mapquest-tiles.diff \
- patch-disable-switch-between-street-and-aerial-tiles.diff
-
</del><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -68,10 +60,11 @@
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx"> if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><del>- version 3.18.2
- revision 1
- checksums rmd160 aecfc78e6299cea8328a8803037141ee15f13fc2 \
- sha256 693ff1559252eabe5d8c9c7354333b5aa1996e870936456d15706a0e0bac9278
</del><ins>+ version 3.18.3
+ set branch [join [lrange [split ${version} .] 0 1] .]
+ master_sites gnome:sources/${name}/${branch}/
+ checksums rmd160 48567c80b517e8982a57b3e3e9ed6b8d126dd31e \
+ sha256 b164eda021a88cc7ec6773fd48428d102334b98cc196d69fa0186258b9c8b6ed
</ins><span class="cx"> } else {
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomemapsfilespatchdisableswitchbetweenstreetandaerialtilesdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff (150852 => 150853)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff 2016-07-31 00:49:07 UTC (rev 150852)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff 2016-07-31 05:24:15 UTC (rev 150853)
</span><span class="lines">@@ -1,114 +0,0 @@
</span><del>-From 6f8169421d619f7cf764f4dc0a0b6a16a3201c3b Mon Sep 17 00:00:00 2001
-From: Marcus Lundblad <ml@update.uu.se>
-Date: Wed, 22 Jun 2016 23:30:52 +0200
-Subject: [PATCH] layerPopover: Remove ability to switch b/w street and aerial
-
-As the aerial tiles currently are provided by MapQuest, the switcher
-buttons is not needed currently.
-Keeps the ability to load custom map layers.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764841
----
- data/ui/layers-popover.ui | 48 ++---------------------------------------------
- src/layersPopover.js | 6 +-----
- 2 files changed, 3 insertions(+), 51 deletions(-)
-
-diff --git a/data/ui/layers-popover.ui b/data/ui/layers-popover.ui
-index a33f17d..cd5b71e 100644
---- data/ui/layers-popover.ui
-+++ data/ui/layers-popover.ui
-@@ -10,50 +10,6 @@
- <property name="valign">center</property>
- <property name="row_spacing">5</property>
- <child>
-- <object class="GtkRadioButton" id="streetLayerButton">
-- <property name="visible">True</property>
-- <property name="can-focus">True</property>
-- <property name="action-name">win.map-type</property>
-- <property name="action-target">"STREET"</property>
-- <property name="draw-indicator">False</property>
-- <style>
-- <class name="layer-radio-button"/>
-- </style>
-- <child>
-- <object class="GtkImage" id="streetLayerImage">
-- <property name="visible">True</property>
-- <property name="resource">/org/gnome/Maps/ui/maptype-street.png</property>
-- </object>
-- </child>
-- </object>
-- <packing>
-- <property name="left-attach">0</property>
-- <property name="top-attach">0</property>
-- </packing>
-- </child>
-- <child>
-- <object class="GtkRadioButton" id="aerialLayerButton">
-- <property name="visible">True</property>
-- <property name="can-focus">True</property>
-- <property name="action-name">win.map-type</property>
-- <property name="action-target">"AERIAL"</property>
-- <property name="draw-indicator">False</property>
-- <style>
-- <class name="layer-radio-button"/>
-- </style>
-- <child>
-- <object class="GtkImage" id="aerialLayerImage">
-- <property name="visible">True</property>
-- <property name="resource">/org/gnome/Maps/ui/maptype-aerial.png</property>
-- </object>
-- </child>
-- </object>
-- <packing>
-- <property name="left-attach">0</property>
-- <property name="top-attach">1</property>
-- </packing>
-- </child>
-- <child>
- <object class="GtkListBox" id="layersListBox">
- <property name="name">layers-list-box</property>
- <property name="visible">false</property>
-@@ -65,7 +21,7 @@
- </object>
- <packing>
- <property name="left-attach">0</property>
-- <property name="top-attach">2</property>
-+ <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
-@@ -76,7 +32,7 @@
- </object>
- <packing>
- <property name="left-attach">0</property>
-- <property name="top-attach">3</property>
-+ <property name="top-attach">1</property>
- </packing>
- </child>
- </object>
-diff --git a/src/layersPopover.js b/src/layersPopover.js
-index f37109f..ab20760 100644
---- src/layersPopover.js
-+++ src/layersPopover.js
-@@ -78,9 +78,7 @@ const LayersPopover = new Lang.Class({
- Name: 'LayersPopover',
- Extends: Gtk.Popover,
- Template: 'resource:///org/gnome/Maps/ui/layers-popover.ui',
-- InternalChildren: [ 'streetLayerButton',
-- 'aerialLayerButton',
-- 'layersListBox',
-+ InternalChildren: [ 'layersListBox',
- 'loadLayerButton' ],
-
- _init: function(params) {
-@@ -92,8 +90,6 @@ const LayersPopover = new Lang.Class({
- transitions_enabled: false,
- visible: false });
-
-- this._aerialLayerButton.join_group(this._streetLayerButton);
--
- this.get_style_context().add_class('maps-popover');
-
- this._layersListBox.bind_model(this._mapView.shapeLayerStore,
---
-2.8.1
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomemapsfilespatchstopusingmapquesttilesdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff (150852 => 150853)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff 2016-07-31 00:49:07 UTC (rev 150852)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff 2016-07-31 05:24:15 UTC (rev 150853)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-From 47a2dbb02c71bd5be1bff7b295a03526dcbe5507 Mon Sep 17 00:00:00 2001
-From: Marcus Lundblad <ml@update.uu.se>
-Date: Wed, 22 Jun 2016 23:25:08 +0200
-Subject: [PATCH] mapView: Stop using MapQuest tiles
-
-Revert to using the standard OSM Mapnik tiles instead of MapQuest's
-tiles, as MapQuest will cease providing free tiles.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764841
----
- src/mapView.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mapView.js b/src/mapView.js
-index aa587da..09af348 100644
---- src/mapView.js
-+++ src/mapView.js
-@@ -47,7 +47,7 @@ const Utils = imports.utils;
-
- const MapType = {
- LOCAL: 'MapsLocalSource',
-- STREET: Champlain.MAP_SOURCE_OSM_MAPQUEST,
-+ STREET: Champlain.MAP_SOURCE_OSM_MAPNIK,
- AERIAL: Champlain.MAP_SOURCE_OSM_AERIAL_MAP,
- CYCLING: Champlain.MAP_SOURCE_OSM_CYCLE_MAP,
- TRANSIT: Champlain.MAP_SOURCE_OSM_TRANSPORT_MAP
---
-2.8.1
</del></span></pre>
</div>
</div>
</body>
</html>