From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- .../files/4.0.0-autoskip-network-test.patch | 29 ++++++++++++++++++++++ dev-libs/libgweather/files/4.0.0-vapigen.patch | 29 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch create mode 100644 dev-libs/libgweather/files/4.0.0-vapigen.patch (limited to 'dev-libs/libgweather/files') diff --git a/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch b/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch new file mode 100644 index 000000000000..3f27906de012 --- /dev/null +++ b/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch @@ -0,0 +1,29 @@ +From 87c0d202977c212a6b7fd360ceaa295e422de87d Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Sun, 30 Aug 2020 10:35:13 +0300 +Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be + resolved + +--- + libgweather/tests/metar.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c +index 7d6c7c04..0b3025a2 100644 +--- a/libgweather/tests/metar.c ++++ b/libgweather/tests/metar.c +@@ -142,6 +142,11 @@ test_metar_weather_stations (void) + g_test_message ("SSL/TLS failure, please check your glib-networking installation"); + g_test_failed (); + return; ++ } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) { ++ g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?"); ++ g_object_unref (session); ++ g_object_unref (msg); ++ return; + } + #if SOUP_CHECK_VERSION(2, 99, 2) + g_assert_no_error (error); +-- +2.34.1 + diff --git a/dev-libs/libgweather/files/4.0.0-vapigen.patch b/dev-libs/libgweather/files/4.0.0-vapigen.patch new file mode 100644 index 000000000000..d5c4ca12623e --- /dev/null +++ b/dev-libs/libgweather/files/4.0.0-vapigen.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/176 + +From 98b505675f631c1fabbbcbcee2523f8dde8e7e3d Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sun, 20 Mar 2022 12:19:59 -0700 +Subject: [PATCH] meson: Use dependency() for finding vapigen + +This allows the vapigen binary to be chosen by overriding the VAPIGEN +environment variable. +--- + libgweather/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgweather/meson.build b/libgweather/meson.build +index 08311af4..7148f5ca 100644 +--- a/libgweather/meson.build ++++ b/libgweather/meson.build +@@ -211,7 +211,7 @@ 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() + + enable_vala = get_option('enable_vala') +-vapigen = find_program('vapigen', required: enable_vala == 'true') ++vapigen = dependency('vapigen', required: enable_vala == 'true') + if enable_vala == 'auto' or enable_vala == 'true' + build_vapi = vapigen.found() and get_option('introspection') + if enable_vala == 'true' and not build_vapi +-- +2.34.1 + -- cgit v1.2.3