From fad84fd611a4aaa7f3f44939b5f34564aa2ae90d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 20 2020 13:07:05 +0000 Subject: import geocode-glib-3.26.0-3.el7 --- diff --git a/SOURCES/place_rank-crasher.patch b/SOURCES/place_rank-crasher.patch new file mode 100644 index 0000000..b0ca5f6 --- /dev/null +++ b/SOURCES/place_rank-crasher.patch @@ -0,0 +1,105 @@ +From 24d842347a294fe19393f95c3ce98cc5de9bcabe Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 14 Mar 2019 01:22:39 +0100 +Subject: [PATCH 1/3] tests: Add test for issue #6 + +--- + geocode-glib/tests/geocode-glib.c | 1 + + geocode-glib/tests/meson.build | 1 + + geocode-glib/tests/nominatim-place_rank.json | 1 + + 3 files changed, 3 insertions(+) + create mode 100644 geocode-glib/tests/nominatim-place_rank.json + +diff --git a/geocode-glib/tests/geocode-glib.c b/geocode-glib/tests/geocode-glib.c +index 5da23e5..e7d6d84 100644 +--- a/geocode-glib/tests/geocode-glib.c ++++ b/geocode-glib/tests/geocode-glib.c +@@ -789,6 +789,7 @@ test_resolve_json (void) + { "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++) { +diff --git a/geocode-glib/tests/meson.build b/geocode-glib/tests/meson.build +index 61df92c..59a065c 100644 +--- a/geocode-glib/tests/meson.build ++++ b/geocode-glib/tests/meson.build +@@ -28,6 +28,7 @@ install_data('locale_format.json', + 'locale_name.json', + 'nominatim-area.json', + 'nominatim-no-results.json', ++ 'nominatim-place_rank.json', + 'nominatim-rio.json', + 'osm_type0.json', + 'osm_type1.json', +diff --git a/geocode-glib/tests/nominatim-place_rank.json b/geocode-glib/tests/nominatim-place_rank.json +new file mode 100644 +index 0000000..bb5f008 +--- /dev/null ++++ b/geocode-glib/tests/nominatim-place_rank.json +@@ -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"}}] +-- +2.26.0 + + +From e7216583a219df9d9eba21a7fe1b74543b6d5851 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 14 Mar 2019 01:23:19 +0100 +Subject: [PATCH 2/3] geocode-nominatim: Fix possible crash with missing + place_rank + +Spotted by Ordissimo + +Closes: #6 +--- + geocode-glib/geocode-nominatim.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/geocode-glib/geocode-nominatim.c b/geocode-glib/geocode-nominatim.c +index b2abc97..fc333dc 100644 +--- a/geocode-glib/geocode-nominatim.c ++++ b/geocode-glib/geocode-nominatim.c +@@ -390,9 +390,11 @@ get_place_type_from_attributes (GHashTable *ht) + 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; + +-- +2.26.0 + + +From 0d4f1bad55121dd70f38f68d64ea7d755634ebf1 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 14 Mar 2019 01:24:13 +0100 +Subject: [PATCH 3/3] tests: Fix missing installed-tests file + +--- + geocode-glib/tests/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/geocode-glib/tests/meson.build b/geocode-glib/tests/meson.build +index 59a065c..a64baaa 100644 +--- a/geocode-glib/tests/meson.build ++++ b/geocode-glib/tests/meson.build +@@ -27,6 +27,7 @@ test('Test mock backend', e) + 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', +-- +2.26.0 + diff --git a/SOURCES/type-change.patch b/SOURCES/type-change.patch new file mode 100644 index 0000000..5772f82 --- /dev/null +++ b/SOURCES/type-change.patch @@ -0,0 +1,102 @@ +From e1a6b067dc42618992787e84aadad2ca27ae0017 Mon Sep 17 00:00:00 2001 +From: Marcus Lundblad +Date: Sun, 10 Mar 2019 22:59:53 +0100 +Subject: [PATCH 1/2] geocode-nominatim: Fix parsing of integer JSON values + +It seems Nominatim has changed to (sometimes) use integer +values for certain values (such as osm_id and rank) instead +of strings as it was always before. + +Closes: #5 +--- + geocode-glib/geocode-nominatim.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/geocode-glib/geocode-nominatim.c b/geocode-glib/geocode-nominatim.c +index c1f6bc7..b2abc97 100644 +--- a/geocode-glib/geocode-nominatim.c ++++ b/geocode-glib/geocode-nominatim.c +@@ -1063,21 +1063,24 @@ _geocode_read_nominatim_attributes (JsonReader *reader, + } + + 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) +-- +2.26.0 + + +From ada95229ab54143f894befe1f1bb911a8cf2ccbc Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 12 Mar 2019 13:46:35 +0100 +Subject: [PATCH 2/2] tests: Add test for issue #5 + +--- + geocode-glib/tests/geocode-glib.c | 8 +++++--- + geocode-glib/tests/nominatim-data-type-change.json | 1 + + 2 files changed, 6 insertions(+), 3 deletions(-) + create mode 100644 geocode-glib/tests/nominatim-data-type-change.json + +diff --git a/geocode-glib/tests/geocode-glib.c b/geocode-glib/tests/geocode-glib.c +index ce26b3d..5da23e5 100644 +--- a/geocode-glib/tests/geocode-glib.c ++++ b/geocode-glib/tests/geocode-glib.c +@@ -781,12 +781,14 @@ test_resolve_json (void) + 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" }, + }; + + for (i = 0; i < G_N_ELEMENTS (tests); i++) { +@@ -811,7 +813,7 @@ test_resolve_json (void) + 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) { +diff --git a/geocode-glib/tests/nominatim-data-type-change.json b/geocode-glib/tests/nominatim-data-type-change.json +new file mode 100644 +index 0000000..2e68902 +--- /dev/null ++++ b/geocode-glib/tests/nominatim-data-type-change.json +@@ -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"}}] +-- +2.26.0 + diff --git a/SPECS/geocode-glib.spec b/SPECS/geocode-glib.spec index b506ead..a3ba439 100644 --- a/SPECS/geocode-glib.spec +++ b/SPECS/geocode-glib.spec @@ -2,13 +2,14 @@ Name: geocode-glib Version: 3.26.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Geocoding helper library License: LGPLv2+ URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz +BuildRequires: git BuildRequires: gettext BuildRequires: gtk-doc BuildRequires: meson @@ -19,6 +20,10 @@ BuildRequires: pkgconfig(libsoup-2.4) Requires: json-glib%{?_isa} >= %{json_glib_version} +# https://bugzilla.redhat.com/show_bug.cgi?id=1767438 +Patch0: type-change.patch +Patch1: place_rank-crasher.patch + %description geocode-glib is a convenience library for the geocoding (finding longitude, and latitude from an address) and reverse geocoding (finding an address from @@ -37,7 +42,7 @@ developing applications that use %{name}. %prep -%setup -q +%autosetup -S git %build @@ -72,6 +77,11 @@ find $RPM_BUILD_ROOT -name '*.html' -exec sed -i -e s,G_MAXINT,G_MAXLONG,g \{\} %changelog +* Thu Apr 16 2020 Bastien Nocera - 3.26.0-3 ++ geocode-glib-3.26.0-3 +- Fix crasher due to Nominatim server changes +- Resolves: #1767438 + * Fri Sep 21 2018 Bastien Nocera - 3.26.0-2 + geocode-glib-3.26.0-2 - Work-around multilib gtk-doc bug