From f616ce4660c92a3fcb4f05663c2ab47c9defa0c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Nov 2022 01:22:10 +0000 Subject: gentoo auto-resync : 30:11:2022 - 01:22:10 --- dev-libs/libgweather/Manifest | 7 +- .../files/40.0-autoskip-network-test.patch | 29 ------ dev-libs/libgweather/files/40.0-meson-tweaks.patch | 109 --------------------- dev-libs/libgweather/files/40.0-tests-locale.patch | 55 ----------- dev-libs/libgweather/libgweather-40.0-r1.ebuild | 80 --------------- dev-libs/libgweather/metadata.xml | 3 - 6 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 dev-libs/libgweather/files/40.0-autoskip-network-test.patch delete mode 100644 dev-libs/libgweather/files/40.0-meson-tweaks.patch delete mode 100644 dev-libs/libgweather/files/40.0-tests-locale.patch delete mode 100644 dev-libs/libgweather/libgweather-40.0-r1.ebuild (limited to 'dev-libs/libgweather') diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index 1e4efff57c8b..4735fc50cf09 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1,12 +1,7 @@ AUX 4.0.0-autoskip-network-test.patch 976 BLAKE2B ce6866636be48e553621a18dcda5ca122f204ad074d7472c740ea8db8cb283fe8f6ab63e2bc3862fd2c0725446c7c2969bc2f431bd175d9d2b96f68c401f3e0b SHA512 6f47d66e243dac3162b3e89e5fe893de7d87cc8dce9893534a12e76f1e9b830a18cdf3a9f6a26de89094841d1874843da301ed10f35e0b7e6d9ae4b2bca07f54 AUX 4.0.0-vapigen.patch 1153 BLAKE2B 1462b72ad3d25d4d5eac255d49217d74ef2cab67c740dc1feaaafa671977eaa92557c623c4f37f8cc4f76ee05018f040dd3604b6eb413bdc46830f77e2aff8c0 SHA512 0aae04a26f68e63b30911d3a76dd0569823ea11e247c14a34f81a15686caf33ea2834368e8b545faa1d0bd5f66e749916722e2cd77feef151c5cebd6d0fec1dd -AUX 40.0-autoskip-network-test.patch 1038 BLAKE2B c233294ad5a301e8a7b6b96e606124a5440cc93507f291147acc6f8178341b1ce4ce292250d56467364bfadc2d28d49f02e5f3aa8f4cddac7dc621621a57d93c SHA512 fe2ff110863627e61454d1583d155b9f73c7c64814a77736783eaa533e50bbacc61065eb66a84af20f83323f0b66a1a38c70af26a1f7ef5a559865dc885c786d -AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160a1391dfead3d9bc1117bc3d811ac5cad4706bc85720f330ff5b22d5cd276947ee9bbe0f8911073a0e9a0b35be SHA512 c135d708154060d84023f2e33d16bd5a6a798311b858d0ebd15a9a51a1bf69c33ab93ef02bd8b6b65c5cfaf071af4a7a154630e3fed0767173cdfa576e554d1d -AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435 DIST libgweather-4.0.0.tar.xz 4722620 BLAKE2B f2500d065fe9607b740c2f6c87378d5fc86c15951b2880f89c3ac22021d085eed601b645dcf1c9864fe1fa47860aa14ed1ab858263a7634c3b7615231d3ee6d1 SHA512 1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3 DIST libgweather-4.2.0.tar.xz 2752164 BLAKE2B 9cc51363d6a2a09497269760701e0e0c1beb68c0096262fb6e2885414f838b41c151df7b057def457fdd49f9036d853ab624a9683a5cf57bbdefaed5376fe69f SHA512 cd95c6714575c0afc52455bb99c9116af27716868648debe0e5309904cfaf7516cf2379e415b3d9dd57b5dd223bae8e8acbaf705a3867dad8f75aec22eea908e -DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1 EBUILD libgweather-4.0.0-r1.ebuild 1713 BLAKE2B 8e879bfee3e337eb3e6967e1e1d015db133319268a4b9ac07d1b8c8cff67563f685142f2888eaab92ab1230b5da8a8559abbe701f670abb0794c5b830bdac24a SHA512 02adc00aff1fefeb298f1f31e0a8638cbe3ad0b594e9411a555afad824da294c74754075ee79c94e4220a581fdb3edf628400ecd5ebbc93f55ac6371d530fb4c EBUILD libgweather-4.2.0.ebuild 1980 BLAKE2B b18581d1f95146358384b6e0ed43319da427a0e3192ca52fd423f6b5ac8e69eb94946c3a95416274c95aa93dc7b3898d67a7a8d6a0c046f4ec7d409894221cf6 SHA512 6774bb6d9fa6612f80800a02de1ca1ae2e76297a885657f7116f8d31901401c3e28db7e3d4557fce06aa3ffd3975d63752ce6734ed11f42fc2791f1240922961 -EBUILD libgweather-40.0-r1.ebuild 2092 BLAKE2B e31b69c5f372be23e2cbe67224f0e0798307b2071618085702d6ebcd1b3821b6ab4f02bb66fb6eb7e7000814ca2f723a4398b89a7142600154ab52503841fc3a SHA512 5d3187f4d95062d1cc4118a6b5cb18ee23ab60e7248a4465673f2b17c0d684b84341a03e88d0335d98b2492bee4dabb509ff2b6c93933dabcb4cb0decadbb4f4 -MISC metadata.xml 452 BLAKE2B 2377940e7a5653937291757ff1dacda3d430c77d811685dee8ac14eca7f6aa7bc22c17b80ab4e25baa40c89d40dbdd59d18025b8d25da25cfcb9b625cbe536a7 SHA512 ef80b6ee32f6f8414e68f494509aedbba54a1c9b9e24d88c7e2bb8a6476d5558098cd74a1fefce7f9e5b03f4c00f523321e1968f0754444437d0f0600a809ad5 +MISC metadata.xml 352 BLAKE2B 3726dfdf7269138db7992dbab72db960ed2362a8c753362376f28fa37e0849ef89f74b132dea4c63120dfb777f27566aea12f5dc92ddbeeb5a3b8139d4feeb9c SHA512 06dcfdd1ba301e34b2b9a23f3cdb5a686daa8fcc7a2caa8ac921eade3e805589ba2bb148da5f64f95f93d62dda71b5e19f37b33f1e35201c61bd8e0bb996bbf4 diff --git a/dev-libs/libgweather/files/40.0-autoskip-network-test.patch b/dev-libs/libgweather/files/40.0-autoskip-network-test.patch deleted file mode 100644 index def65382613b..000000000000 --- a/dev-libs/libgweather/files/40.0-autoskip-network-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1d0ae284635ef1975a581b4d73ab497ccbd4532f Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 30 Aug 2020 10:35:13 +0300 -Subject: [PATCH 2/2] 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 ee13dc7b..7ffaac41 100644 ---- a/libgweather/test_libgweather.c -+++ b/libgweather/test_libgweather.c -@@ -438,6 +438,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 - diff --git a/dev-libs/libgweather/files/40.0-meson-tweaks.patch b/dev-libs/libgweather/files/40.0-meson-tweaks.patch deleted file mode 100644 index aa56c592890f..000000000000 --- a/dev-libs/libgweather/files/40.0-meson-tweaks.patch +++ /dev/null @@ -1,109 +0,0 @@ -From bbf17eac53c128904190ef2d74176b0717d7d907 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -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 26f067e6..8f0f9047 100644 ---- a/libgweather/meson.build -+++ b/libgweather/meson.build -@@ -74,6 +74,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, -@@ -91,13 +100,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], -@@ -106,11 +108,13 @@ if enable_vala - install: true - ) - endif -+endif - - test_cargs = ['-DTEST_LOCATIONS="@0@"'.format(locations_bin.full_path()), - '-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, -@@ -121,6 +125,7 @@ executable('test_locations_utc', - c_args: test_cargs, - dependencies: libgweather_dep, - install: false) -+endif - - exe = executable('test_libgweather', - ['test_libgweather.c'], -@@ -129,6 +134,7 @@ exe = executable('test_libgweather', - install: false) - test('test_libgweather', exe, depends: [locations_bin]) - -+if false - executable('test_metar', - ['test_metar.c', gweather_c_sources], - c_args: test_cargs, -@@ -144,3 +150,4 @@ executable('test_weather', - c_args: test_cargs, - dependencies: libgweather_dep, - install: false) -+endif -diff --git a/meson.build b/meson.build -index 87f9a7d8..48ff0ca2 100644 ---- a/meson.build -+++ b/meson.build -@@ -104,6 +104,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('data') -diff --git a/meson_options.txt b/meson_options.txt -index 19b2c6a7..bf4c5175 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.26.2 - diff --git a/dev-libs/libgweather/files/40.0-tests-locale.patch b/dev-libs/libgweather/files/40.0-tests-locale.patch deleted file mode 100644 index ea1f6020152d..000000000000 --- a/dev-libs/libgweather/files/40.0-tests-locale.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6b2801a8195990fdf5166b62f62ddfbad55f11e4 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Mon, 9 Mar 2020 12:21:57 +0000 -Subject: [PATCH 1/2] 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 b10c1f16..ee13dc7b 100644 ---- a/libgweather/test_libgweather.c -+++ b/libgweather/test_libgweather.c -@@ -678,6 +678,7 @@ test_location_names (void) - { - g_autoptr(GWeatherLocation) world = NULL; - g_autoptr(GWeatherLocation) brussels = NULL; -+ char *old_locale; - - world = gweather_location_get_world (); - g_assert_nonnull (world); -@@ -689,10 +690,19 @@ test_location_names (void) - g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels"); - gweather_location_unref (brussels); - -+ old_locale = g_strdup (setlocale (LC_ALL, NULL)); - setlocale (LC_ALL, "fr_FR.UTF-8"); - - g_clear_pointer (&world, gweather_location_unref); - g_clear_pointer (&brussels, gweather_location_unref); -+ 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 (); -@@ -705,7 +715,7 @@ test_location_names (void) - g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels"); - gweather_location_unref (brussels); - -- setlocale (LC_ALL, ""); -+ setlocale (LC_ALL, old_locale); - g_clear_pointer (&world, gweather_location_unref); - g_clear_pointer (&brussels, gweather_location_unref); - _gweather_location_reset_world (); --- -2.26.2 - diff --git a/dev-libs/libgweather/libgweather-40.0-r1.ebuild b/dev-libs/libgweather/libgweather-40.0-r1.ebuild deleted file mode 100644 index 1f291f569c0c..000000000000 --- a/dev-libs/libgweather/libgweather-40.0-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) - -inherit gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Location and timezone database and weather-lookup library" -HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather" - -LICENSE="GPL-2+" -SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list - -IUSE="glade gtk-doc +introspection +vala" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - >=x11-libs/gtk+-3.13.5:3[introspection?] - >=net-libs/libsoup-2.44:2.4 - >=dev-libs/libxml2-2.6.0:2 - sci-geosciences/geocode-glib:0 - >=sys-libs/timezone-data-2010k - - glade? ( >=dev-util/glade-3.16:3.10 ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.11 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') - $(vala_depend) -" - -PATCHES=( - "${FILESDIR}"/40.0-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically - "${FILESDIR}"/40.0-tests-locale.patch # Don't fail tests when a locale is not present, https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/58 - "${FILESDIR}"/40.0-autoskip-network-test.patch -) - -python_check_deps() { - has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use glade glade_catalog) - $(meson_use vala enable_vala) - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/dev-libs/libgweather/metadata.xml b/dev-libs/libgweather/metadata.xml index f9ab907e6cd0..f48e69f0d501 100644 --- a/dev-libs/libgweather/metadata.xml +++ b/dev-libs/libgweather/metadata.xml @@ -5,9 +5,6 @@ gnome@gentoo.org Gentoo GNOME Desktop - - Installs catalog files for dev-util/glade - GNOME/libgweather -- cgit v1.2.3