From 8eb7b1e5c1ed8bb6c1a6751ae9034e7913eaf697 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Thu, 1 Apr 2021 11:31:53 +0200 Subject: [PATCH 1/2] gumbo-parser: depend -devel package on the base and fixes - Installing gumbo-parser-devel didn't provide .so files, because they are in the base package, so packages depending on this library used the static one instead. - add libgumbo to shlibs - fix checks - remove starting an article --- common/shlibs | 1 + srcpkgs/gumbo-parser/template | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 0f3cd7161b1b..9cc5873cdaed 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3973,3 +3973,4 @@ libspdlog.so.1 libspdlog-1.8.2_2 libmd.so.0 libmd-1.0.3_1 libldacBT_abr.so.2 ldacBT-2.0.2.3_1 libldacBT_enc.so.2 ldacBT-2.0.2.3_1 +libgumbo.so.1 gumbo-parser-0.10.1_2 diff --git a/srcpkgs/gumbo-parser/template b/srcpkgs/gumbo-parser/template index 40daed6dbdda..db546f7640f1 100644 --- a/srcpkgs/gumbo-parser/template +++ b/srcpkgs/gumbo-parser/template @@ -4,7 +4,8 @@ version=0.10.1 revision=2 build_style=gnu-configure hostmakedepends="autoconf automake libtool" -short_desc="An HTML5 parsing library in pure C99" +checkdepends="gtest-devel" +short_desc="HTML5 parsing library in pure C99" maintainer="Oliver Kiddle " license="Apache-2.0" homepage="https://github.com/google/gumbo-parser" @@ -19,6 +20,7 @@ pre_configure() { gumbo-parser-devel_package() { short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig From e0ed3c5d601574a446ad21d13809c8d28d8d8a91 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Thu, 1 Apr 2021 11:56:07 +0200 Subject: [PATCH 2/2] httpdirfs: revbump for gumbo-parser and remove depends Libraries are detected automatically by xbps-src anyway. --- srcpkgs/httpdirfs/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template index cbff9e7ae259..642e893c0435 100644 --- a/srcpkgs/httpdirfs/template +++ b/srcpkgs/httpdirfs/template @@ -1,12 +1,11 @@ # Template file for 'httpdirfs' pkgname=httpdirfs version=1.2.0 -revision=3 +revision=4 build_style=gnu-makefile make_install_args="prefix=/usr" makedepends="libcurl-devel fuse-devel gumbo-parser-devel libuuid-devel expat-devel" -depends="libcurl fuse gumbo-parser" short_desc="Mount HTTP directory listings, with a permanent cache" maintainer="Nathan Owens " license="GPL-3.0-only"