commit: 83e9dc35517410e2d12fff3af21bf31d999bcdfc Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Apr 20 14:34:06 2024 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Apr 20 14:36:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e9dc35
media-libs/libshumate: drop 1.0.5 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> media-libs/libshumate/Manifest | 1 - .../1.0.4-tests-Add-test-setup-for-valgrind.patch | 98 ---------------------- media-libs/libshumate/libshumate-1.0.5.ebuild | 64 -------------- 3 files changed, 163 deletions(-) diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest index bad706a05b8d..029843d9b5b8 100644 --- a/media-libs/libshumate/Manifest +++ b/media-libs/libshumate/Manifest @@ -1,2 +1 @@ -DIST libshumate-1.0.5.tar.xz 112008 BLAKE2B e20e53fdcd34aa67853f68d72801e7ef7dfcb39670f67f0bfab76cc04a0dc4e92b614b5a588560de64c85406b63a105b5ba19854cf1189a5a3c03f097c93556e SHA512 73beffb8eea95b279d297294ce96a39883856d280eeda1215b908d5b7ac86aff49bbd9c07065ffb394657497997b1994712de6526efd9076f9a5feb1c17b9532 DIST libshumate-1.1.3.tar.xz 299644 BLAKE2B f07a583e1fd142a0601c725840e84397ed04962f828cbc15217dcdc0d767015664a06252879416e9422cb32154406dae2742ffb511404c5923ce9acab7efae0c SHA512 163cce5c9aca2f3c52da3ecb3b4a651798e314d38a145ed4c69b0510303c72a0934c24084036ca2dfaab8b008753a37f7116b0bd2907cddc78a2aceee4f847d2 diff --git a/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch b/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch deleted file mode 100644 index fa3a0ea30abc..000000000000 --- a/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch +++ /dev/null @@ -1,98 +0,0 @@ -https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/158/ - -From f4f806207cc59c21331d1542f6629e85a59ea1db Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Thu, 1 Dec 2022 20:48:57 -0500 -Subject: [PATCH] tests: Add test setup for valgrind - -valgrind is great, but it often does not support the latest instruction -sets used by core libraries (e.g. AVX instructions used in glibc). That -leads to failures that are unrelated to libshumate. For example: - - 6/7 viewport FAIL 0.16s killed by signal 4 SIGILL - [...] - vex amd64->IR: unhandled instruction bytes: 0xC4 0xE1 0xF9 0x90 0xD 0xDE 0xE8 0x1 0x0 0x41 - vex amd64->IR: REX=0 REX.W=1 REX.R=0 REX.X=0 REX.B=0 - vex amd64->IR: VEX=1 VEX.L=0 VEX.nVVVV=0x0 ESC=0F - vex amd64->IR: PFX.66=1 PFX.F2=0 PFX.F3=0 - -Categorizing these tests under a 'valgrind' setup allows distributions -to easily disable them. ---- - tests/meson.build | 38 +++++++++++++++++--------------------- - 1 file changed, 17 insertions(+), 21 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index eadf54f..362e87d 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -6,21 +6,18 @@ test_env = [ - 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), - ] - --valgrind_tests = [ -- 'coordinate', -- 'memory-cache', -- 'viewport', --] -- - tests = [ -+ 'coordinate', - 'file-cache', -- 'marker', - 'map', -+ 'marker', - 'marker-layer', -+ 'memory-cache', -+ 'viewport', - ] - - if get_option('vector_renderer') -- valgrind_tests += [ -+ tests += [ - 'vector-expression', - 'vector-style', - 'vector-value', -@@ -29,21 +26,20 @@ endif - - subdir('data') - -+# Allow the tests to be easily run under valgrind using --setup=valgrind - valgrind = find_program('valgrind', required: false) - - if valgrind.found() -- foreach test : valgrind_tests -- executable = executable( -- test, -- test_resources, -- '@[email protected]'.format(test), -- dependencies: [libshumate_dep], -- ) -- -- test(test, valgrind, args: ['--leak-check=full', '--error-exitcode=1', executable], env: test_env) -- endforeach --else -- tests += valgrind_tests -+ add_test_setup('valgrind', -+ exclude_suites: [ 'no-valgrind', 'flaky' ], -+ exe_wrapper: [ -+ valgrind, -+ '--leak-check=full', -+ '--error-exitcode=1', -+ ], -+ env: test_env, -+ timeout_multiplier: 20, -+ ) - endif - - foreach test : tests -@@ -55,4 +51,4 @@ foreach test : tests - ) - - test(test, executable, env: test_env) --endforeach -\ No newline at end of file -+endforeach --- -2.39.3 - diff --git a/media-libs/libshumate/libshumate-1.0.5.ebuild b/media-libs/libshumate/libshumate-1.0.5.ebuild deleted file mode 100644 index cb85cd4ff4fa..000000000000 --- a/media-libs/libshumate/libshumate-1.0.5.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson vala virtualx - -DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps" -HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate"; - -SLOT="1.0/1" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86" -REQUIRED_USE="gtk-doc? ( introspection )" - -IUSE="gtk-doc +introspection vala" # vector-renderer is still experimental, maybe put in at a later release - -RDEPEND=" - >=dev-libs/glib-2.68.0:2 - >=x11-libs/cairo-1.4 - >=dev-db/sqlite-1.12:3 - >=gui-libs/gtk-4:4 - >=net-libs/libsoup-3.0:3.0 - introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) -" -# vector-renderer? ( -# >=dev-libs/json-glib-1.6.0[introspection?] -# dev-libs/protobuf-c -# ) - -DEPEND="${RDEPEND}" -BDEPEND=" - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/1.0.4-tests-Add-test-setup-for-valgrind.patch -) - -src_configure() { - local emesonargs=( - $(meson_use introspection gir) - $(meson_use vala vapi) - $(meson_use gtk-doc gtk_doc) - -Ddemos=false # only built, not installed - # $(meson_use vector-renderer vector_renderer) - -Dvector_renderer=false - -Dlibsoup3=true - ) - meson_src_configure -} - -src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' -} - -src_install() { - meson_src_install - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html || die - mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/html/libshumate-1.0 || die - fi -}
