Date: Monday, November 4, 2019 @ 05:40:43
Author: felixonmars
Revision: 523230
archrelease: copy trunk to community-staging-any
Added:
gottengeography/repos/community-staging-any/
gottengeography/repos/community-staging-any/PKGBUILD
(from rev 523229, gottengeography/trunk/PKGBUILD)
gottengeography/repos/community-staging-any/fix-show-uri.patch
(from rev 523229, gottengeography/trunk/fix-show-uri.patch)
gottengeography/repos/community-staging-any/fixes.patch
(from rev 523229, gottengeography/trunk/fixes.patch)
gottengeography/repos/community-staging-any/gottengeography.appdata.xml
(from rev 523229, gottengeography/trunk/gottengeography.appdata.xml)
gottengeography/repos/community-staging-any/remove-mapquest.patch
(from rev 523229, gottengeography/trunk/remove-mapquest.patch)
-----------------------------+
PKGBUILD | 46 ++++++++++++++++++++++++++++
fix-show-uri.patch | 55 +++++++++++++++++++++++++++++++++
fixes.patch | 68 ++++++++++++++++++++++++++++++++++++++++++
gottengeography.appdata.xml | 25 +++++++++++++++
remove-mapquest.patch | 16 +++++++++
5 files changed, 210 insertions(+)
Copied: gottengeography/repos/community-staging-any/PKGBUILD (from rev 523229,
gottengeography/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD (rev 0)
+++ community-staging-any/PKGBUILD 2019-11-04 05:40:43 UTC (rev 523230)
@@ -0,0 +1,46 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gottengeography
+pkgver=2.5
+_gitrev=dd98beb826da62f430d51749dfa340af3620053c
+pkgrel=8
+pkgdesc='Easy to use photo geotagging application for the GNOME desktop'
+arch=('any')
+url='https://launchpad.net/gottengeography'
+license=('GPL3')
+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
+ gottengeography.appdata.xml
+ fixes.patch
+ fix-show-uri.patch
+ remove-mapquest.patch)
+sha256sums=('510e6cb9d2e5ca5f103d8b5c0203a4d6e7f886cf5213aff907d99bd3f726b000'
+ '8cf14124c72dd6213254ce0f3a8404916f30f2bd9b9350530760d77825632d75'
+ '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() {
+ cd $pkgname-$_gitrev
+ python setup.py build
+}
+
+package() {
+ cd $pkgname-$_gitrev
+ python setup.py install --root="$pkgdir" --optimize=1
+ install -Dm644 ../gottengeography.appdata.xml
"$pkgdir/usr/share/metainfo/gottengeography.appdata.xml"
+}
Copied: gottengeography/repos/community-staging-any/fix-show-uri.patch (from
rev 523229, gottengeography/trunk/fix-show-uri.patch)
===================================================================
--- community-staging-any/fix-show-uri.patch (rev 0)
+++ community-staging-any/fix-show-uri.patch 2019-11-04 05:40:43 UTC (rev
523230)
@@ -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)
Copied: gottengeography/repos/community-staging-any/fixes.patch (from rev
523229, gottengeography/trunk/fixes.patch)
===================================================================
--- community-staging-any/fixes.patch (rev 0)
+++ community-staging-any/fixes.patch 2019-11-04 05:40:43 UTC (rev 523230)
@@ -0,0 +1,68 @@
+diff --git a/data/gottengeography.ui b/data/gottengeography.ui
+index cbbdeeb..a37bf76 100644
+--- a/data/gottengeography.ui
++++ b/data/gottengeography.ui
+@@ -938,37 +938,31 @@ Marc Ordinas i Llopis <[email protected]></property>
+ <object class="GtkSizeGroup" id="cameras_group">
+ <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
+ <widgets>
+- <placeholder />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="timezone_regions_group">
+ <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
+ <widgets>
+- <placeholder />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="timezone_cities_group">
+ <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
+ <widgets>
+- <placeholder />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="trackfiles_group">
+ <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
+ <widgets>
+- <placeholder />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="trackfile_colors_group">
+ <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
+ <widgets>
+- <placeholder />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="trackfile_unloads_group">
+ <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
+ <widgets>
+- <placeholder />
+ </widgets>
+ </object>
+ </interface>
+diff --git a/gg/actor.py b/gg/actor.py
+index db6247e..4fe2cfc 100644
+--- a/gg/actor.py
++++ b/gg/actor.py
+@@ -62,7 +62,7 @@ for map_desc in [
+
+ c.push(Champlain.NetworkTileSource.new_full(
+ mapid, name, lic, lic_uri, min_zoom, max_zoom,
+- size, Champlain.MapProjection.MAP_PROJECTION_MERCATOR,
++ size, Champlain.MapProjection.MERCATOR,
+ tile_uri, Champlain.ImageRenderer()))
+
+ c.push(Champlain.FileCache.new_full(1e8, None, Champlain.ImageRenderer()))
+diff --git a/gottengeography b/gottengeography
+index 34e3ee8..0a75b64 100755
+--- a/gottengeography
++++ b/gottengeography
+@@ -22,7 +22,7 @@ except:
+
+ try:
+ from dateutil.parser import parse
+- parse('') # Suppress pyflakes warning.
++ parse('2017-05-14') # Suppress pyflakes warning.
+ except:
+ need('python3-dateutil 2.0')
+
Copied: gottengeography/repos/community-staging-any/gottengeography.appdata.xml
(from rev 523229, gottengeography/trunk/gottengeography.appdata.xml)
===================================================================
--- community-staging-any/gottengeography.appdata.xml
(rev 0)
+++ community-staging-any/gottengeography.appdata.xml 2019-11-04 05:40:43 UTC
(rev 523230)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+ <id>net.launchpad.gottengeography</id>
+ <launchable type="desktop-id">gottengeography.desktop</launchable>
+ <name>GottenGeography</name>
+ <summary>Easily store geolocation data in your photographs</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0</project_license>
+ <description>
+ <p>An easy to use geotagging application for the GNOME desktop, which aims
to have a very streamlined and intuitive interface that makes it easy to apply
geotags to photographs. It supports both manual tagging (without any GPS
device), and is also quite good at automatic tagging with GPS data, and aims to
painlessly allow batch-tagging of large numbers of photographs.</p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+
<image>https://git.launchpad.net/gottengeography/plain/help/C/figures/01-edmonton.png</image>
+ </screenshot>
+ <screenshot>
+
<image>https://git.launchpad.net/gottengeography/plain/help/C/figures/02-load-gps.png</image>
+ </screenshot>
+ <screenshot>
+
<image>https://git.launchpad.net/gottengeography/plain/help/C/figures/03-load-photos.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="bugtracker">https://bugs.launchpad.net/gottengeography</url>
+ <url type="homepage">https://launchpad.net/gottengeography</url>
+</component>
Copied: gottengeography/repos/community-staging-any/remove-mapquest.patch (from
rev 523229, gottengeography/trunk/remove-mapquest.patch)
===================================================================
--- community-staging-any/remove-mapquest.patch (rev 0)
+++ community-staging-any/remove-mapquest.patch 2019-11-04 05:40:43 UTC (rev
523230)
@@ -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',
