Re: [PR PATCH] [Updated] cpp-hocon: add shared library, disable tests build

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/paper42/void-packages cpp-hocon
https://github.com/void-linux/void-packages/pull/40645

cpp-hocon: add shared library, disable tests build
tests do not build with gcc 12

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cpp-hocon-40645.patch --]
[-- Type: text/x-diff, Size: 5657 bytes --]

From 9efe1f486dd3f44bb23fb09e3ffe71a867070477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Dec 2022 19:51:30 +0700
Subject: [PATCH 1/3] leatherman: really bump to revision 4

fix c68be094a42, (leatherman: fix vendor include for catch, 2022-11-25)
---
 srcpkgs/leatherman/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index a2813bd4a923..4c6e775bfcee 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,6 @@
 # Template file for 'leatherman'
 pkgname=leatherman
 version=1.12.4
-revision=3
 revision=4
 build_style=cmake
 configure_args="-DLEATHERMAN_SHARED=ON"

From 361b56aa8f7f94633bca1d81a0054a16e5656306 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 20 Nov 2022 13:19:04 +0100
Subject: [PATCH 2/3] cpp-hocon: build shared library

---
 common/shlibs              |  1 +
 srcpkgs/cpp-hocon-devel    |  1 +
 srcpkgs/cpp-hocon/template | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/cpp-hocon-devel

diff --git a/common/shlibs b/common/shlibs
index 3da9f38d56a0..8fd417267d4d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4205,3 +4205,4 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
 libtracefs.so.1 libtracefs-1.4.2_1
 libtracecmd.so.1 libtracecmd-3.1.2_1
 libkshark.so.2 libkshark-2.1.1_1
+libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
diff --git a/srcpkgs/cpp-hocon-devel b/srcpkgs/cpp-hocon-devel
new file mode 120000
index 000000000000..8d8bc1453e86
--- /dev/null
+++ b/srcpkgs/cpp-hocon-devel
@@ -0,0 +1 @@
+cpp-hocon
\ No newline at end of file
diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template
index f61316adcc11..ce521b1395ae 100644
--- a/srcpkgs/cpp-hocon/template
+++ b/srcpkgs/cpp-hocon/template
@@ -1,20 +1,23 @@
 # Template file for 'cpp-hocon'
 pkgname=cpp-hocon
 version=0.3.0
-revision=4
+revision=5
 build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
 makedepends="boost-devel leatherman-devel libcurl-devel"
 short_desc="C++ port of the Typesafe Config library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/cpp-hocon/"
-distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz"
 checksum=dab02354046f05aca6275c746d7583ee5f71853aa5b1d93529564632e184c3dd
 
-post_install() {
-	# this package is a static library,
-	# needs to be rebuild when update boost,
-	# force an shlib-dependencies
-	vbin build/bin/libcpp-hocon_test
+cpp-hocon-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
 }

From 456a0bfb9cfb007acc610b566f27c99c31325ccb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 20 Nov 2022 13:35:34 +0100
Subject: [PATCH 3/3] facter: use shared cpp-hocon

Close: #40645
---
 srcpkgs/facter/patches/shared_cpp_hcon.patch | 13 +++++++++++++
 srcpkgs/facter/template                      |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/facter/patches/shared_cpp_hcon.patch

diff --git a/srcpkgs/facter/patches/shared_cpp_hcon.patch b/srcpkgs/facter/patches/shared_cpp_hcon.patch
new file mode 100644
index 000000000000..37c475697a96
--- /dev/null
+++ b/srcpkgs/facter/patches/shared_cpp_hcon.patch
@@ -0,0 +1,13 @@
+https://github.com/archlinux/svntogit-community/blob/0eb74a76c976a7fd638fbf6cd1c3b47be3dccd8b/trunk/shared_cpp_hcon.patch
+
+diff --git a/cmake/FindCPPHOCON.cmake b/cmake/FindCPPHOCON.cmake
+index 00ba8bd..0df0a51 100644
+--- a/cmake/FindCPPHOCON.cmake
++++ b/cmake/FindCPPHOCON.cmake
+@@ -1,5 +1,5 @@
+ include(FindDependency)
+-find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a")
++find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.so")
+ 
+ include(FeatureSummary)
+ set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon")
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 45c921a0b72d..f92ea61d20ce 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,12 +1,12 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.16
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
 hostmakedepends="ruby-devel"
-makedepends="boost-devel cpp-hocon leatherman-devel libblkid-devel libcurl-devel
+makedepends="boost-devel cpp-hocon-devel leatherman-devel libblkid-devel libcurl-devel
  ruby-devel yaml-cpp-devel"
 depends="net-tools ruby"
 short_desc="Collect and display system facts"
@@ -18,13 +18,13 @@ checksum=196c69b1ae325dbf11f68025eb12b9c53c054bee9112bd4f3e2ece8c5fe76571
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
-		mips*)	sed -i lib/CMakeLists.txt -e'/add_subdirectory(tests)/d' ;;
+		mips*)	vsed -i lib/CMakeLists.txt -e'/add_subdirectory(tests)/d' ;;
 	esac
 }
 
 post_build() {
 	# fixup vendor_ruby usr/lib{32,64} install path to always use usr/lib
-	vsed -i build/lib/cmake_install.cmake -e "s;lib32;lib;g" -e "s;lib64;lib;g"
+	vsed -i build/lib/cmake_install.cmake -e "s;lib\(32\|64\);lib;g"
 }
 
 facter-devel_package() {