[arch-commits] Commit in gottengeography/trunk (4 files)
Balló György
bgyorgy at archlinux.org
Thu Jan 9 11:22:08 UTC 2020
Date: Thursday, January 9, 2020 @ 11:22:08
Author: bgyorgy
Revision: 551007
upgpkg: gottengeography 2.5-9: Fix compatibility with python 3.8 (FS#64982), update to latest git snapshot
Modified:
gottengeography/trunk/PKGBUILD
gottengeography/trunk/fixes.patch
Deleted:
gottengeography/trunk/fix-show-uri.patch
gottengeography/trunk/remove-mapquest.patch
-----------------------+
PKGBUILD | 30 ++------
fix-show-uri.patch | 55 --------------
fixes.patch | 179 +++++++++++++++++++++++++++++++-----------------
remove-mapquest.patch | 16 ----
4 files changed, 128 insertions(+), 152 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-09 11:21:34 UTC (rev 551006)
+++ PKGBUILD 2020-01-09 11:22:08 UTC (rev 551007)
@@ -2,45 +2,35 @@
pkgname=gottengeography
pkgver=2.5
-_gitrev=dd98beb826da62f430d51749dfa340af3620053c
-pkgrel=8
+pkgrel=9
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
+makedepends=('git' 'python-distutils-extra')
+_commit=7ea816fcaad366a4c6be6b16725fc3e1bff57e4d # master
+source=("git+https://git.launchpad.net/gottengeography#commit=$_commit"
gottengeography.appdata.xml
- fixes.patch
- fix-show-uri.patch
- remove-mapquest.patch)
-sha256sums=('510e6cb9d2e5ca5f103d8b5c0203a4d6e7f886cf5213aff907d99bd3f726b000'
+ fixes.patch)
+sha256sums=('SKIP'
'8cf14124c72dd6213254ce0f3a8404916f30f2bd9b9350530760d77825632d75'
- 'e0f2115a1bbc6fefd60d3018567180a69cf9e502ecef8d92cb525b5fda8f1351'
- '5a930bb0a8d04d67659345570e4b96c0e36f673eb6cc32708cf670a58cb60a43'
- 'a7dd2cd240ee10c99efc92baeec177f9635d0d1f23e24d3ae0d50d9907834688')
+ '6adfc419b27dd2f10e787e5296d8904612aaf0cdca0d1f9949d37d42daf86047')
prepare() {
- cd $pkgname-$_gitrev
+ cd $pkgname
# 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
+ cd $pkgname
python setup.py build
}
package() {
- cd $pkgname-$_gitrev
+ cd $pkgname
python setup.py install --root="$pkgdir" --optimize=1
install -Dm644 ../gottengeography.appdata.xml "$pkgdir/usr/share/metainfo/gottengeography.appdata.xml"
}
Deleted: fix-show-uri.patch
===================================================================
--- fix-show-uri.patch 2020-01-09 11:21:34 UTC (rev 551006)
+++ fix-show-uri.patch 2020-01-09 11:22:08 UTC (rev 551007)
@@ -1,55 +0,0 @@
-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)
Modified: fixes.patch
===================================================================
--- fixes.patch 2020-01-09 11:21:34 UTC (rev 551006)
+++ fixes.patch 2020-01-09 11:22:08 UTC (rev 551007)
@@ -1,68 +1,125 @@
-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 <mail at marcoil.org></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
+index 41a6081..a57f589 100644
--- a/gg/actor.py
+++ b/gg/actor.py
-@@ -62,7 +62,7 @@ for map_desc in [
+@@ -41,11 +41,6 @@ MAP_DESCS = [
+ 'http://creativecommons.org/licenses/by-sa/2.0/',
+ 'http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png'],
- 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()))
+- ['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',
+diff --git a/gg/app.py b/gg/app.py
+index 28440b8..7269ee5 100644
+--- a/gg/app.py
++++ b/gg/app.py
+@@ -70,8 +70,6 @@ def startup(self):
+ Binding(center, 'coords', CoordLabel, 'text')
+ center.timeout_seconds = 10 # Only update titlebar every 10 seconds
- 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:
+- screen = Gdk.Screen.get_default()
+-
+ # Toolbar bindings.
+ click_handlers = {
+ 'open':
+@@ -86,16 +84,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']
+@@ -218,6 +213,22 @@ class GottenGeography(Gtk.Application):
+ MapView.emit('realize')
+ MapView.center_on(photo.latitude, photo.longitude)
- try:
- from dateutil.parser import parse
-- parse('') # Suppress pyflakes warning.
-+ parse('2017-05-14') # Suppress pyflakes warning.
- except:
- need('python3-dateutil 2.0')
++ 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)
+diff --git a/gg/xmlfiles.py b/gg/xmlfiles.py
+index b04a193..da73b0d 100644
+--- a/gg/xmlfiles.py
++++ b/gg/xmlfiles.py
+@@ -12,7 +12,7 @@ from re import compile as re_compile
+ from gettext import gettext as _
+ from os.path import basename
+ from calendar import timegm
+-from time import clock
++from time import perf_counter
+ from gg.camera import Camera
+ from gg.gpsmath import Coordinates
+@@ -197,7 +197,7 @@ class TrackFile():
+ Also time everything and report how long it took. Raises OSError if
+ the file extension is unknown, or no track points were found.
+ """
+- start_time = clock()
++ start_time = perf_counter()
+
+ try:
+ gpx = globals()[uri[-3:].upper() + 'File'](uri)
+@@ -206,7 +206,7 @@ class TrackFile():
+
+ Widgets.status_message(
+ _('%d points loaded in %.2fs.') %
+- (len(gpx.tracks), clock() - start_time), True)
++ (len(gpx.tracks), perf_counter() - start_time), True)
+
+ if len(gpx.tracks) < 2:
+ return
+@@ -227,7 +227,7 @@ class TrackFile():
+ self.widgets = Builder('trackfile')
+ self.append = None
+ self.tracks = {}
+- self.clock = clock()
++ self.clock = perf_counter()
+
+ self.gst = GSettings('trackfile', basename(filename))
+ if self.gst.get_string('start-timezone') is '':
+@@ -283,11 +283,11 @@ class TrackFile():
+
+ def element_end(self, name=None, state=None):
+ """Occasionally redraw the screen so the user can see activity."""
+- if clock() - self.clock > .2:
++ if perf_counter() - self.clock > .2:
+ self.progress.pulse()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+- self.clock = clock()
++ self.clock = perf_counter()
+
+ def destroy(self, button=None):
+ """Die a horrible death."""
Deleted: remove-mapquest.patch
===================================================================
--- remove-mapquest.patch 2020-01-09 11:21:34 UTC (rev 551006)
+++ remove-mapquest.patch 2020-01-09 11:22:08 UTC (rev 551007)
@@ -1,16 +0,0 @@
-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',
More information about the arch-commits
mailing list