commit: 15ce308f058bf5fc291af8f2f9d56d4da496c866 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jun 10 13:55:11 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 10 13:55:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ce308f
app-misc/localsearch: drop examples patch, use --no-suite instread It didn't apply to 3.6.2-r2. Closes: https://bugs.gentoo.org/957774 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/Disable-the-examples-test-suite.patch | 33 ---------------------- app-misc/localsearch/localsearch-3.6.2-r2.ebuild | 3 +- app-misc/localsearch/localsearch-3.8.2.ebuild | 3 +- 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/app-misc/localsearch/files/Disable-the-examples-test-suite.patch b/app-misc/localsearch/files/Disable-the-examples-test-suite.patch deleted file mode 100644 index c3bd8f9d3776..000000000000 --- a/app-misc/localsearch/files/Disable-the-examples-test-suite.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b81a0c84b9850efa47b4ac136e351225119f659d Mon Sep 17 00:00:00 2001 -From: Lukas Schmelting <[email protected]> -Date: Sun, 8 Jun 2025 12:19:58 +0200 -Subject: [PATCH] Disable the examples test suite - -Signed-off-by: Lukas Schmelting <[email protected]> ---- - examples/python/meson.build | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/examples/python/meson.build b/examples/python/meson.build -index fed90e6..9bb3f3c 100644 ---- a/examples/python/meson.build -+++ b/examples/python/meson.build -@@ -7,9 +7,9 @@ examples = [ - 'query-sync', - ] - --foreach example_name: examples -- file = meson.current_source_dir() / '@[email protected]'.format(example_name) -- test(example_name, python, -- args: sandbox_python_args + [file], -- suite: 'examples') --endforeach -+# foreach example_name: examples -+# file = meson.current_source_dir() / '@[email protected]'.format(example_name) -+# test(example_name, python, -+# args: sandbox_python_args + [file], -+# suite: 'examples') -+# endforeach --- -2.49.0 - diff --git a/app-misc/localsearch/localsearch-3.6.2-r2.ebuild b/app-misc/localsearch/localsearch-3.6.2-r2.ebuild index 2ca9077c3652..2e7c62f9fd60 100644 --- a/app-misc/localsearch/localsearch-3.6.2-r2.ebuild +++ b/app-misc/localsearch/localsearch-3.6.2-r2.ebuild @@ -88,7 +88,6 @@ BDEPEND=" PATCHES=( # https://gitlab.gnome.org/GNOME/localsearch/-/merge_requests/511 "${FILESDIR}/tracker-miners-3.6.2-epoll_wait.patch" - "${FILESDIR}/Disable-the-examples-test-suite.patch" ) python_check_deps() { @@ -174,7 +173,7 @@ src_configure() { src_test() { export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory") export PYTHONPATH="${ESYSROOT}"/usr/$(get_libdir)/tracker-3.0 - dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' + dbus-run-session meson test -C "${BUILD_DIR}" --no-suite examples || die 'tests failed' } pkg_postinst() { diff --git a/app-misc/localsearch/localsearch-3.8.2.ebuild b/app-misc/localsearch/localsearch-3.8.2.ebuild index d324010e5f03..2f87b5bcb404 100644 --- a/app-misc/localsearch/localsearch-3.8.2.ebuild +++ b/app-misc/localsearch/localsearch-3.8.2.ebuild @@ -18,7 +18,6 @@ REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreame RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}/Disable-the-examples-test-suite.patch" "${FILESDIR}/localsearch-3.8.2-ontologies.patch" "${FILESDIR}/localsearch-3.8.2-ffmpeg-7.patch" ) @@ -174,7 +173,7 @@ src_configure() { src_test() { export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory") export PYTHONPATH="${ESYSROOT}"/usr/$(get_libdir)/tinysparql-3.0 - dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' + dbus-run-session meson test -C "${BUILD_DIR}" --no-suite examples || die 'tests failed' } pkg_postinst() {
