[150535] users/devans/GNOME-3/stable/dports/gnome/gnome-maps
devans at macports.org
devans at macports.org
Wed Jul 20 19:52:57 PDT 2016
Revision: 150535
https://trac.macports.org/changeset/150535
Author: devans at macports.org
Date: 2016-07-20 19:52:57 -0700 (Wed, 20 Jul 2016)
Log Message:
-----------
GNOME-3/stable: gnome-maps, temporary patch, MapQuest has disabled free public access to map tiles, use OSM Mapnik tiles instead, disable ability to switch to aerial tiles, increment revision (bz764841).
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile 2016-07-21 01:49:41 UTC (rev 150534)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile 2016-07-21 02:52:57 UTC (rev 150535)
@@ -6,6 +6,7 @@
name gnome-maps
version 3.20.1
+revision 1
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description Map application for GNOME 3.
@@ -46,10 +47,15 @@
depends_run port:gnome-themes-standard \
port:yelp
-configure.args --disable-silent-rules
-
gobject_introspection yes
+# 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
+
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
@@ -58,6 +64,8 @@
configure.cmd ./autogen.sh
+configure.args --disable-silent-rules
+
platform darwin {
if {${configure.cxx_stdlib} eq "libstdc++"} {
version 3.18.2
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-disable-switch-between-street-and-aerial-tiles.diff 2016-07-21 02:52:57 UTC (rev 150535)
@@ -0,0 +1,114 @@
+From 6f8169421d619f7cf764f4dc0a0b6a16a3201c3b Mon Sep 17 00:00:00 2001
+From: Marcus Lundblad <ml at 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
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-maps/files/patch-stop-using-mapquest-tiles.diff 2016-07-21 02:52:57 UTC (rev 150535)
@@ -0,0 +1,28 @@
+From 47a2dbb02c71bd5be1bff7b295a03526dcbe5507 Mon Sep 17 00:00:00 2001
+From: Marcus Lundblad <ml at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160720/9a653780/attachment-0001.html>
More information about the macports-changes
mailing list