From d22b57f6d3a01b262937453925967b1929a483e5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:37:19 +0200 Subject: [PATCH] libgweather: update to 4.2.0. --- srcpkgs/libgweather/patches/cross.patch | 21 ++++++++ .../patches/fix-cross-introspection.patch | 14 ----- ...metar-test-dont-use-known-duplicates.patch | 51 ------------------- srcpkgs/libgweather/template | 15 +++--- 4 files changed, 29 insertions(+), 72 deletions(-) create mode 100644 srcpkgs/libgweather/patches/cross.patch delete mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch delete mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch diff --git a/srcpkgs/libgweather/patches/cross.patch b/srcpkgs/libgweather/patches/cross.patch new file mode 100644 index 00000000000..fdd5ff95752 --- /dev/null +++ b/srcpkgs/libgweather/patches/cross.patch @@ -0,0 +1,21 @@ +--- a/meson.build ++++ b/meson.build +@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi']) + gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py') + + g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) +-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() ++build_gir = get_option('introspection') and g_ir_scanner.found() + build_docs = get_option('gtk_doc') and build_gir + + schemas_srcdir = meson.project_source_root() / 'schemas' +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -1,6 +1,7 @@ + if build_docs + dependency('gi-docgen', version: '>= 2021.6', + fallback: ['gi-docgen', 'dummy_dep'], ++ native: true, + ) + + gidocgen = find_program('gi-docgen', required: get_option('gtk_doc')) diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch deleted file mode 100644 index fbec0c3317f..00000000000 --- a/srcpkgs/libgweather/patches/fix-cross-introspection.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgweather/meson.build b/libgweather/meson.build -index 08311af4..ef554f2e 100644 ---- a/libgweather/meson.build -+++ b/libgweather/meson.build -@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', - ) - - g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) --build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() -+build_gir = get_option('introspection') and g_ir_scanner.found() - - enable_vala = get_option('enable_vala') - vapigen = find_program('vapigen', required: enable_vala == 'true') - diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch deleted file mode 100644 index 5646cd24cc2..00000000000 --- a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001 -From: Pierre Labastie -Date: Sun, 10 Apr 2022 22:24:47 +0200 -Subject: [PATCH] metar test: Don't use "known" duplicates - -The metar list provided by NOAA contains duplicate ICAO codes. -Those duplicates may change over time, so it does not make sense -to use an array of known duplicates. Presently a duplicate is rejected -when it is known, and inserted if it is not, leading to a difference -in the number of insertions and the number of keys, so that the test -fails. If any duplicate is rejected, the number of insertions is -always equal to the number of keys (unless something goes wrong -in g_hash_table_insert). And this is the default behavior for known -duplicates anyway. - -Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168 ---- - libgweather/tests/metar.c | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c -index 7d6c7c04..a6fa7e79 100644 ---- a/libgweather/tests/metar.c -+++ b/libgweather/tests/metar.c -@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents) - continue; - } - -+ /* If it is a duplicate discard it */ - if (g_hash_table_lookup (stations_ht, station)) { -- const char * const known_duplicates[] = { -- "VOGO", -- "KHQG", -- "KOEL", -- "KTQK", -- "KX26", -- NULL -- }; -- if (g_strv_contains (known_duplicates, station)) { -- g_free (station); -- continue; -- } - g_test_message ("Weather station '%s' already defined\n", station); -+ g_free (station); -+ continue; - } - - g_hash_table_insert (stations_ht, station, g_strdup (line)); --- -GitLab - diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index b4fcfcb1256..fdcdffd1c35 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,22 +1,23 @@ # Template file for 'libgweather' pkgname=libgweather reverts="40.0_1" -version=4.0.0 -revision=3 +version=4.2.0 +revision=1 build_style=meson build_helper="gir" 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-libsoup2-devel gtk+3-devel libsoup-gnome-devel" +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" depends="tzdata" short_desc="GNOME Weather information access library" -maintainer="Enno Boland " +maintainer="Michal Vasilek " 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=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c +checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203 build_options="gir gtk_doc" build_options_default="gir gtk_doc"