From 2f93133067d19bbe588c2b84893ef73670e5235d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 19 Apr 2024 02:45:11 -0700 Subject: [PATCH] libgweather: update to 4.4.2. --- srcpkgs/libgweather/patches/metar.patch | 45 ------------------------- srcpkgs/libgweather/patches/vdsa.patch | 8 +++-- srcpkgs/libgweather/template | 8 ++--- 3 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/libgweather/patches/metar.patch diff --git a/srcpkgs/libgweather/patches/metar.patch b/srcpkgs/libgweather/patches/metar.patch deleted file mode 100644 index 0e099d3dd76a54..00000000000000 --- a/srcpkgs/libgweather/patches/metar.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e62b4f1790c525af6d565a2d6adf8a178e9e7153 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= -Date: Mon, 20 Nov 2023 12:24:45 +0200 -Subject: [PATCH] metar: update dataserver URL - -Info about URL change: -https://github.com/mate-desktop/libmateweather/pull/79#issuecomment-1765810415 - -https://gitlab.gnome.org/GNOME/libgweather/-/issues/232 -https://gitlab.gnome.org/GNOME/libgweather/-/issues/236 ---- - libgweather/weather-metar.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libgweather/weather-metar.c b/libgweather/weather-metar.c -index c0e8a6e5..3cb5ecc5 100644 ---- a/libgweather/weather-metar.c -+++ b/libgweather/weather-metar.c -@@ -675,7 +675,7 @@ metar_start_open (GWeatherInfo *info) - if (!loc->latlon_valid) - return; - -- g_debug ("metar_start_open, requesting: https://www.aviationweather.gov/adds/dataserver_current/httpparam?dataSource=metars&requestType=retrieve&format=xml&hoursBeforeNow=3&mostRecent=true&fields=raw_text&stationString=%s", loc->code); -+ g_debug ("metar_start_open, requesting: https://aviationweather.gov/cgi-bin/data/dataserver.php?dataSource=metars&requestType=retrieve&format=xml&hoursBeforeNow=3&mostRecent=true&fields=raw_text&stationString=%s", loc->code); - query = soup_form_encode ( - "dataSource", - "metars", -@@ -696,14 +696,14 @@ metar_start_open (GWeatherInfo *info) - uri = g_uri_build (SOUP_HTTP_URI_FLAGS, - "https", - NULL, -- "www.aviationweather.gov", -+ "aviationweather.gov", - -1, -- "/adds/dataserver_current/httpparam", -+ "/cgi-bin/data/dataserver.php", - query, - NULL); - g_free (query); - #else -- uri = soup_uri_new ("https://www.aviationweather.gov/adds/dataserver_current/httpparam"); -+ uri = soup_uri_new ("https://aviationweather.gov/cgi-bin/data/dataserver.php"); - uri->query = query; - #endif - msg = soup_message_new_from_uri ("GET", uri); diff --git a/srcpkgs/libgweather/patches/vdsa.patch b/srcpkgs/libgweather/patches/vdsa.patch index 397297d3f128b5..ee9cc5c606fc96 100644 --- a/srcpkgs/libgweather/patches/vdsa.patch +++ b/srcpkgs/libgweather/patches/vdsa.patch @@ -1,3 +1,8 @@ +Submitted upstream: https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/292 + +From bfcd8332f45d9e15ad0b8623d5835e06c36dc1f4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + Date: Tue, 21 Nov 2023 17:51:29 +0700 Subject: [PATCH] Locations: Siem Reap changes its international airport @@ -20,5 +25,4 @@ index f4d1e6c6..c42e9508 100644 -- -2.42.0 - +GitLab diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index e93fcbe836cdc5..f824176f370fff 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,7 +1,7 @@ # Template file for 'libgweather' pkgname=libgweather reverts="40.0_1" -version=4.4.0 +version=4.4.2 revision=1 build_style=meson build_helper="gir" @@ -9,7 +9,7 @@ configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo" hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)" -makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel" +makedepends="geocode-glib-devel libsoup3-devel json-glib-devel libxml2-devel" depends="tzdata" short_desc="GNOME Weather information access library" maintainer="Orphaned " @@ -17,7 +17,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS" distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz" -checksum=366e866ff2a708b894cfea9475b8e8ff54cb3e2b477ea72a8ade0dabee5f48a4 +checksum=a6e427b4770ada48945f3aa906af710fc833cff0d42df91f1828302740d794ec build_options="gir gtk_doc" build_options_default="gir gtk_doc" @@ -29,7 +29,7 @@ post_patch() { } libgweather-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision} gtk+3-devel" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include