[gentoo-commits] repo/gentoo:master commit in: dev-libs/gumbo/files/, dev-libs/gumbo/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/gumbo/files/, dev-libs/gumbo/

[Sam James]

commit:     7075f280b4f20029ad6fdab4b343767efe549972
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Mon May 12 20:15:30 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 21 21:01:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7075f280

dev-libs/gumbo: add 0.13.1

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Part-of: https://github.com/gentoo/gentoo/pull/42061
Closes: https://github.com/gentoo/gentoo/pull/42061
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/gumbo/Manifest                            |  1 +
 .../files/gumbo-0.13.1-PR12-default_library.patch  | 37 +++++++++++++++++
 dev-libs/gumbo/gumbo-0.13.1.ebuild                 | 48 ++++++++++++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest
index c53dcbb2a91e..1508b0f77074 100644
--- a/dev-libs/gumbo/Manifest
+++ b/dev-libs/gumbo/Manifest
@@ -1 +1,2 @@
 DIST gumbo-0.13.0.tar.gz 2114279 BLAKE2B 21dd11312b4c8043810d03b62949313f5e69abbef2cc032c5d2a5d5d9a65d4711a7473dc7d4e3fcde7b15ad5b9df8d18d2eb2b1bdae4ec0ed236092ac3331bdf SHA512 b87694179f35490fc25c6100c3bd81019926954e4838886d50698158e2a5bbb36f119cb086dfad05ff867a80b7bed8ada8bcbbf83bd1a151fb43921b66d9b61e
+DIST gumbo-0.13.1.tar.gz 2115080 BLAKE2B f6fd8fa818b58adbf6ed9d7ffe1d44a2d9902570addd6fe1c384273c965d345ba04f7a09ccb7860c2d065f5ee2a9193140ea753b08261bf8f3077d69a90bfc85 SHA512 22bdaac728e79fb176ea82d40bfab77500a85952d731f832ffa6defb48264a1f108a9bbde19fd60e9d829d23059feab0744b4dabf887997596892b815cb26f17

diff --git a/dev-libs/gumbo/files/gumbo-0.13.1-PR12-default_library.patch b/dev-libs/gumbo/files/gumbo-0.13.1-PR12-default_library.patch
new file mode 100644
index 000000000000..cff11c61287e
--- /dev/null
+++ b/dev-libs/gumbo/files/gumbo-0.13.1-PR12-default_library.patch
@@ -0,0 +1,37 @@
+From 3cd89bccda2b2e788f6489dcc84bc7e331caf800 Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Mon, 12 May 2025 22:38:56 +0200
+Subject: [PATCH] meson.build: Use default_library=both instead of
+ both_libraries
+
+Allows distros to set -Ddefault_library=shared when a static
+library isn't warranted.
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 1f79aae..39a6c9a 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_options: ['c_std=c99', 'cpp_std=c++14', 'default_library=both']
+ )
+ 
+ gumbo_src = files(
+@@ -19,7 +19,7 @@ gumbo_src = files(
+ 	'src/vector.c',
+ )
+ 
+-libgumbo = both_libraries('gumbo', gumbo_src, version: '3.0.0', install: true)
++libgumbo = library('gumbo', gumbo_src, version: '3.0.0', install: true)
+ 
+ install_headers('src/gumbo.h', 'src/tag_enum.h')
+ 
+-- 
+2.45.2
+

diff --git a/dev-libs/gumbo/gumbo-0.13.1.ebuild b/dev-libs/gumbo/gumbo-0.13.1.ebuild
new file mode 100644
index 000000000000..a8147785955a
--- /dev/null
+++ b/dev-libs/gumbo/gumbo-0.13.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="The HTML5 parsing algorithm implemented as a pure C99 library"
+HOMEPAGE="https://codeberg.org/grisha/gumbo-parser"
+SRC_URI="https://codeberg.org/grisha/gumbo-parser/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/gumbo-parser"
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # gumbo SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-text/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/gumbo-0.13.1-PR12-default_library.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		-Ddefault_library=shared
+	)
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		doxygen || die "doxygen failed"
+		HTML_DOCS=( docs/html/. )
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	use doc && doman docs/man/man3/*
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/gumbo/files/, dev-libs/gumbo/

[Sam James]

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 <txgk@bk.ru>
+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() {