Bug#927780: unblock: geocode-glib/3.26.1-1
Control: block 925539 by -1
Control: block 924499 by -1
On Tue, 23 Apr 2019 at 07:56:08 +0100, Simon McVittie wrote:
> See attached for full diff.
Now actually attached.
> Fixes for RC bug #925539 (and its merged bugs #927728 and #927753) and
> probably also important bug #924499.
#924499 should maybe also be considered RC. I've confirmed that gnome-maps
doesn't crash with libgeocode-glib0 3.26.1-1 installed.
smcv
diffstat for geocode-glib-3.26.0 geocode-glib-3.26.1
NEWS | 6
debian/changelog | 8 +
debian/gbp.conf | 12 +
docs/geocode-glib-docs.xml | 1
docs/meson.build | 6
geocode-glib.doap | 2
geocode-glib/geocode-nominatim.c | 15 +-
geocode-glib/tests/geocode-glib.c | 23 +++
geocode-glib/tests/meson.build | 2
geocode-glib/tests/nominatim-data-type-change.json | 1
geocode-glib/tests/nominatim-place_rank.json | 1
glib-tap.mk | 135 ---------------------
meson.build | 2
tap-test | 5
14 files changed, 69 insertions(+), 150 deletions(-)
diff -Nru geocode-glib-3.26.0/debian/changelog geocode-glib-3.26.1/debian/changelog
--- geocode-glib-3.26.0/debian/changelog 2018-12-24 14:25:53.000000000 +0000
+++ geocode-glib-3.26.1/debian/changelog 2019-03-15 10:02:30.000000000 +0000
@@ -1,3 +1,11 @@
+geocode-glib (3.26.1-1) unstable; urgency=medium
+
+ * New upstream bugfix release
+ - Fix some crashes
+ * Update debian/gbp.conf for Debian GNOME conventions
+
+ -- Jeremy Bicha <jbicha@debian.org> Fri, 15 Mar 2019 06:02:30 -0400
+
geocode-glib (3.26.0-2) unstable; urgency=medium
* Use dh_missing --fail-missing
diff -Nru geocode-glib-3.26.0/debian/gbp.conf geocode-glib-3.26.1/debian/gbp.conf
--- geocode-glib-3.26.0/debian/gbp.conf 2018-12-24 14:25:53.000000000 +0000
+++ geocode-glib-3.26.1/debian/gbp.conf 2019-03-15 10:02:30.000000000 +0000
@@ -2,4 +2,16 @@
pristine-tar = True
debian-branch = debian/master
upstream-branch = upstream/latest
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
upstream-vcs-tag = %(version)s
+
+[pq]
+patch-numbers = False
diff -Nru geocode-glib-3.26.0/docs/geocode-glib-docs.xml geocode-glib-3.26.1/docs/geocode-glib-docs.xml
--- geocode-glib-3.26.0/docs/geocode-glib-docs.xml 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/docs/geocode-glib-docs.xml 2019-03-14 13:42:07.000000000 +0000
@@ -3,6 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
[
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
+ <!ENTITY version SYSTEM "version.xml">
]>
<book id="index">
<bookinfo>
diff -Nru geocode-glib-3.26.0/docs/meson.build geocode-glib-3.26.1/docs/meson.build
--- geocode-glib-3.26.0/docs/meson.build 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/docs/meson.build 2019-03-14 13:42:07.000000000 +0000
@@ -17,6 +17,12 @@
'geocode-nominatim-test.h',
]
+version_xml_conf = configuration_data()
+version_xml_conf.set('VERSION', meson.project_version())
+configure_file(input: 'version.xml.in',
+ output: 'version.xml',
+ configuration: version_xml_conf)
+
glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
docpath = join_paths(datadir, 'gtk-doc', 'html')
diff -Nru geocode-glib-3.26.0/geocode-glib/geocode-nominatim.c geocode-glib-3.26.1/geocode-glib/geocode-nominatim.c
--- geocode-glib-3.26.0/geocode-glib/geocode-nominatim.c 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/geocode-glib/geocode-nominatim.c 2019-03-14 13:42:07.000000000 +0000
@@ -390,9 +390,11 @@
place_type = GEOCODE_PLACE_TYPE_DRAINAGE;
} else if (g_strcmp0 (category, "boundary") == 0) {
if (g_strcmp0 (type, "administrative") == 0) {
+ const char *place_rank;
int rank;
- rank = atoi (g_hash_table_lookup (ht, "place_rank"));
+ place_rank = g_hash_table_lookup (ht, "place_rank");
+ rank = place_rank ? atoi (place_rank) : 0;
if (rank < 2)
place_type = GEOCODE_PLACE_TYPE_UNKNOWN;
@@ -1063,21 +1065,24 @@
}
for (i = 0; members[i] != NULL; i++) {
- const char *value = NULL;
+ char *value = NULL;
json_reader_read_member (reader, members[i]);
if (json_reader_is_value (reader)) {
JsonNode *node = json_reader_get_value (reader);
if (json_node_get_value_type (node) == G_TYPE_STRING) {
- value = json_node_get_string (node);
+ value = g_strdup (json_node_get_string (node));
if (value && *value == '\0')
- value = NULL;
+ g_clear_pointer (&value, g_free);
+ } else if (json_node_get_value_type (node) == G_TYPE_INT64) {
+ gint64 int_value = json_node_get_int (node);
+ value = g_strdup_printf ("%"G_GINT64_FORMAT, int_value);
}
}
if (value != NULL) {
- g_hash_table_insert (ht, g_strdup (members[i]), g_strdup (value));
+ g_hash_table_insert (ht, g_strdup (members[i]), value);
if (i == 0 && is_address) {
if (g_strcmp0 (members[i], "house_number") != 0)
diff -Nru geocode-glib-3.26.0/geocode-glib/tests/geocode-glib.c geocode-glib-3.26.1/geocode-glib/tests/geocode-glib.c
--- geocode-glib-3.26.0/geocode-glib/tests/geocode-glib.c 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/geocode-glib/tests/geocode-glib.c 2019-03-14 13:42:07.000000000 +0000
@@ -629,6 +629,19 @@
}
static void
+test_zero_distance (void)
+{
+ g_autoptr (GeocodeLocation) loca = NULL, locb = NULL;
+
+ /* 1600 Pennsylvania Ave NW, Washington, DC */
+ loca = geocode_location_new (38.898556, -77.037852, GEOCODE_LOCATION_ACCURACY_UNKNOWN);
+ /* 1600 Pennsylvania Ave NW, Washington, DC */
+ locb = geocode_location_new (38.898556, -77.037852, GEOCODE_LOCATION_ACCURACY_UNKNOWN);
+
+ g_assert_cmpfloat (geocode_location_get_distance_from (loca, locb), ==, 0.0);
+}
+
+static void
test_locale_format (void)
{
#if defined(__GLIBC__) && !defined(__UCLIBC__)
@@ -768,12 +781,15 @@
guint i;
struct {
const char *fname;
+ guint num_results;
const char *error;
const char *prop;
const char *value;
} tests[] = {
- { "nominatim-area.json", NULL, "area", "Guildford Park" },
- { "nominatim-no-results.json", "No matches found for request", NULL, NULL },
+ { "nominatim-area.json", 1, NULL, "area", "Guildford Park" },
+ { "nominatim-no-results.json", 1, "No matches found for request", NULL, NULL },
+ { "nominatim-data-type-change.json", 12, NULL, "osm_id", "335673748" },
+ { "nominatim-place_rank.json", 10, NULL, "osm_id", "2555133" },
};
for (i = 0; i < G_N_ELEMENTS (tests); i++) {
@@ -798,7 +814,7 @@
g_assert_cmpstr (error->message, ==, tests[i].error);
} else {
g_assert (list != NULL);
- g_assert_cmpint (g_list_length (list), ==, 1);
+ g_assert_cmpint (g_list_length (list), ==, tests[i].num_results);
}
if (list == NULL) {
@@ -914,6 +930,7 @@
g_test_add_func ("/geocode/search", test_search);
g_test_add_func ("/geocode/search_lat_long", test_search_lat_long);
g_test_add_func ("/geocode/distance", test_distance);
+ g_test_add_func ("/geocode/zero_distance", test_zero_distance);
g_test_add_func ("/geocode/osm_type", test_osm_type);
return g_test_run ();
}
diff -Nru geocode-glib-3.26.0/geocode-glib/tests/meson.build geocode-glib-3.26.1/geocode-glib/tests/meson.build
--- geocode-glib-3.26.0/geocode-glib/tests/meson.build 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/geocode-glib/tests/meson.build 2019-03-14 13:42:07.000000000 +0000
@@ -27,7 +27,9 @@
install_data('locale_format.json',
'locale_name.json',
'nominatim-area.json',
+ 'nominatim-data-type-change.json',
'nominatim-no-results.json',
+ 'nominatim-place_rank.json',
'nominatim-rio.json',
'osm_type0.json',
'osm_type1.json',
diff -Nru geocode-glib-3.26.0/geocode-glib/tests/nominatim-data-type-change.json geocode-glib-3.26.1/geocode-glib/tests/nominatim-data-type-change.json
--- geocode-glib-3.26.0/geocode-glib/tests/nominatim-data-type-change.json 1970-01-01 01:00:00.000000000 +0100
+++ geocode-glib-3.26.1/geocode-glib/tests/nominatim-data-type-change.json 2019-03-14 13:42:07.000000000 +0000
@@ -0,0 +1 @@
+[{"place_id":1484796,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":335673748,"boundingbox":["60.0684261","60.1084261","17.5353792","17.5753792"],"lat":"60.0884261","lon":"17.5553792","display_name":"Läby, Uppsala kommun, Uppsala län, Svealand, 74372, Sverige","place_rank":19,"category":"place","type":"village","importance":0.41732695533476405,"icon":"https://nominatim.openstreetmap.org/images/mapicons/poi_place_village.p.20.png","address":{"village":"Läby","county":"Uppsala kommun","state":"Uppsala län","postcode":"74372","country":"Sverige","country_code":"se"}},{"place_id":54443946,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":4362794461,"boundingbox":["59.8285267","59.8685267","17.5027922","17.5427922"],"lat":"59.8485267","lon":"17.5227922","display_name":"Läby, Uppsala kommun, Uppsala län, Svealand, 75592, Sverige","place_rank":19,"category":"place","type":"hamlet","importance":0.375,"icon":"https://nominatim.openstreetmap.org/images/mapicons/poi_place_village.p.20.png","address":{"hamlet":"Läby","county":"Uppsala kommun","state":"Uppsala län","postcode":"75592","country":"Sverige","country_code":"se"}},{"place_id":4523898,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":488567113,"boundingbox":["49.600219","49.640219","14.803646","14.843646"],"lat":"49.620219","lon":"14.823646","display_name":"Laby, okres Benešov, Středočeský kraj, Střední Čechy, 25706, Tjeckien","place_rank":19,"category":"place","type":"hamlet","importance":0.275,"icon":"https://nominatim.openstreetmap.org/images/mapicons/poi_place_village.p.20.png","address":{"hamlet":"Laby","county":"okres Benešov","state":"Střední Čechy","postcode":"25706","country":"Tjeckien","country_code":"cz"}},{"place_id":61965574,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":5054371008,"boundingbox":["48.5229788","48.5429788","3.4614936","3.4814936"],"lat":"48.5329788","lon":"3.4714936","display_name":"Laby, Saint-Nicolas-la-Chapelle, Nogent-sur-Seine, Aube, Grand Est, Metropolitan Frankrike, 10400, Frankrike","place_rank":20,"category":"place","type":"locality","importance":0.25,"icon":"https://nominatim.openstreetmap.org/images/mapicons/poi_place_village.p.20.png","address":{"locality":"Laby","village":"Saint-Nicolas-la-Chapelle","county":"Nogent-sur-Seine","state":"Grand Est","country":"Frankrike","postcode":"10400","country_code":"fr"}},{"place_id":678264,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":253146579,"boundingbox":["59.1090262","59.1490262","11.3477701","11.3877701"],"lat":"59.1290262","lon":"11.3677701","display_name":"Låby, Rød, Halden, Østfold, 1781, Norge","place_rank":20,"category":"place","type":"suburb","importance":0.25,"icon":"https://nominatim.openstreetmap.org/images/mapicons/poi_place_village.p.20.png","address":{"suburb":"Låby","hamlet":"Rød","county":"Østfold","postcode":"1781","country":"Norge","country_code":"no"}},{"place_id":198278042,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"relation","osm_id":426449,"boundingbox":["49.6147714","49.6299627","14.8122181","14.8417143"],"lat":"49.6223386","lon":"14.8278537750364","display_name":"Laby, Zvěstov, okres Benešov, Středočeský kraj, Střední Čechy, Tjeckien","place_rank":20,"category":"boundary","type":"administrative","importance":0.25,"icon":"https://nominatim.openstreetmap.org/images/mapicons/poi_boundary_administrative.p.20.png","address":{"suburb":"Laby","village":"Zvěstov","county":"okres Benešov","state":"Střední Čechy","country":"Tjeckien","country_code":"cz"}},{"place_id":252565848,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":6259990008,"boundingbox":["59.3303","59.3503","11.45645","11.47645"],"lat":"59.3403","lon":"11.46645","display_name":"Låby, Nakkjum, Rakkestad, Østfold, 1892, Norge","place_rank":20,"category":"place","type":"farm","importance":0.25,"address":{"farm":"Låby","hamlet":"Nakkjum","county":"Østfold","postcode":"1892","country":"Norge","country_code":"no"}},{"place_id":199085752,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"relation","osm_id":7535162,"boundingbox":["54.0451","54.04999","27.03332","27.04053"],"lat":"54.0479636","lon":"27.0380371","display_name":"Лабы;, Раковский сельский Совет, Воложинский район, Минская область, Vitryssland","place_rank":20,"category":"boundary","type":"administrative","importance":0.25,"icon":"https://nominatim.openstreetmap.org/images/mapicons/poi_boundary_administrative.p.20.png","address":{"suburb":"Лабы","city":"Раковский; сельский Совет","county":"Воложинский район","state":"Минская область","country":"Vitryssland","country_code":"by"}},{"place_id":26706407,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":2586479869,"boundingbox":["59.848771","59.848871","17.5328345","17.5329345"],"lat":"59.848821","lon":"17.5328845","display_name":"Läby, 72, Kvarnbolund, Kristineberg, Läby, Uppsala kommun, Uppsala län, Svealand, 75592, Sverige","place_rank":30,"category":"highway","type":"bus_stop","importance":0.101,"icon":"https://nominatim.openstreetmap.org/images/mapicons/transport_bus_stop2.p.20.png","address":{"bus_stop":"Läby","road":"72","neighbourhood":"Kvarnbolund","suburb":"Kristineberg","hamlet":"Läby","county":"Uppsala kommun","state":"Uppsala län","postcode":"75592","country":"Sverige","country_code":"se"}},{"place_id":26785299,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":2573658162,"boundingbox":["48.2139118","48.2140118","16.3295261","16.3296261"],"lat":"48.2139618","lon":"16.3295761","display_name":"Laby, Ottakringer Straße, KG Hernals, Ottakring, Wien, 1160, Österrike","place_rank":30,"category":"amenity","type":"cafe","importance":0.001,"icon":"https://nominatim.openstreetmap.org/images/mapicons/food_cafe.p.20.png","address":{"cafe":"Laby","road":"Ottakringer Straße","suburb":"KG Hernals","city_district":"Ottakring","state":"Wien","postcode":"1160","country":"Österrike","country_code":"at"}},{"place_id":5037437,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":564100750,"boundingbox":["49.6242619","49.6243619","14.8187762","14.8188762"],"lat":"49.6243119","lon":"14.8188262","display_name":"Laby, 01816, Bořkovice, Zvěstov, okres Benešov, Středočeský kraj, Střední Čechy, 25706, Tjeckien","place_rank":30,"category":"tourism","type":"information","importance":0.001,"icon":"https://nominatim.openstreetmap.org/images/mapicons/amenity_information.p.20.png","address":{"information":"Laby","road":"01816","suburb":"Bořkovice","village":"Zvěstov","county":"okres Benešov","state":"Střední Čechy","postcode":"25706","country":"Tjeckien","country_code":"cz"}},{"place_id":239522513,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":5919537959,"boundingbox":["60.3183959","60.3184959","19.996537","19.996637"],"lat":"60.3184459","lon":"19.996587","display_name":"Laby, Saltviksvägen, Näs, Saltvik, Ålands landsbygd, Landskapet Åland, Regional State Agency Åland, Åland, 22320, Finland","place_rank":30,"category":"highway","type":"bus_stop","importance":0.001,"icon":"https://nominatim.openstreetmap.org/images/mapicons/transport_bus_stop2.p.20.png","address":{"bus_stop":"Laby","road":"Saltviksvägen","suburb":"Näs","village":"Saltvik","county":"Åland","state_district":"Regional State Agency Åland","state":"Åland","postcode":"22320","country":"Finland","country_code":"fi"}}]
diff -Nru geocode-glib-3.26.0/geocode-glib/tests/nominatim-place_rank.json geocode-glib-3.26.1/geocode-glib/tests/nominatim-place_rank.json
--- geocode-glib-3.26.0/geocode-glib/tests/nominatim-place_rank.json 1970-01-01 01:00:00.000000000 +0100
+++ geocode-glib-3.26.1/geocode-glib/tests/nominatim-place_rank.json 2019-03-14 13:42:07.000000000 +0000
@@ -0,0 +1 @@
+[{"place_id":"159575959","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"relation","osm_id":"2555133","boundingbox":["55.4913076","55.9574097","37.290502","37.9674277"],"lat":"55.7506828","lon":"37.6174976","display_name":"Moskva, Центральный административный округ, Moskva, Centrální federální okruh, Ruská federace","category":"place","type":"city","importance":0.81231629038453,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_place_city.p.20.png","address":{"city":"Moskva","state_district":"Центральный административный округ","state":"Moskva","country":"Ruská federace","country_code":"ru"}},{"place_id":"159148837","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"relation","osm_id":"102269","boundingbox":["55.1421745","56.0212238","36.8031012","37.9674277"],"lat":"55.4792046","lon":"37.3273304","display_name":"Moskva, Centrální federální okruh, Ruská federace","category":"boundary","type":"administrative","importance":0.81231629038453,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_boundary_administrative.p.20.png","address":{"state":"Moskva","country":"Ruská federace","country_code":"ru"}},{"place_id":"158661492","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"relation","osm_id":"121430","boundingbox":["46.710912","46.758882","-117.0396979","-116.9620679"],"lat":"46.7323875","lon":"-117.000165","display_name":"Moscow, Latah County, Idaho, Spojené státy americké","category":"place","type":"city","importance":0.53629964602682,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_place_city.p.20.png","address":{"city":"Moscow","county":"Latah County","state":"Idaho","country":"Spojené státy americké","country_code":"us"}},{"place_id":"83209933","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"way","osm_id":"87186419","boundingbox":["25.2302669","25.2325261","55.1643501","55.1667109"],"lat":"25.2313998","lon":"55.1655538746233","display_name":"Moscow, Dubaj, دبي, Spojené arabské emiráty","category":"place","type":"island","importance":0.425,"address":{"island":"Moscow","city":"Dubaj","state":"دبي","country":"Spojené arabské emiráty","country_code":"ae"}},{"place_id":"158830575","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"relation","osm_id":"188588","boundingbox":["41.332327","41.359539","-75.5571869","-75.5055579"],"lat":"41.3367497","lon":"-75.518519","display_name":"Moscow, Lackawanna County, Pensylvánie, Spojené státy americké","category":"boundary","type":"administrative","importance":0.40496966945241,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_boundary_administrative.p.20.png","address":{"city":"Moscow","county":"Lackawanna County","state":"Pensylvánie","country":"Spojené státy americké","country_code":"us"}},{"place_id":"453497","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"node","osm_id":"157606151","boundingbox":["39.5237014","39.5637014","-79.0250272","-78.9850272"],"lat":"39.5437014","lon":"-79.0050272","display_name":"Moscow, Allegany County, Maryland, Spojené státy americké","category":"place","type":"hamlet","importance":0.37594331946278,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_place_village.p.20.png","address":{"hamlet":"Moscow","county":"Allegany County","state":"Maryland","country":"Spojené státy americké","country_code":"us"}},{"place_id":"421984","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"node","osm_id":"153805006","boundingbox":["37.3914401","37.4314401","-89.0725736","-89.0325736"],"lat":"37.4114401","lon":"-89.0525736","display_name":"Moscow, Union County, Illinois, Spojené státy americké","category":"place","type":"hamlet","importance":0.375,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_place_village.p.20.png","address":{"hamlet":"Moscow","county":"Union County","state":"Illinois","country":"Spojené státy americké","country_code":"us"}},{"place_id":"436343","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"node","osm_id":"154194549","boundingbox":["42.0302346","42.0702346","-84.5298798","-84.4898798"],"lat":"42.0502346","lon":"-84.5098798","display_name":"Moscow, Hillsdale County, Michigan, Spojené státy americké","category":"place","type":"village","importance":0.375,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_place_village.p.20.png","address":{"village":"Moscow","county":"Hillsdale County","state":"Michigan","country":"Spojené státy americké","country_code":"us"}},{"place_id":"390992","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"node","osm_id":"151964024","boundingbox":["43.6871833","43.7271833","-93.1182537","-93.0782537"],"lat":"43.7071833","lon":"-93.0982537","display_name":"Moscow, Freeborn County, Minnesota, Spojené státy americké","category":"place","type":"village","importance":0.375,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_place_village.p.20.png","address":{"village":"Moscow","county":"Freeborn County","state":"Minnesota","country":"Spojené státy americké","country_code":"us"}},{"place_id":"377384","licence":"Data © OpenStreetMap contributors, ODbL 1.0. http:\/\/www.openstreetmap.org\/copyright","osm_type":"node","osm_id":"151724752","boundingbox":["39.1463923","39.1863923","-94.5618989","-94.5218989"],"lat":"39.1663923","lon":"-94.5418989","display_name":"Moscow, Clay County, Missouri, Spojené státy americké","category":"place","type":"hamlet","importance":0.375,"icon":"https:\/\/nominatim.openstreetmap.org\/images\/mapicons\/poi_place_village.p.20.png","address":{"hamlet":"Moscow","county":"Clay County","state":"Missouri","country":"Spojené státy americké","country_code":"us"}}]
diff -Nru geocode-glib-3.26.0/geocode-glib.doap geocode-glib-3.26.1/geocode-glib.doap
--- geocode-glib-3.26.0/geocode-glib.doap 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/geocode-glib.doap 2019-03-14 13:42:07.000000000 +0000
@@ -10,7 +10,7 @@
Nominatim</description>
<category rdf:resource="http://api.gnome.org/doap-extensions#core"; />
<programming-language>C</programming-language>
- <homepage rdf:resource="http://git.gnome.org/browse/geocode-glib"; />
+ <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/geocode-glib/issues/"; />
<maintainer>
<foaf:Person>
<foaf:name>Jonas Danielsson</foaf:name>
diff -Nru geocode-glib-3.26.0/glib-tap.mk geocode-glib-3.26.1/glib-tap.mk
--- geocode-glib-3.26.0/glib-tap.mk 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/glib-tap.mk 1970-01-01 01:00:00.000000000 +0100
@@ -1,135 +0,0 @@
-# GLIB - Library of useful C routines
-
-TESTS_ENVIRONMENT= \
- G_TEST_SRCDIR="$(abs_srcdir)" \
- G_TEST_BUILDDIR="$(abs_builddir)" \
- G_DEBUG=gc-friendly \
- MALLOC_CHECK_=2 \
- MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
-LOG_COMPILER = $(top_srcdir)/tap-test
-
-NULL =
-
-# initialize variables for unconditional += appending
-BUILT_SOURCES =
-BUILT_EXTRA_DIST =
-CLEANFILES = *.log *.trs
-DISTCLEANFILES =
-MAINTAINERCLEANFILES =
-EXTRA_DIST =
-TESTS =
-
-installed_test_LTLIBRARIES =
-installed_test_PROGRAMS =
-installed_test_SCRIPTS =
-nobase_installed_test_DATA =
-
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-noinst_SCRIPTS =
-noinst_DATA =
-
-check_LTLIBRARIES =
-check_PROGRAMS =
-check_SCRIPTS =
-check_DATA =
-
-# We support a fairly large range of possible variables. It is expected that all types of files in a test suite
-# will belong in exactly one of the following variables.
-#
-# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
-#
-# test_programs, test_scripts, test_data, test_ltlibraries
-#
-# The above are used to list files that are involved in both uninstalled and installed testing. The
-# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
-# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
-# installed in the same way as it appears in the package layout.
-#
-# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
-# like so:
-#
-# installed_test_programs, uninstalled_test_programs
-# installed_test_scripts, uninstalled_test_scripts
-# installed_test_data, uninstalled_test_data
-# installed_test_ltlibraries, uninstalled_test_ltlibraries
-#
-# Additionally, we support 'extra' infixes for programs and scripts. This is used for support programs/scripts
-# that should not themselves be run as testcases (but exist to be used from other testcases):
-#
-# test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
-# test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
-#
-# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
-# file automatically end up in the tarball.
-#
-# dist_test_scripts, dist_test_data, dist_test_extra_scripts
-# dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
-# dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
-#
-# Note that no file is automatically disted unless it appears in one of the dist_ variables. This follows the
-# standard automake convention of not disting programs scripts or data by default.
-#
-# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
-# variants) will be run as part of the in-tree 'make check'. These are all assumed to be runnable under
-# gtester. That's a bit strange for scripts, but it's possible.
-
-TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
- $(dist_test_scripts) $(dist_uninstalled_test_scripts)
-
-# Note: build even the installed-only targets during 'make check' to ensure that they still work.
-# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
-# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
-# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
-all_test_programs = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
- $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
-all_test_scripts = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
- $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
-all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
- $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
-all_test_scripts += $(all_dist_test_scripts)
-EXTRA_DIST += $(all_dist_test_scripts)
-all_test_data = $(test_data) $(uninstalled_test_data) $(installed_test_data)
-all_dist_test_data = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
-all_test_data += $(all_dist_test_data)
-EXTRA_DIST += $(all_dist_test_data)
-all_test_ltlibs = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
-
-if ENABLE_ALWAYS_BUILD_TESTS
-noinst_LTLIBRARIES += $(all_test_ltlibs)
-noinst_PROGRAMS += $(all_test_programs)
-noinst_SCRIPTS += $(all_test_scripts)
-noinst_DATA += $(all_test_data)
-else
-check_LTLIBRARIES += $(all_test_ltlibs)
-check_PROGRAMS += $(all_test_programs)
-check_SCRIPTS += $(all_test_scripts)
-check_DATA += $(all_test_data)
-endif
-
-if ENABLE_INSTALLED_TESTS
-installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
- $(test_extra_programs) $(installed_test_extra_programs)
-installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
- $(test_extra_scripts) $(installed_test_extra_scripts)
-installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
- $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
-nobase_installed_test_DATA += $(test_data) $(installed_test_data)
-nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
-installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
-installed_testcases = $(test_programs) $(installed_test_programs) \
- $(test_scripts) $(installed_test_scripts) \
- $(dist_test_scripts) $(dist_installed_test_scripts)
-
-installed_test_meta_DATA = $(installed_testcases:=.test)
-
-%.test: %$(EXEEXT) Makefile
- $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
- echo 'Type=session' >> $@.tmp; \
- echo 'Exec=$(installed_testdir)/$(notdir $<) --tap' >> $@.tmp; \
- echo 'Output=TAP' >> $@.tmp; \
- mv $@.tmp $@)
-
-CLEANFILES += $(installed_test_meta_DATA)
-endif
diff -Nru geocode-glib-3.26.0/meson.build geocode-glib-3.26.1/meson.build
--- geocode-glib-3.26.0/meson.build 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/meson.build 2019-03-14 13:42:07.000000000 +0000
@@ -1,4 +1,4 @@
-project('geocode-glib', 'c', version: '3.26.0')
+project('geocode-glib', 'c', version: '3.26.1')
gclib_version = meson.project_version() # set in project() below
ver_arr = gclib_version.split('.')
diff -Nru geocode-glib-3.26.0/NEWS geocode-glib-3.26.1/NEWS
--- geocode-glib-3.26.0/NEWS 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/NEWS 2019-03-14 13:42:07.000000000 +0000
@@ -1,3 +1,9 @@
+3.26.1
+------
+
+- Fix crashes caused by Nominatim server changes
+- Fix warnings when building the API documentation
+
3.26.0
------
diff -Nru geocode-glib-3.26.0/tap-test geocode-glib-3.26.1/tap-test
--- geocode-glib-3.26.0/tap-test 2018-06-05 12:03:42.000000000 +0100
+++ geocode-glib-3.26.1/tap-test 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# run a GTest in tap mode. The test binary is passed as $1
-
-$1 -k --tap
Reply to: