Bug#1038780: bookworm-pu: package gnome-maps/43.5-2~deb12u1
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: gnome-maps@packages.debian.org
Control: affects -1 + src:gnome-maps
[ Reason ]
Fix #1036936 (broken "Send to" dialog), import new upstream bugfix release
[ Impact ]
- #1036936: if another geo: URL handler like josm or marble is installed,
gnome-maps will be unable to send locations to it
- gnome-maps#546, no Debian bug open: map tiles do not always redraw
properly (for example when zooming in), because an animation causes
gnome-maps to hit a rate limit in the remote map tile server
I would rate both as 'important' in Debian terms.
[ Tests ]
I reproduced #1036936 on a bookworm system and confirmed that it is fixed
with the proposed version. I wasn't able to reproduce gnome-maps#546 with
either the old version or the proposed version, but Fedora's openQA
apparently catches it fairly reliably.
The proposed version is a simple rebuild of the version in unstable, which
should migrate to testing later this week.
[ Risks ]
Low risk: targeted fixes to a leaf package.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
ui/open-with-row.ui, src/sendToDialog.js: Fix #1036936
src/mapWalker.js: Fix gnome-maps#546
Everything else: Packaging administrivia for the new upstream release
and the downstream bookworm branch
debdiff *.dsc | filterdiff -p1 -x'po/*.po' -x'debian/patches/*.patch'
diffstat for gnome-maps-43.4 gnome-maps-43.5
NEWS | 13
data/org.gnome.Maps.appdata.xml.in.in | 7
data/ui/open-with-row.ui | 19
debian/changelog | 36
debian/control | 2
debian/control.in | 2
debian/gbp.conf | 4
debian/lintian-overrides | 2
debian/patches/sendToDialog-Unbreak-OpenWithRows.patch | 78
debian/patches/series | 3
debian/patches/transitArrivalRow-Disable-go-to-animation-when-clicked.patch | 37
debian/patches/transitLegRow-Disable-go-to-animation-when-clicked.patch | 41
debian/watch | 2
meson.build | 2
po/en_GB.po | 1307 +++++-----
src/mapWalker.js | 9
src/sendToDialog.js | 6
src/transitArrivalRow.js | 12
src/transitLegRow.js | 13
19 files changed, 957 insertions(+), 638 deletions(-)
diff -Nru gnome-maps-43.4/data/org.gnome.Maps.appdata.xml.in.in gnome-maps-43.5/data/org.gnome.Maps.appdata.xml.in.in
--- gnome-maps-43.4/data/org.gnome.Maps.appdata.xml.in.in 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/data/org.gnome.Maps.appdata.xml.in.in 2023-03-18 08:17:54.000000000 +0000
@@ -31,6 +31,13 @@
</screenshot>
</screenshots>
<releases>
+ <release date="2023-03-18" version="43.5">
+ <description>
+ <ul>
+ <li>Disable the go-to animation to avoid getting throttled by the tile server</li>
+ </ul>
+ </description>
+ </release>
<release date="2023-02-01" version="43.4">
<description>
<ul>
diff -Nru gnome-maps-43.4/data/ui/open-with-row.ui gnome-maps-43.5/data/ui/open-with-row.ui
--- gnome-maps-43.4/data/ui/open-with-row.ui 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/data/ui/open-with-row.ui 2023-06-21 11:24:45.000000000 +0100
@@ -1,29 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk" version="4.0"/>
<template class="Gjs_OpenWithRow" parent="GtkListBoxRow">
- <property name="visible">True</property>
- <child>
+ <property name="child">
<object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">12</property>
- <property name="margin">6</property>
+ <property name="margin-start">6</property>
+ <property name="margin-end">6</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
<child>
<object class="GtkImage" id="icon">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="pixel-size">32</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">start</property>
</object>
</child>
</object>
- </child>
+ </property>
</template>
</interface>
+
diff -Nru gnome-maps-43.4/debian/changelog gnome-maps-43.5/debian/changelog
--- gnome-maps-43.4/debian/changelog 2023-02-03 19:22:25.000000000 +0000
+++ gnome-maps-43.5/debian/changelog 2023-06-16 21:22:17.000000000 +0100
@@ -1,3 +1,39 @@
+gnome-maps (43.5-2~deb12u1) bookworm; urgency=medium
+
+ * Team upload
+ * Rebuild for Debian 12
+ * d/control.in, d/gbp.conf: Use debian/bookworm packaging branch
+
+ -- Simon McVittie <smcv@debian.org> Fri, 16 Jun 2023 21:22:17 +0100
+
+gnome-maps (43.5-2) unstable; urgency=medium
+
+ * Team upload
+ * d/p/transitArrivalRow-Disable-go-to-animation-when-clicked.patch,
+ d/p/transitLegRow-Disable-go-to-animation-when-clicked.patch:
+ Add patches from upstream 44.1 to disable more animations.
+ Like the one in v43.5, these avoid animations that can trigger the tile
+ server's rate limiting (gnome-maps#546 upstream).
+ * Add some more detail to the previous changelog entry
+ * d/control.in, d/gbp.conf: Use debian/trixie packaging branch
+ * d/lintian-overrides: Update overrides syntax
+
+ -- Simon McVittie <smcv@debian.org> Fri, 16 Jun 2023 10:50:45 +0100
+
+gnome-maps (43.5-1) unstable; urgency=medium
+
+ * New upstream bugfix release
+ - Disable an animation which caused too many tiles to be loaded from
+ the remote server, resulting in rate-limiting and failure to redraw
+ (gnome-maps#546 upstream)
+ - Translation updates: en_GB
+ * d/p/sendToDialog-Unbreak-OpenWithRows.patch:
+ Add patch from upstream gnome-43 branch to fix "Send to" dialog when
+ another geo: app is installed (Closes: #1036936)
+ * d/watch, d/gbp.conf: Use appropriate branches for bookworm
+
+ -- Jeremy Bícha <jbicha@ubuntu.com> Mon, 29 May 2023 15:51:47 -0400
+
gnome-maps (43.4-1) unstable; urgency=medium
* New upstream release
diff -Nru gnome-maps-43.4/debian/control gnome-maps-43.5/debian/control
--- gnome-maps-43.4/debian/control 2023-02-03 19:22:25.000000000 +0000
+++ gnome-maps-43.5/debian/control 2023-06-16 21:22:17.000000000 +0100
@@ -36,7 +36,7 @@
Standards-Version: 4.6.2
X-Ubuntu-Use-Langpack: yes
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-maps
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git -b debian/bookworm
Homepage: https://wiki.gnome.org/Apps/Maps
Package: gnome-maps
diff -Nru gnome-maps-43.4/debian/control.in gnome-maps-43.5/debian/control.in
--- gnome-maps-43.4/debian/control.in 2023-02-03 19:22:25.000000000 +0000
+++ gnome-maps-43.5/debian/control.in 2023-06-16 21:22:17.000000000 +0100
@@ -32,7 +32,7 @@
Standards-Version: 4.6.2
X-Ubuntu-Use-Langpack: yes
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-maps
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git -b debian/bookworm
Homepage: https://wiki.gnome.org/Apps/Maps
Package: gnome-maps
diff -Nru gnome-maps-43.4/debian/gbp.conf gnome-maps-43.5/debian/gbp.conf
--- gnome-maps-43.4/debian/gbp.conf 2023-02-03 19:22:25.000000000 +0000
+++ gnome-maps-43.5/debian/gbp.conf 2023-06-16 21:22:17.000000000 +0100
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/bookworm
+upstream-branch = upstream/43.x
[buildpackage]
sign-tags = True
diff -Nru gnome-maps-43.4/debian/lintian-overrides gnome-maps-43.5/debian/lintian-overrides
--- gnome-maps-43.4/debian/lintian-overrides 2023-02-03 19:22:25.000000000 +0000
+++ gnome-maps-43.5/debian/lintian-overrides 2023-06-16 21:22:17.000000000 +0100
@@ -1,2 +1,2 @@
# gnome-maps depends on libglib2.0-bin
-desktop-command-not-in-package usr/share/applications/org.gnome.Maps.desktop gapplication
+desktop-command-not-in-package gapplication [usr/share/applications/org.gnome.Maps.desktop]
diff -Nru gnome-maps-43.4/debian/patches/series gnome-maps-43.5/debian/patches/series
--- gnome-maps-43.4/debian/patches/series 2023-02-03 19:22:25.000000000 +0000
+++ gnome-maps-43.5/debian/patches/series 2023-06-16 21:22:17.000000000 +0100
@@ -0,0 +1,3 @@
+sendToDialog-Unbreak-OpenWithRows.patch
+transitArrivalRow-Disable-go-to-animation-when-clicked.patch
+transitLegRow-Disable-go-to-animation-when-clicked.patch
diff -Nru gnome-maps-43.4/debian/watch gnome-maps-43.5/debian/watch
--- gnome-maps-43.4/debian/watch 2023-02-03 19:22:25.000000000 +0000
+++ gnome-maps-43.5/debian/watch 2023-06-16 21:22:17.000000000 +0100
@@ -1,4 +1,4 @@
version=4
opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/, downloadurlmangle=s|cache.json||" \
https://download.gnome.org/sources/@PACKAGE@/cache.json \
- [\d.]+/@PACKAGE@-([\d.]+)@ARCHIVE_EXT@
+ 43/@PACKAGE@-([\d.]+)@ARCHIVE_EXT@
diff -Nru gnome-maps-43.4/meson.build gnome-maps-43.5/meson.build
--- gnome-maps-43.4/meson.build 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/meson.build 2023-03-18 08:17:54.000000000 +0000
@@ -1,5 +1,5 @@
project('gnome-maps', 'c',
- version: '43.4',
+ version: '43.5',
license: 'GPL-2.0-or-later',
meson_version: '>= 0.61.0',
)
diff -Nru gnome-maps-43.4/NEWS gnome-maps-43.5/NEWS
--- gnome-maps-43.4/NEWS 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/NEWS 2023-03-18 08:17:54.000000000 +0000
@@ -1,3 +1,16 @@
+43.5 - Mar 18, 2023
+=========================
+
+Changes since 43.4
+ - Disable the go-to animation to avoid getting throttled by the tile server
+
+Updated translations
+ - British English
+
+All contributors to this release
+Bruce Cowan <bruce@bcowan.me.uk>
+Marcus Lundblad <ml@dfupdate.se>
+
43.4 - Feb 1, 2023
=========================
diff -Nru gnome-maps-43.4/src/mapWalker.js gnome-maps-43.5/src/mapWalker.js
--- gnome-maps-43.4/src/mapWalker.js 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/src/mapWalker.js 2023-03-18 08:17:54.000000000 +0000
@@ -95,6 +95,15 @@
this.place.location.longitude].join(' '));
this._mapView.emit('going-to');
+ /*
+ * WORKAROUND!!!!
+ *
+ * For now disable the go-to animation to prevent getting
+ * throttled by the tile server:
+ * https://gitlab.gnome.org/GNOME/gnome-maps/-/issues/546
+ */
+ animate = false;
+
if (!animate) {
this._mapView.map.center_on(this.place.location.latitude,
this.place.location.longitude);
diff -Nru gnome-maps-43.4/src/sendToDialog.js gnome-maps-43.5/src/sendToDialog.js
--- gnome-maps-43.4/src/sendToDialog.js 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/src/sendToDialog.js 2023-06-21 11:24:45.000000000 +0100
@@ -246,12 +246,10 @@
}, SendToDialog);
export class OpenWithRow extends Gtk.ListBoxRow {
- constructor(params) {
- let appinfo = params.appinfo;
- delete params.appinfo;
-
+ constructor({ appinfo, ...params }) {
super(params);
+ this.appinfo = appinfo;
this._label.label = _("Open with %s").format(appinfo.get_name());
this._icon.gicon = appinfo.get_icon();
}
diff -Nru gnome-maps-43.4/src/transitArrivalRow.js gnome-maps-43.5/src/transitArrivalRow.js
--- gnome-maps-43.4/src/transitArrivalRow.js 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/src/transitArrivalRow.js 2023-06-21 11:24:45.000000000 +0100
@@ -48,7 +48,17 @@
}
_onPress(coord) {
- this._mapView.map.go_to_full(coord[0], coord[1], 16);
+ /*
+ * WORKAROUND!!!!
+ *
+ * For now disable the animation to prevent getting
+ * throttled by the tile server:
+ * https://gitlab.gnome.org/GNOME/gnome-maps/-/issues/546
+ */
+ this._mapView.map.center_on(coord[0], coord[1]);
+ this._mapView.map.viewport.zoom_level = 16;
+
+ //this._mapView.map.go_to_full(coord[0], coord[1], 16);
}
}
diff -Nru gnome-maps-43.4/src/transitLegRow.js gnome-maps-43.5/src/transitLegRow.js
--- gnome-maps-43.4/src/transitLegRow.js 2023-02-01 07:11:00.000000000 +0000
+++ gnome-maps-43.5/src/transitLegRow.js 2023-06-21 11:24:45.000000000 +0100
@@ -130,9 +130,22 @@
if (this._isExpanded) {
this._collaps();
} else {
+ /*
+ * WORKAROUND!!!!
+ *
+ * For now disable the animation to prevent getting
+ * throttled by the tile server:
+ * https://gitlab.gnome.org/GNOME/gnome-maps/-/issues/546
+ */
+ this._mapView.map.center_on(this._leg.fromCoordinate[0],
+ this._leg.fromCoordinate[1]);
+ this._mapView.map.viewport.zoom_level = 16;
+
+ /*
this._mapView.map.go_to_full(this._leg.fromCoordinate[0],
this._leg.fromCoordinate[1],
16);
+ */
if (this._hasIntructions())
this._expand();
}
Reply to: