commit: a5fbe70ba8ce1af3a1b2768c39b59b2d32c8d030 Author: Julien Roy <julien <AT> jroy <DOT> ca> AuthorDate: Sat Apr 6 01:13:19 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Sat Apr 6 01:14:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a5fbe70b
gnome-extra/commit: fix tests, install phase Closes: https://bugs.gentoo.org/927845 Closes: https://bugs.gentoo.org/927844 Signed-off-by: Julien Roy <julien <AT> jroy.ca> .../commit/{commit-4.1.ebuild => commit-4.1-r1.ebuild} | 9 ++++++++- gnome-extra/commit/files/remove-failing-tests.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/gnome-extra/commit/commit-4.1.ebuild b/gnome-extra/commit/commit-4.1-r1.ebuild similarity index 79% rename from gnome-extra/commit/commit-4.1.ebuild rename to gnome-extra/commit/commit-4.1-r1.ebuild index 3bf78f0dc4..60e4597529 100644 --- a/gnome-extra/commit/commit-4.1.ebuild +++ b/gnome-extra/commit/commit-4.1-r1.ebuild @@ -39,14 +39,21 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + # This test only validates upstream .xml file + "${FILESDIR}/remove-failing-tests.patch" +) + src_unpack() { default - mv "${WORKDIR}"/troll-${TROLL_COMMIT}/* "${S}"/troll || die + mv "${WORKDIR}"/troll-"${TROLL_COMMIT}"/* "${S}"/troll || die } src_install() { meson_src_install dosym -r /usr/bin/re.sonny.Commit /usr/bin/"${PN}" + dodir /usr/share/metainfo + mv "${ED}"/usr/share/appdata/re.sonny.Commit.metainfo.xml "${ED}"/usr/share/metainfo/ || die } pkg_postinst() { diff --git a/gnome-extra/commit/files/remove-failing-tests.patch b/gnome-extra/commit/files/remove-failing-tests.patch new file mode 100644 index 0000000000..24bb79f0e9 --- /dev/null +++ b/gnome-extra/commit/files/remove-failing-tests.patch @@ -0,0 +1,18 @@ +diff --git a/data/meson.build b/data/meson.build +index 4629538..8fec511 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -22,13 +22,6 @@ appstream_file = i18n.merge_file( + install_dir: join_paths(get_option('datadir'), 'appdata') + ) + +-appstream_util = find_program('appstream-util', required: false) +-if appstream_util.found() +- test('Validate appstream file', appstream_util, +- args: ['validate', appstream_file] +- ) +-endif +- + install_data('re.sonny.Commit.gschema.xml', + install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') + )
