[arch-commits] Commit in gottengeography/trunk (3 files)

[Balló György]

    Date: Monday, January 15, 2018 @ 20:00:27
  Author: bgyorgy
Revision: 282843

upgpkg: gottengeography 2.5-5

Don't crash if Gtk.show_uri fails, Remove discontinued MapQuest service

Added:
  gottengeography/trunk/fix-show-uri.patch
  gottengeography/trunk/remove-mapquest.patch
Modified:
  gottengeography/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   18 +++++++++++++--
 fix-show-uri.patch    |   55 ++++++++++++++++++++++++++++++++++++++++++++++++
 remove-mapquest.patch |   16 +++++++++++++
 3 files changed, 86 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-15 19:59:40 UTC (rev 282842)
+++ PKGBUILD	2018-01-15 20:00:27 UTC (rev 282843)
@@ -4,7 +4,7 @@
 pkgname=gottengeography
 pkgver=2.5
 _gitrev=dd98beb826da62f430d51749dfa340af3620053c
-pkgrel=4
+pkgrel=5
 pkgdesc='Easy to use photo geotagging application for the GNOME desktop'
 arch=('any')
 url='https://launchpad.net/gottengeography'
@@ -12,13 +12,25 @@
 depends=('libchamplain' 'libgexiv2' 'python-dateutil' 'python-gobject')
 makedepends=('python-distutils-extra')
 source=($pkgname-$pkgver.tar.gz::https://git.launchpad.net/gottengeography/snapshot/$pkgname-$_gitrev.tar.gz
-        fixes.patch)
+        fixes.patch
+        fix-show-uri.patch
+        remove-mapquest.patch)
 sha256sums=('510e6cb9d2e5ca5f103d8b5c0203a4d6e7f886cf5213aff907d99bd3f726b000'
-            'e0f2115a1bbc6fefd60d3018567180a69cf9e502ecef8d92cb525b5fda8f1351')
+            'e0f2115a1bbc6fefd60d3018567180a69cf9e502ecef8d92cb525b5fda8f1351'
+            '5a930bb0a8d04d67659345570e4b96c0e36f673eb6cc32708cf670a58cb60a43'
+            'a7dd2cd240ee10c99efc92baeec177f9635d0d1f23e24d3ae0d50d9907834688')
 
 prepare() {
 	cd $pkgname-$_gitrev
+
+	# Various fixes
 	patch -Np1 -i ../fixes.patch
+
+	# Don't crash if Gtk.show_uri fails
+	patch -Np1 -i ../fix-show-uri.patch
+
+	# Remove discontinued MapQuest service
+	patch -Np1 -i ../remove-mapquest.patch
 }
 
 build() {

Added: fix-show-uri.patch
===================================================================
--- fix-show-uri.patch	                        (rev 0)
+++ fix-show-uri.patch	2018-01-15 20:00:27 UTC (rev 282843)
@@ -0,0 +1,55 @@
+diff --git a/gg/app.py b/gg/app.py
+index 424796c..ef39601 100644
+--- a/gg/app.py
++++ b/gg/app.py
+@@ -68,8 +68,6 @@ def startup(self):
+     Binding(center, 'coords', CoordLabel, 'text')
+     center.timeout_seconds = 10 # Only update titlebar every 10 seconds
+ 
+-    screen = Gdk.Screen.get_default()
+-
+     # Toolbar bindings.
+     click_handlers = {
+         'open':
+@@ -84,16 +82,13 @@ def startup(self):
+         'about':
+             lambda *ignore: Widgets.about.run() and Widgets.about.hide(),
+         'help':
+-            lambda *ignore: Gtk.show_uri(screen,
+-                'help:gottengeography', Gdk.CURRENT_TIME),
++            self.open_help,
+         'jump':
+             self.jump_to_photo,
+         'apply':
+             self.apply_selected_photos,
+         'map_source_menu':
+-            lambda *ignore: Gtk.show_uri(
+-                screen, 'http://maps.google.com/maps?q={},{}'.format(
+-                center.latitude, center.longitude), Gdk.CURRENT_TIME),
++            self.map_source_menu,
+     }
+     for name, handler in click_handlers.items():
+         button = Widgets[name + '_button']
+@@ -210,6 +205,22 @@ class GottenGeography(Gtk.Application):
+             MapView.emit('realize')
+             MapView.center_on(photo.latitude, photo.longitude)
+ 
++    def open_help(self, *ignore):
++        screen = Gdk.Screen.get_default()
++        try:
++            Gtk.show_uri(screen, 'help:gottengeography', Gdk.CURRENT_TIME),
++        except GLib.GError:
++            pass
++
++    def map_source_menu(self, *ignore):
++        screen = Gdk.Screen.get_default()
++        lat, lon = MapView.get_center_latitude(), MapView.get_center_longitude()
++        try:
++            Gtk.show_uri(screen, 'http://maps.google.com/maps?q={},{}'.format(
++                lat, lon), Gdk.CURRENT_TIME),
++        except GLib.GError:
++            pass
++
+     def update_preview(self, chooser, image):
+         """Display photo thumbnail and geotag data in file chooser."""
+         image.set_from_stock(Gtk.STOCK_FILE, Gtk.IconSize.DIALOG)

Added: remove-mapquest.patch
===================================================================
--- remove-mapquest.patch	                        (rev 0)
+++ remove-mapquest.patch	2018-01-15 20:00:27 UTC (rev 282843)
@@ -0,0 +1,16 @@
+diff --git a/gg/actor.py b/gg/actor.py
+index db6247e..ba0a585 100644
+--- a/gg/actor.py
++++ b/gg/actor.py
+@@ -45,11 +45,6 @@ for map_desc in [
+     'http://creativecommons.org/licenses/by-sa/2.0/',
+     'http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png'],
+ 
+-    ['mapquest-osm', 'MapQuest OSM', 0, 17, 256,
+-    'Map data provided by MapQuest, Open Street Map and contributors',
+-    'http://creativecommons.org/licenses/by-sa/2.0/',
+-    'http://otile1.mqcdn.com/tiles/1.0.0/osm/#Z#/#X#/#Y#.png'],
+-
+     ['mff-relief', 'Maps for Free Relief', 0, 11, 256,
+     'Map data available under GNU Free Documentation license, v1.2 or later',
+     'http://www.gnu.org/copyleft/fdl.html',