已关闭
Update to 1.28.2 #25
pengmeng-123创建于 6月22日关闭于 6 天前
Update to 1.28.2 #25
已关闭
从已删除 :master合入到src-openeuler/libmateweathermaster
共 5 个文件变更+931-1077
| @@ -370,7 +370,7 @@ index 7bc24fc..d470822 100644 | |||
| 370 | 370 | ||
| 371 | loc = info->location; | 371 | loc = info->location; |
| 372 | 372 | ||
| 373 | - searchkey = g_strdup_printf ("<raw_text>%s", loc->code); | 373 | + searchkey = g_strdup_printf ("<raw_text>METAR %s", loc->code); |
| 374 | - p = strstr (msg->response_body->data, searchkey); | 374 | - p = strstr (msg->response_body->data, searchkey); |
| 375 | - g_free (searchkey); | 375 | - g_free (searchkey); |
| 376 | + | 376 | + |
| @@ -417,7 +417,7 @@ index 7bc24fc..d470822 100644 | |||
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | - msg = soup_form_request_new ( | 419 | - msg = soup_form_request_new ( |
| 420 | -- "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php", | 420 | +- "GET", "https://aviationweather.gov/api/data/dataserver", |
| 421 | + query = soup_form_encode ( | 421 | + query = soup_form_encode ( |
| 422 | "dataSource", "metars", | 422 | "dataSource", "metars", |
| 423 | "requestType", "retrieve", | 423 | "requestType", "retrieve", |
| @@ -428,7 +428,7 @@ index 7bc24fc..d470822 100644 | |||
| 428 | NULL); | 428 | NULL); |
| 429 | - soup_session_queue_message (info->session, msg, metar_finish, info); | 429 | - soup_session_queue_message (info->session, msg, metar_finish, info); |
| 430 | + msg = soup_message_new_from_encoded_form ( | 430 | + msg = soup_message_new_from_encoded_form ( |
| 431 | -+ "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php", | 431 | ++ "GET", "https://aviationweather.gov/api/data/dataserver", |
| 432 | + query); | 432 | + query); |
| 433 | + soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT, | 433 | + soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT, |
| 434 | + NULL, metar_finish, info); | 434 | + NULL, metar_finish, info); |
Rlibmateweather-1.28.0-fix-sensitive-words.patch→libmateweather-1.28.2-fix-sensitive-words.patch+920-1047
Binary files do not support preview
| @@ -1,17 +1,16 @@ | |||
| 1 | Name: libmateweather | 1 | Name: libmateweather |
| 2 | -Version: 1.28.0 | 2 | +Version: 1.28.2 |
| 3 | -Release: 4 | 3 | +Release: 1 |
| 4 | Summary: Libraries to allow MATE Desktop to display weather information | 4 | Summary: Libraries to allow MATE Desktop to display weather information |
| 5 | -# Automatically converted from old format: GPLv2+ and LGPLv2+ - review is highly recommended. | ||
| 6 | License: GPL-2.0-or-later AND LicenseRef-Callaway-LGPLv2+ | 5 | License: GPL-2.0-or-later AND LicenseRef-Callaway-LGPLv2+ |
| 7 | URL: https://mate-desktop.org | 6 | URL: https://mate-desktop.org |
| 8 | 7 | ||
| 9 | # for downloading the tarball use 'spectool -g -R libmateweather.spec' | 8 | # for downloading the tarball use 'spectool -g -R libmateweather.spec' |
| 10 | # Source for release-builds. | 9 | # Source for release-builds. |
| 11 | Source0: https://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz | 10 | Source0: https://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz |
| 12 | -Patch01: libmateweather-1.28.0-fix-sensitive-words.patch | 11 | +Patch01: libmateweather-1.28.2-fix-sensitive-words.patch |
| 13 | -Patch6001: backport-Port-to-libsoup-3.0.patch | 12 | +Patch02: backport-Port-to-libsoup-3.0.patch |
| 14 | -Patch6002: libmateweather_0001-Update-AviationWeather-URL_1.28.patch | 13 | + |
| 15 | 14 | ||
| 16 | BuildRequires: make gcc | 15 | BuildRequires: make gcc |
| 17 | BuildRequires: autoconf automake libtool | 16 | BuildRequires: autoconf automake libtool |
| @@ -76,6 +75,9 @@ NOCONFIGURE=yes ./autogen.sh | |||
| 76 | %{_libdir}/pkgconfig/mateweather.pc | 75 | %{_libdir}/pkgconfig/mateweather.pc |
| 77 | 76 | ||
| 78 | %changelog | 77 | %changelog |
| 78 | +* Thu Jun 18 2026 pengmeng <pengmeng@kylinsec.com.cn> - 1.28.2-1 | ||
| 79 | +- update to 1.28.2 | ||
| 80 | + | ||
| 79 | * Thu Nov 20 2025 yueyaoqiang <yueyaoqiang@kylinos.cn> - 1.28.0-4 | 81 | * Thu Nov 20 2025 yueyaoqiang <yueyaoqiang@kylinos.cn> - 1.28.0-4 |
| 80 | - convert license to SPDX,and Update AviationWeather URL | 82 | - convert license to SPDX,and Update AviationWeather URL |
| 81 | 83 | ||
| @@ -1,21 +0,0 @@ | |||
| 1 | -diff -Naur libmateweather-1.28.0/libmateweather/weather-metar.c libmateweather-1.28.0_bak/libmateweather/weather-metar.c | ||
| 2 | ---- libmateweather-1.28.0/libmateweather/weather-metar.c 2025-11-20 16:35:14.752182204 +0800 | ||
| 3 | -+++ libmateweather-1.28.0_bak/libmateweather/weather-metar.c 2025-11-20 16:40:12.533351882 +0800 | ||
| 4 | -@@ -523,7 +523,7 @@ | ||
| 5 | - | ||
| 6 | - loc = info->location; | ||
| 7 | - | ||
| 8 | -- searchkey = g_strdup_printf ("<raw_text>%s", loc->code); | ||
| 9 | -+ searchkey = g_strdup_printf ("<raw_text>METAR %s", loc->code); | ||
| 10 | - | ||
| 11 | - response_body = g_bytes_get_data (bytes, &len); | ||
| 12 | - end = response_body + len; | ||
| 13 | -@@ -578,7 +578,7 @@ | ||
| 14 | - "stationString", loc->code, | ||
| 15 | - NULL); | ||
| 16 | - msg = soup_message_new_from_encoded_form ( | ||
| 17 | -- "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php", | ||
| 18 | -+ "GET", "https://aviationweather.gov/api/data/dataserver", | ||
| 19 | - query); | ||
| 20 | - soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT, | ||
| 21 | - NULL, metar_finish, info); | ||