[150853] users/devans/GNOME-3/stable/dports/gnome/gnome-maps
devans at macports.org
devans at macports.org
Sat Jul 30 22:24:15 PDT 2016
Revision: 150853
https://trac.macports.org/changeset/150853
Author: devans at macports.org
Date: 2016-07-30 22:24:15 -0700 (Sat, 30 Jul 2016)
Log Message:
-----------
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.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-maps/Portfile
Removed 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-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)
@@ -5,8 +5,7 @@
PortGroup gobject_introspection 1.0
name gnome-maps
-version 3.20.1
-revision 1
+version 3.20.2
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description Map application for GNOME 3.
@@ -21,8 +20,8 @@
use_xz yes
-checksums rmd160 278527a584c46acb7b198ebab9e9c15a8128b2cb \
- sha256 4874d10a3cfdffd5d1db6084d67b5e8dc8c2db2ff995302b80060ecfc5e99bd5
+checksums rmd160 6cb4f05d5b37b34614885f0b8c982130e744e9ce \
+ sha256 e860144795339fdbb2f1239c4db092ad12beb9acaa3f3f8aa1d935c36d86bc3f
depends_build port:pkgconfig \
port:intltool \
@@ -49,13 +48,6 @@
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 {
@@ -68,10 +60,11 @@
platform darwin {
if {${configure.cxx_stdlib} eq "libstdc++"} {
- version 3.18.2
- revision 1
- checksums rmd160 aecfc78e6299cea8328a8803037141ee15f13fc2 \
- sha256 693ff1559252eabe5d8c9c7354333b5aa1996e870936456d15706a0e0bac9278
+ version 3.18.3
+ set branch [join [lrange [split ${version} .] 0 1] .]
+ master_sites gnome:sources/${name}/${branch}/
+ checksums rmd160 48567c80b517e8982a57b3e3e9ed6b8d126dd31e \
+ sha256 b164eda021a88cc7ec6773fd48428d102334b98cc196d69fa0186258b9c8b6ed
} else {
depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
}
Deleted: 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 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)
@@ -1,114 +0,0 @@
-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
Deleted: 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 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)
@@ -1,28 +0,0 @@
-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/20160730/f948cb41/attachment.html>
More information about the macports-changes
mailing list