1 |
commit: aa3311232e12c2d683374e116fe7dbb8ec361164 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 2 02:06:44 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 2 02:18:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa331123 |
7 |
|
8 |
sci-geosciences/gnome-maps: Version bump to 43.2 |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
sci-geosciences/gnome-maps/Manifest | 1 + |
13 |
...est-Fix-tests-for-time-formats-with-diffe.patch | 58 ++++++++++++++++++++++ |
14 |
sci-geosciences/gnome-maps/gnome-maps-43.2.ebuild | 53 ++++++++++++++++++++ |
15 |
3 files changed, 112 insertions(+) |
16 |
|
17 |
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest |
18 |
index ae98f9e4d981..a848365a4616 100644 |
19 |
--- a/sci-geosciences/gnome-maps/Manifest |
20 |
+++ b/sci-geosciences/gnome-maps/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb |
23 |
DIST gnome-maps-43.0.tar.xz 2330656 BLAKE2B 117a3558e29abe6a1bd29cf347b20a9e33f2b1cabd5310f28e387685e0bde96d1ce371c88616914f298e25ffbbc72b4d29e4fa721994b184e88289c6d0236ea0 SHA512 70966d6a092a67eb6a3a62627666376a71767d9296e00489a5aff281793425d9edd5e978deaf47bbd7d6b0ce37b53cf724b73487e101554c7984456661e193fc |
24 |
DIST gnome-maps-43.1.tar.xz 2329212 BLAKE2B 6597597dcf5b056a33670f502c3ab0b9658b6cac5e72896f5363034649ddf01fe9ae2a275dbd1a298b0dd1850b8a9c625fff02a15c998fd0e296f794aedf7b0e SHA512 f4eafdf6b81a23567d526ae51842e391c7b3e585967abb2b6a38ab1a361de77a69ebbf01939f3a328990fe3f623f4bd40a720f776c27af07acb27b2222b75a12 |
25 |
+DIST gnome-maps-43.2.tar.xz 2334324 BLAKE2B a8daacd9874e9b8d44ae6107b7cc1a0a4a168d579b4101e4da408c08e2509f7da782605b27d089331d3628584783f3fd1d43c26d3bc7b09325810dec7b9b1648 SHA512 dfd7eba5fc0cc38152753d2d3b5ba13cdc614b96fe3f8e6629dc6c56515108fc6f2469f32629ffaba97667b15da294d874653d9133dd13592738379d5fb91c78 |
26 |
|
27 |
diff --git a/sci-geosciences/gnome-maps/files/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch b/sci-geosciences/gnome-maps/files/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch |
28 |
new file mode 100644 |
29 |
index 000000000000..95891953a30c |
30 |
--- /dev/null |
31 |
+++ b/sci-geosciences/gnome-maps/files/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch |
32 |
@@ -0,0 +1,58 @@ |
33 |
+From bec3d2f26de1b3a8c8b7e603f6d6a46c853426fa Mon Sep 17 00:00:00 2001 |
34 |
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@×××××××.com> |
35 |
+Date: Fri, 28 Oct 2022 01:05:28 +0200 |
36 |
+Subject: [PATCH] tests/timeTest: Fix tests for time formats with different |
37 |
+ kind of spaces |
38 |
+ |
39 |
+Time.format does not warranty the character used for spaces, neither |
40 |
+that it will not introduce preceding byte order marks. Solve it by |
41 |
+comparing inclusion of the data and that it finishes with AM or PM. |
42 |
+ |
43 |
+Closes #506 |
44 |
+--- |
45 |
+ tests/timeTest.js | 15 ++++++++++----- |
46 |
+ 1 file changed, 10 insertions(+), 5 deletions(-) |
47 |
+ |
48 |
+diff --git a/tests/timeTest.js b/tests/timeTest.js |
49 |
+index 96803f2f..d025e8e8 100644 |
50 |
+--- a/tests/timeTest.js |
51 |
++++ b/tests/timeTest.js |
52 |
+@@ -23,6 +23,11 @@ const JsUnit = imports.jsUnit; |
53 |
+ |
54 |
+ import * as Time from './time.js'; |
55 |
+ |
56 |
++function compare12HourTime(format, hoursMinutes, AMPM) { |
57 |
++ JsUnit.assertTrue(format.includes(hoursMinutes)); |
58 |
++ JsUnit.assertTrue(format.endsWith(AMPM)); |
59 |
++} |
60 |
++ |
61 |
+ function formatTimeWithTZOffsetTest() { |
62 |
+ // mock to always use 24 hour format |
63 |
+ Time._setIs12HourFunction(() => { return false; }); |
64 |
+@@ -35,8 +40,8 @@ function formatTimeWithTZOffsetTest() { |
65 |
+ // mock to always use 12 hour format |
66 |
+ Time._setIs12HourFunction(() => { return true; }); |
67 |
+ |
68 |
+- JsUnit.assertEquals('10:54 PM', |
69 |
+- Time.formatTimeWithTZOffset(1607982864000, 3600000)); |
70 |
++ compare12HourTime(Time.formatTimeWithTZOffset(1607982864000, 3600000), |
71 |
++ '10:54', 'PM'); |
72 |
+ } |
73 |
+ |
74 |
+ function formatTimeFromHoursAndMinsTest() { |
75 |
+@@ -50,9 +55,9 @@ function formatTimeFromHoursAndMinsTest() { |
76 |
+ // mock to always use 12 hour format |
77 |
+ Time._setIs12HourFunction(() => { return true; }); |
78 |
+ |
79 |
+- JsUnit.assertEquals('12:34 PM', Time.formatTimeFromHoursAndMins(12, 34)); |
80 |
+- JsUnit.assertEquals('12:00 AM', Time.formatTimeFromHoursAndMins(24, 0)); |
81 |
+- JsUnit.assertEquals('12:01 PM', Time.formatTimeFromHoursAndMins(12, 1)); |
82 |
++ compare12HourTime(Time.formatTimeFromHoursAndMins(12, 34), '12:34', 'PM'); |
83 |
++ compare12HourTime(Time.formatTimeFromHoursAndMins(24, 0), '12:00', 'AM'); |
84 |
++ compare12HourTime(Time.formatTimeFromHoursAndMins(12, 1), '12:01', 'PM'); |
85 |
+ } |
86 |
+ |
87 |
+ formatTimeWithTZOffsetTest(); |
88 |
+-- |
89 |
+2.37.4 |
90 |
+ |
91 |
|
92 |
diff --git a/sci-geosciences/gnome-maps/gnome-maps-43.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-43.2.ebuild |
93 |
new file mode 100644 |
94 |
index 000000000000..05e77806c2e9 |
95 |
--- /dev/null |
96 |
+++ b/sci-geosciences/gnome-maps/gnome-maps-43.2.ebuild |
97 |
@@ -0,0 +1,53 @@ |
98 |
+# Copyright 1999-2022 Gentoo Authors |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+ |
101 |
+EAPI=8 |
102 |
+ |
103 |
+inherit gnome.org gnome2-utils meson xdg |
104 |
+ |
105 |
+DESCRIPTION="A map application for GNOME" |
106 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps" |
107 |
+ |
108 |
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" |
109 |
+SLOT="0" |
110 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
111 |
+ |
112 |
+# Pure introspection dependencies found by grepping imports in ${S} |
113 |
+RDEPEND=" |
114 |
+ >=dev-libs/glib-2.66.0:2 |
115 |
+ >=dev-libs/gjs-1.69.2 |
116 |
+ >=dev-libs/gobject-introspection-0.10.1:= |
117 |
+ gui-libs/gtk:4[introspection] |
118 |
+ >=app-misc/geoclue-0.12.99:2.0[introspection] |
119 |
+ >=gui-libs/libadwaita-1.0:1[introspection] |
120 |
+ >=dev-libs/libgweather-4.2.0:4=[introspection] |
121 |
+ >=sci-geosciences/geocode-glib-3.15.2:2[introspection] |
122 |
+ >=media-libs/libshumate-1.0:1.0=[introspection] |
123 |
+ dev-libs/libxml2:2 |
124 |
+ >=net-libs/rest-0.9.1:1.0[introspection] |
125 |
+ |
126 |
+ app-crypt/libsecret[introspection] |
127 |
+ media-libs/graphene[introspection] |
128 |
+ net-libs/libsoup:3.0[introspection] |
129 |
+ x11-libs/pango[introspection] |
130 |
+" |
131 |
+DEPEND="${RDEPEND}" |
132 |
+BDEPEND=" |
133 |
+ dev-util/glib-utils |
134 |
+ >=sys-devel/gettext-0.19.8 |
135 |
+ virtual/pkgconfig |
136 |
+" |
137 |
+ |
138 |
+PATCHES=( |
139 |
+ "${FILESDIR}"/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch |
140 |
+) |
141 |
+ |
142 |
+pkg_postinst() { |
143 |
+ xdg_pkg_postinst |
144 |
+ gnome2_schemas_update |
145 |
+} |
146 |
+ |
147 |
+pkg_postrm() { |
148 |
+ xdg_pkg_postrm |
149 |
+ gnome2_schemas_update |
150 |
+} |