[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgweather/files/

[Matt Turner]

commit:     07ceaab3023fa2d980914de37aa5ba6988669a0b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun  1 17:22:36 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 19:01:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ceaab3

dev-libs/libgweather: remove unused patches

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21077
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../libgweather/files/3.32.1-meson-tweaks.patch    | 109 ---------------------
 .../libgweather/files/3.36.1-tests-locale.patch    |  52 ----------
 .../files/3.36.2-autoskip-network-test.patch       |  29 ------
 3 files changed, 190 deletions(-)

diff --git a/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch b/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch
deleted file mode 100644
index 9d1bdc017c2..00000000000
--- a/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From ad9fa6e469c4eba423b0f7bd5fbd7a76f6165ffe Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@g.o>
-Date: Sat, 23 Feb 2019 12:21:01 +0200
-Subject: [PATCH] build: Provide introspection option and don't build manual
- tests
-
----
- libgweather/meson.build | 21 ++++++++++++++-------
- meson.build             |  4 ++++
- meson_options.txt       |  2 ++
- 3 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 6688807..6776839 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -66,6 +66,15 @@ lib_libgweather = shared_library('gweather-3',
-   install: true,
- )
- 
-+libgweather_dep = declare_dependency(
-+  sources: [gweather_enum_types[1]],
-+  dependencies: deps_libgweather,
-+  link_with: lib_libgweather,
-+  include_directories: root_inc,
-+)
-+
-+if get_option('introspection')
-+
- gweather_gir = gnome.generate_gir(lib_libgweather,
-   sources: introspection_sources,
-   dependencies: deps_libgweather,
-@@ -83,13 +92,6 @@ gweather_gir = gnome.generate_gir(lib_libgweather,
-   install: true,
- )
- 
--libgweather_dep = declare_dependency(
--  sources: [gweather_enum_types[1], gweather_gir],
--  dependencies: deps_libgweather,
--  link_with: lib_libgweather,
--  include_directories: root_inc,
--)
--
- if enable_vala
-   gnome.generate_vapi('gweather-3.0',
-     sources: gweather_gir[0],
-@@ -98,11 +100,13 @@ if enable_vala
-     install: true
-   )
- endif
-+endif
- 
- test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()),
-               '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
-               '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
- 
-+if false
- executable('test_locations',
-   ['test_locations.c'],
-   c_args: test_cargs,
-@@ -113,6 +117,7 @@ executable('test_locations_utc',
-   c_args: test_cargs,
-   dependencies: libgweather_dep,
-   install: false)
-+endif
- 
- exe = executable('test_libgweather',
-   ['test_libgweather.c'],
-@@ -121,6 +126,7 @@ exe = executable('test_libgweather',
-   install: false)
- test('test_named_timezones', exe)
- 
-+if false
- executable('test_metar',
-   ['test_metar.c', gweather_c_sources],
-   c_args: test_cargs,
-@@ -131,3 +137,4 @@ executable('test_sun_moon',
-   c_args: test_cargs,
-   dependencies: libgweather_dep,
-   install: false)
-+endif
-diff --git a/meson.build b/meson.build
-index 54a5063..96e5d27 100644
---- a/meson.build
-+++ b/meson.build
-@@ -112,6 +112,10 @@ else
-   enable_vala = enable_vala != 'false'
- endif
- 
-+if enable_vala and not get_option('introspection')
-+  error('Vala bindings require introspection support')
-+endif
-+
- root_inc = include_directories('.')
- 
- subdir('libgweather')
-diff --git a/meson_options.txt b/meson_options.txt
-index 19b2c6a..bf4c517 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -8,3 +8,5 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
-        description: 'Install vala bindings')
- option('gtk_doc', type: 'boolean', value: false,
-        description: 'Whether to generate the API reference')
-+option('introspection', type: 'boolean', value: true,
-+       description: 'generate GObject Introspection data')
--- 
-2.17.0
-

diff --git a/dev-libs/libgweather/files/3.36.1-tests-locale.patch b/dev-libs/libgweather/files/3.36.1-tests-locale.patch
deleted file mode 100644
index fb35d2f00b7..00000000000
--- a/dev-libs/libgweather/files/3.36.1-tests-locale.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8b20cd91a96eae39bafe82ccf444dbc00759ad43 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@×××××.org>
-Date: Mon, 9 Mar 2020 12:21:57 +0000
-Subject: [PATCH] Do not run local-dependent tests with missing locales
-
-Not everyone has all the locales installed all the time, so let's check
-if a locale is available before using it.
----
- libgweather/test_libgweather.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index 8a219115..77ee459b 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -643,6 +643,7 @@ static void
- test_location_names (void)
- {
-     GWeatherLocation *world, *brussels;
-+    char *old_locale;
- 
-     world = gweather_location_get_world ();
-     g_assert (world);
-@@ -653,7 +654,16 @@ test_location_names (void)
-     g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "brussels");
-     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
- 
-+    old_locale = g_strdup (setlocale (LC_ALL, NULL));
-     setlocale (LC_ALL, "fr_FR.UTF-8");
-+    if (strstr (setlocale (LC_ALL, NULL), "fr_FR.UTF-8") == NULL)
-+      {
-+        g_test_skip ("locale fr_FR.UTF-8 not available, skipping localization tests");
-+        setlocale (LC_ALL, old_locale);
-+        g_free (old_locale);
-+        return;
-+      }
-+
-     _gweather_location_reset_world ();
- 
-     world = gweather_location_get_world ();
-@@ -665,7 +675,7 @@ test_location_names (void)
-     g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "bruxelles");
-     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
- 
--    setlocale (LC_ALL, "");
-+    setlocale (LC_ALL, old_locale);
-     _gweather_location_reset_world ();
- }
- 
--- 
-GitLab
-

diff --git a/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch b/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch
deleted file mode 100644
index bc35bb3c4fd..00000000000
--- a/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4bc5b6792706788f0930bda7049adf349713a2cc Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@g.o>
-Date: Sun, 30 Aug 2020 10:35:13 +0300
-Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
- resolved
-
----
- libgweather/test_libgweather.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index b481278d..5704bd8b 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -424,6 +424,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;
-     }
-     g_assert_cmpint (msg->status_code, >=, 200);
-     g_assert_cmpint (msg->status_code, <, 300);
--- 
-2.26.2
-