commit: df08d2224060b6371193cbc4429f4914b6bc9220 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Thu Mar 24 13:02:43 2022 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Thu Mar 24 14:23:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=df08d222
dev-util/ots: fix patch Closes: https://bugs.gentoo.org/835882 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> dev-util/ots/files/ots-8.2.1-meson-gtest.diff | 21 +++++++++++++++++++++ dev-util/ots/ots-8.2.1.ebuild | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dev-util/ots/files/ots-8.2.1-meson-gtest.diff b/dev-util/ots/files/ots-8.2.1-meson-gtest.diff new file mode 100644 index 000000000..3fde32b35 --- /dev/null +++ b/dev-util/ots/files/ots-8.2.1-meson-gtest.diff @@ -0,0 +1,21 @@ +--- a/meson.build ++++ b/meson.build +@@ -244,6 +244,7 @@ if cxx.has_header('sys/time.h') + + + # https://mesonbuild.com/Dependencies.html#gtest-and-gmock ++if get_option('tests') + gtest = dependency('gtest', main : true, fallback : ['gtest', 'gtest_main_dep']) + + cff_charstring = executable('cff_charstring', +@@ -283,3 +283,4 @@ test('test_fuzzed_fonts', + suite: 'fuzzing', + ) + endforeach ++endif +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,2 +1,3 @@ ++option('tests', type : 'boolean', value : false, description : 'Enable tests') + option('graphite', type : 'boolean', value : true, description : 'Sanitize Graphite tables') + option('fuzzer_ldflags', type: 'string', description : 'Extra LDFLAGS used during linking of fuzzing binaries') diff --git a/dev-util/ots/ots-8.2.1.ebuild b/dev-util/ots/ots-8.2.1.ebuild index cb4b2a3c8..d8da251a6 100644 --- a/dev-util/ots/ots-8.2.1.ebuild +++ b/dev-util/ots/ots-8.2.1.ebuild @@ -32,7 +32,7 @@ DOCS=( docs/{DesignDoc,HowToFix,HowToTest}.md ) -PATCHES=( "${FILESDIR}/meson-gtest.diff" ) +PATCHES=( "${FILESDIR}/${P}-meson-gtest.diff" ) src_configure() { local emesonargs=(
