1 |
commit: 81d5316516c330c46ed86cc3e23409d7a36e535a |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 3 23:53:40 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 4 00:07:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d53165 |
7 |
|
8 |
sci-geosciences/geocode-glib: Version bump to 3.26.3 |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
sci-geosciences/geocode-glib/Manifest | 1 + |
13 |
.../files/3.26.3-tests-Fix-locale-in-pi-test.patch | 43 +++++++++++++++++++++ |
14 |
.../geocode-glib/geocode-glib-3.26.3.ebuild | 45 ++++++++++++++++++++++ |
15 |
3 files changed, 89 insertions(+) |
16 |
|
17 |
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest |
18 |
index 373e7b16b678..882ba5a4e1a7 100644 |
19 |
--- a/sci-geosciences/geocode-glib/Manifest |
20 |
+++ b/sci-geosciences/geocode-glib/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST geocode-glib-3.26.2.tar.xz 72956 BLAKE2B 40a32fb0ba61cd91b28e57c518dc5450ce89a16889a335d19fe722c1088a4cdb085237d1fe24d08eeac62581ac68895a7a2b432d66f46fc4e03466485cfe5060 SHA512 b3ef81fac6959f6c4725ca721125cdafbbec69233f321872e17f9035266ed7616018ef54a9082fbd0a83395d18c664144cfe3b431d63744be433f058071cd435 |
23 |
+DIST geocode-glib-3.26.3.tar.xz 75148 BLAKE2B 8eba0cb40511a724cddcab659fe0720b0c0534d811c83f8a90d21b9153af242de2a69b2c882b3eb3008ac128d1631a2ac7692c5e000284579aade987334f6cce SHA512 42313b1da24f5256ad73bd4be366d6bacf35256acc098e4865bbff58e92c5b78f4a2537e4787c6387190f10a2be2a72bc1507f7cb436e096e772195cf30fca7c |
24 |
|
25 |
diff --git a/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch b/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch |
26 |
new file mode 100644 |
27 |
index 000000000000..5df7814383c0 |
28 |
--- /dev/null |
29 |
+++ b/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch |
30 |
@@ -0,0 +1,43 @@ |
31 |
+From c9bbf13d76600492565fa042638b48cb737e492d Mon Sep 17 00:00:00 2001 |
32 |
+From: Bastien Nocera <hadess@××××××.net> |
33 |
+Date: Sat, 2 Jul 2022 10:11:10 +0200 |
34 |
+Subject: [PATCH] tests: Fix locale in "pi" test |
35 |
+ |
36 |
+The test expects the locale to be en_GB.UTF-8, so set it as such. |
37 |
+ |
38 |
+Closes: #27 |
39 |
+--- |
40 |
+ geocode-glib/tests/geocode-glib.c | 6 ++++++ |
41 |
+ 1 file changed, 6 insertions(+) |
42 |
+ |
43 |
+diff --git a/geocode-glib/tests/geocode-glib.c b/geocode-glib/tests/geocode-glib.c |
44 |
+index f74d031..ef20716 100644 |
45 |
+--- a/geocode-glib/tests/geocode-glib.c |
46 |
++++ b/geocode-glib/tests/geocode-glib.c |
47 |
+@@ -410,10 +410,14 @@ test_pi (void) |
48 |
+ { |
49 |
+ g_autoptr (GHashTable) params = NULL; |
50 |
+ GeocodeForward *object; |
51 |
++ g_autofree char *old_locale = NULL; |
52 |
+ GError *error = NULL; |
53 |
+ GList *res; |
54 |
+ GeocodePlace *place; |
55 |
+ |
56 |
++ old_locale = g_strdup (setlocale(LC_ALL, NULL)); |
57 |
++ setlocale (LC_ALL, "en_GB.UTF-8"); |
58 |
++ |
59 |
+ /* The query parameters the mock server expects to receive. */ |
60 |
+ params = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL); |
61 |
+ add_attr_string (params, "q", "Jack Cole Building, St Andrews"); |
62 |
+@@ -439,6 +443,8 @@ test_pi (void) |
63 |
+ g_assert_cmpstr (geocode_place_get_street_address (place), ==, "North Haugh π"); |
64 |
+ g_object_unref (place); |
65 |
+ g_list_free (res); |
66 |
++ |
67 |
++ setlocale (LC_ALL, old_locale); |
68 |
+ } |
69 |
+ |
70 |
+ static void |
71 |
+-- |
72 |
+2.35.1 |
73 |
+ |
74 |
|
75 |
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild |
76 |
new file mode 100644 |
77 |
index 000000000000..f8360512af4b |
78 |
--- /dev/null |
79 |
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild |
80 |
@@ -0,0 +1,45 @@ |
81 |
+# Copyright 1999-2022 Gentoo Authors |
82 |
+# Distributed under the terms of the GNU General Public License v2 |
83 |
+ |
84 |
+EAPI=8 |
85 |
+inherit gnome.org meson xdg |
86 |
+ |
87 |
+DESCRIPTION="GLib helper library for geocoding services" |
88 |
+HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib" |
89 |
+ |
90 |
+LICENSE="LGPL-2+" |
91 |
+SLOT="0" |
92 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
93 |
+IUSE="gtk-doc +introspection test" |
94 |
+RESTRICT="!test? ( test )" |
95 |
+ |
96 |
+RDEPEND=" |
97 |
+ >=dev-libs/glib-2.44:2 |
98 |
+ >=dev-libs/json-glib-0.99.2[introspection?] |
99 |
+ >=net-libs/libsoup-2.42:2.4[introspection?] |
100 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
101 |
+" |
102 |
+DEPEND="${RDEPEND}" |
103 |
+BDEPEND=" |
104 |
+ dev-util/glib-utils |
105 |
+ gtk-doc? ( |
106 |
+ >=dev-util/gtk-doc-1.13 |
107 |
+ app-text/docbook-xml-dtd:4.3 |
108 |
+ ) |
109 |
+ >=sys-devel/gettext-0.19.8 |
110 |
+ virtual/pkgconfig |
111 |
+" |
112 |
+ |
113 |
+PATCHES=( |
114 |
+ "${FILESDIR}"/${PV}-tests-Fix-locale-in-pi-test.patch |
115 |
+) |
116 |
+ |
117 |
+src_configure() { |
118 |
+ local emesonargs=( |
119 |
+ -Denable-installed-tests=false |
120 |
+ $(meson_use introspection enable-introspection) |
121 |
+ $(meson_use gtk-doc enable-gtk-doc) |
122 |
+ -Dsoup2=true |
123 |
+ ) |
124 |
+ meson_src_configure |
125 |
+} |