From bf4c2c4bb8caec4b6c2e2b97a77a1666d182896c Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 22 Nov 2023 18:49:08 -0600
Subject: [PATCH] libmateweather: fix dataserver weather url change.

---
 ...7f7e5163870bcc2fb7281c28e8e39c9cbc54.patch | 22 ++++++++++
 ...42ffc2d3807dbc3163d1727cc5d8c2118838.patch | 42 +++++++++++++++++++
 helpers/make-libmateweather                   | 35 ++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch
 create mode 100644 helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch
 create mode 100644 helpers/make-libmateweather

diff --git a/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch b/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch
new file mode 100644
index 0000000..8596e63
--- /dev/null
+++ b/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch
@@ -0,0 +1,22 @@
+From 0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54 Mon Sep 17 00:00:00 2001
+From: Mike Ovchinnikov <mixao@yandex.ru>
+Date: Wed, 18 Oct 2023 14:59:53 +0400
+Subject: [PATCH] Dataserver url changed
+
+---
+ libmateweather/weather-metar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmateweather/weather-metar.c b/libmateweather/weather-metar.c
+index a9f3c84d..0ae2cbb9 100644
+--- a/libmateweather/weather-metar.c
++++ b/libmateweather/weather-metar.c
+@@ -550,7 +550,7 @@ metar_start_open (WeatherInfo *info)
+     }
+ 
+     msg = soup_form_request_new (
+-        "GET", "https://www.aviationweather.gov/adds/dataserver_current/httpparam",
++        "GET", "https://www.aviationweather.gov/cgi-bin/data/dataserver.php",
+         "dataSource", "metars",
+         "requestType", "retrieve",
+         "format", "xml",
diff --git a/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch b/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch
new file mode 100644
index 0000000..5da2035
--- /dev/null
+++ b/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch
@@ -0,0 +1,42 @@
+From a61542ffc2d3807dbc3163d1727cc5d8c2118838 Mon Sep 17 00:00:00 2001
+From: mbkma <johannes.unruh@fau.de>
+Date: Wed, 11 Jan 2023 20:53:29 +0100
+Subject: [PATCH] rename Europe/Kiev to Europe/Kyiv
+
+---
+ data/Locations.xml.in | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/data/Locations.xml.in b/data/Locations.xml.in
+index 8bf9bad..ea75673 100644
+--- a/data/Locations.xml.in
++++ b/data/Locations.xml.in
+@@ -20627,13 +20627,12 @@
+       <iso-code>UA</iso-code>
+       <fips-code>UP</fips-code>
+       <timezones>
+-        <timezone id="Europe/Kiev">
+-          <obsoletes>Europe/Simferopol</obsoletes>
++        <timezone id="Europe/Kyiv">
+           <obsoletes>Europe/Uzhgorod</obsoletes>
+           <obsoletes>Europe/Zaporozhye</obsoletes>
+         </timezone>
+       </timezones>
+-      <tz-hint>Europe/Kiev</tz-hint>
++      <tz-hint>Europe/Kyiv</tz-hint>
+       <city>
+         <!-- A city in Ukraine -->
+         <name>Boryspil'</name>
+@@ -20706,10 +20705,10 @@
+       </city>
+       <city>
+         <!-- The capital of Ukraine.
+-             "Kiev" is the traditional English name.
++             "Kyiv" is the traditional English name.
+              The local name in Ukrainian is "Kyyiv".
+           -->
+-        <name>Kiev</name>
++        <name>Kyiv</name>
+         <coordinates>50.433333 30.516667</coordinates>
+         <location>
+           <name>Kyiv</name>
diff --git a/helpers/make-libmateweather b/helpers/make-libmateweather
new file mode 100644
index 0000000..7274cf7
--- /dev/null
+++ b/helpers/make-libmateweather
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+#    Copyright (C) 2023  Luis Guzmán <ark@switnet.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+BUILD_UNTIL=11.0
+
+. ./config
+
+# Apply patches from upstream for URL weather change and FTBFS on current
+# aramo release.
+for i in $DATA/*.patch; do
+    echo Applying patch $i
+patch --no-backup-if-mismatch -p1 < $i
+done
+
+changelog "Fix dataserver weather url change."
+
+package
+