From ecca970957718dc245b83f89d5b0811dc4e3daed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Tue, 27 Aug 2019 11:28:32 +0200 Subject: update:build:sailfish OS to version 3.1.0.12 (#843) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ändrad: .circleci/config.yml ändrad: contrib/sailfish/build_sailfish_ci.sh --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9aabd4072..b4fef97e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,7 @@ jobs: command: mkdir ../rpmbuild - run: name: run build - command: ls -lah ../rpmbuild && docker run -e VERSION_ID=2.2.1.18 -v `pwd`/../rpmbuild:/home/nemo/rpmbuild:rw -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:2.2.1.18-r1 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh + command: ls -lah ../rpmbuild && docker run -e VERSION_ID=3.1.0.12 -v `pwd`/../rpmbuild:/home/nemo/rpmbuild:rw -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:3.1.0.12 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh - store_artifacts: name: Store rpm path: ../rpmbuild/RPMS/ -- cgit v1.2.1 From bcc10a828e53153b5bda731f6fbb3f0f6fb4aec1 Mon Sep 17 00:00:00 2001 From: Wildemann Stefan Date: Tue, 27 Aug 2019 17:57:18 +0200 Subject: Add Kosovo to known countries --- navit/country.c | 1 + navit/icons/country_XK.svgz | Bin 0 -> 4188 bytes navit/maptool/osm.c | 1 + 3 files changed, 2 insertions(+) create mode 100644 navit/icons/country_XK.svgz diff --git a/navit/country.c b/navit/country.c index 23af61f81..962420366 100644 --- a/navit/country.c +++ b/navit/country.c @@ -284,6 +284,7 @@ static struct country country[]= { {548, "VAN", "VU", "VUT", /* 548 */ _n("Vanuatu")}, {876, NULL, "WF", "WLF", /* 876 */ _n("Wallis and Futuna")}, {882, "WS", "WS", "WSM", /* 882 */ _n("Samoa")}, + {412, "XK", "XK", "XXK", /* 412 */ _n("Kosovo")}, {887, "YAR", "YE", "YEM", /* 887 */ _n("Yemen")}, {175, NULL, "YT", "MYT", /* 175 */ _n("Mayotte")}, {710, "ZA", "ZA", "ZAF", /* 710 */ _n("South Africa") }, diff --git a/navit/icons/country_XK.svgz b/navit/icons/country_XK.svgz new file mode 100644 index 000000000..4718a5de9 Binary files /dev/null and b/navit/icons/country_XK.svgz differ diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index f640c8674..7de4d0569 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -261,6 +261,7 @@ struct country_table { { 404,"Kenya"}, { 408,"Korea, Democratic People's Republic of"}, { 410,"Korea, Republic of"}, + { 412,"Kosovo,Kosova"}, { 414,"Kuwait"}, { 417,"Kyrgyzstan"}, { 418,"Lao People's Democratic Republic"}, -- cgit v1.2.1