Date: Saturday, December 11, 2021 @ 06:31:12
Author: foutrelis
Revision: 1068187
archrelease: copy trunk to community-testing-any
Added:
gottengeography/repos/community-testing-any/PKGBUILD
(from rev 1068186, gottengeography/trunk/PKGBUILD)
gottengeography/repos/community-testing-any/fixes.patch
(from rev 1068186, gottengeography/trunk/fixes.patch)
gottengeography/repos/community-testing-any/gottengeography.appdata.xml
(from rev 1068186, gottengeography/trunk/gottengeography.appdata.xml)
Deleted:
gottengeography/repos/community-testing-any/PKGBUILD
gottengeography/repos/community-testing-any/fixes.patch
gottengeography/repos/community-testing-any/gottengeography.appdata.xml
-----------------------------+
PKGBUILD | 71 ++++++-----
fixes.patch | 250 +++++++++++++++++++++---------------------
gottengeography.appdata.xml | 50 ++++----
3 files changed, 186 insertions(+), 185 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-11 06:31:07 UTC (rev 1068186)
+++ PKGBUILD 2021-12-11 06:31:12 UTC (rev 1068187)
@@ -1,35 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gottengeography
-pkgver=2.5
-pkgrel=11
-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=('git' 'python-distutils-extra')
-_commit=7ea816fcaad366a4c6be6b16725fc3e1bff57e4d # master
-source=("git+https://git.launchpad.net/gottengeography#commit=$_commit";
- 'gottengeography.appdata.xml'
- 'fixes.patch')
-sha256sums=('SKIP'
- '8cf14124c72dd6213254ce0f3a8404916f30f2bd9b9350530760d77825632d75'
- '6adfc419b27dd2f10e787e5296d8904612aaf0cdca0d1f9949d37d42daf86047')
-
-prepare() {
- cd $pkgname
- # Various fixes
- patch -Np1 -i ../fixes.patch
-}
-
-build() {
- cd $pkgname
- python setup.py build
-}
-
-package() {
- cd $pkgname
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- install -Dm644 ../gottengeography.appdata.xml
"$pkgdir/usr/share/metainfo/gottengeography.appdata.xml"
-}
Copied: gottengeography/repos/community-testing-any/PKGBUILD (from rev 1068186,
gottengeography/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-11 06:31:12 UTC (rev 1068187)
@@ -0,0 +1,36 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gottengeography
+pkgver=2.5
+pkgrel=12
+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=('git' 'python-distutils-extra')
+_commit=7ea816fcaad366a4c6be6b16725fc3e1bff57e4d # master
+source=("git+https://git.launchpad.net/gottengeography#commit=$_commit";
+ 'gottengeography.appdata.xml'
+ 'fixes.patch')
+sha256sums=('SKIP'
+ '8cf14124c72dd6213254ce0f3a8404916f30f2bd9b9350530760d77825632d75'
+ '6adfc419b27dd2f10e787e5296d8904612aaf0cdca0d1f9949d37d42daf86047')
+
+prepare() {
+ cd $pkgname
+ # Various fixes
+ patch -Np1 -i ../fixes.patch
+}
+
+build() {
+ cd $pkgname
+ python setup.py build
+}
+
+package() {
+ cd $pkgname
+ # adding --skip-build makes it not install usr/share/{help,locale}
+ python setup.py install --root="$pkgdir" --optimize=1
+ install -Dm644 ../gottengeography.appdata.xml
"$pkgdir/usr/share/metainfo/gottengeography.appdata.xml"
+}
Deleted: fixes.patch
===================================================================
--- fixes.patch 2021-12-11 06:31:07 UTC (rev 1068186)
+++ fixes.patch 2021-12-11 06:31:12 UTC (rev 1068187)
@@ -1,125 +0,0 @@
-diff --git a/gg/actor.py b/gg/actor.py
-index 41a6081..a57f589 100644
---- a/gg/actor.py
-+++ b/gg/actor.py
-@@ -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'],
-
-- ['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
-
-- 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)
-
-+ 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."""
Copied: gottengeography/repos/community-testing-any/fixes.patch (from rev
1068186, gottengeography/trunk/fixes.patch)
===================================================================
--- fixes.patch (rev 0)
+++ fixes.patch 2021-12-11 06:31:12 UTC (rev 1068187)
@@ -0,0 +1,125 @@
+diff --git a/gg/actor.py b/gg/actor.py
+index 41a6081..a57f589 100644
+--- a/gg/actor.py
++++ b/gg/actor.py
+@@ -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'],
+
+- ['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
+
+- 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)
+
++ 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: gottengeography.appdata.xml
===================================================================
--- gottengeography.appdata.xml 2021-12-11 06:31:07 UTC (rev 1068186)
+++ gottengeography.appdata.xml 2021-12-11 06:31:12 UTC (rev 1068187)
@@ -1,25 +0,0 @@
-<?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-testing-any/gottengeography.appdata.xml
(from rev 1068186, gottengeography/trunk/gottengeography.appdata.xml)
===================================================================
--- gottengeography.appdata.xml (rev 0)
+++ gottengeography.appdata.xml 2021-12-11 06:31:12 UTC (rev 1068187)
@@ -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>
