commit: 79aa2673135eb99e9c08d3e4a0407eaa1cb675f8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 13 20:26:13 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 13 20:26:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79aa2673
dev-libs/gumbo: backport fix for new gtest Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/gumbo/files/gumbo-0.13.1-gtest.patch | 52 +++++++++++++++++++++++++++ dev-libs/gumbo/gumbo-0.13.1.ebuild | 1 + 2 files changed, 53 insertions(+) diff --git a/dev-libs/gumbo/files/gumbo-0.13.1-gtest.patch b/dev-libs/gumbo/files/gumbo-0.13.1-gtest.patch new file mode 100644 index 000000000000..2e5164b8e630 --- /dev/null +++ b/dev-libs/gumbo/files/gumbo-0.13.1-gtest.patch @@ -0,0 +1,52 @@ +https://codeberg.org/gumbo-parser/gumbo-parser/commit/22182be87a5bcb2e9ab46562ccf59d30e7771b92 + +From 22182be87a5bcb2e9ab46562ccf59d30e7771b92 Mon Sep 17 00:00:00 2001 +From: Grigory Kirillov <[email protected]> +Date: Wed, 28 May 2025 09:25:40 +0300 +Subject: [PATCH] meson.build: fix compilation with gtest which requires C++17 + now + +--- + meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 39a6c9a..6615119 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,7 @@ project( + 'gumbo-parser', + 'c', + version: '0.13.1', +- default_options: ['c_std=c99', 'cpp_std=c++14', 'default_library=both'] ++ default_options: ['c_std=c99', 'default_library=both'] + ) + + gumbo_src = files( +@@ -27,7 +27,7 @@ pkg = import('pkgconfig') + pkg.generate(libgumbo, filebase: 'gumbo', name: 'Gumbo', description: 'A fully-compliant HTML5 parser.') + + if get_option('tests') +- add_languages('cpp') ++ add_languages('cpp', native: false) + + # TODO: Fallback in case gtest isn't installed + gtest_main = dependency('gtest_main') +@@ -47,6 +47,7 @@ if get_option('tests') + gumbo_test = executable( + 'gumbo_test', + gumbo_test_src, ++ cpp_args: ['-std=c++17'], + link_with: [libgumbo], + include_directories: ['src'], + dependencies: [gtest_main], +@@ -57,7 +58,7 @@ if get_option('tests') + endif + + if get_option('examples') +- add_languages('cpp') ++ add_languages('cpp', native: false) + + example_src = files( + 'examples/clean_text.cc', + diff --git a/dev-libs/gumbo/gumbo-0.13.1.ebuild b/dev-libs/gumbo/gumbo-0.13.1.ebuild index 345ea340b044..3ca40d994aa1 100644 --- a/dev-libs/gumbo/gumbo-0.13.1.ebuild +++ b/dev-libs/gumbo/gumbo-0.13.1.ebuild @@ -21,6 +21,7 @@ BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}/gumbo-0.13.1-PR12-default_library.patch" + "${FILESDIR}/gumbo-0.13.1-gtest.patch" ) src_configure() {
