From 6dba4d53eec5865c7d7f9ab96d3322a40af6ea11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 17 May 2020 18:27:10 +0200 Subject: [PATCH] leatherman: update to 1.12.0; switch to shlibs --- common/shlibs | 9 +++++++++ srcpkgs/leatherman-devel | 1 + srcpkgs/leatherman/template | 21 ++++++++++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/leatherman-devel diff --git a/common/shlibs b/common/shlibs index 22e35e2688..e2b782e80e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2548,6 +2548,15 @@ libOpenCOLLADABaseUtils.so opencollada-0.0.20160223_1 libOpenCOLLADAFramework.so opencollada-0.0.20160223_1 libOpenCOLLADASaxFrameworkLoader.so opencollada-0.0.20160223_1 libOpenCOLLADAStreamWriter.so opencollada-0.0.20160223_1 +leatherman_util.so.1.12.0 leatherman-1.12.0_1 +leatherman_locale.so.1.12.0 leatherman-1.12.0_1 +leatherman_logging.so.1.12.0 leatherman-1.12.0_1 +leatherman_json_container.so.1.12.0 leatherman-1.12.0_1 +leatherman_file_util.so.1.12.0 leatherman-1.12.0_1 +leatherman_curl.so.1.12.0 leatherman-1.12.0_1 +leatherman_dynamic_library.so.1.12.0 leatherman-1.12.0_1 +leatherman_execution.so.1.12.0 leatherman-1.12.0_1 +leatherman_ruby.so.1.12.0 leatherman-1.12.0_1 libUTF.so opencollada-0.0.20160223_1 libbuffer.so opencollada-0.0.20160223_1 libftoa.so opencollada-0.0.20160223_1 diff --git a/srcpkgs/leatherman-devel b/srcpkgs/leatherman-devel new file mode 120000 index 0000000000..0301550272 --- /dev/null +++ b/srcpkgs/leatherman-devel @@ -0,0 +1 @@ +leatherman \ No newline at end of file diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index cf8785bcd1..92a35640bf 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -1,16 +1,27 @@ # Template file for 'leatherman' -# Note: always revbump cpp-hocon when updating as it links against this static lib pkgname=leatherman -version=1.11.0 +version=1.12.0 revision=1 build_style=cmake -hostmakedepends="pkg-config" +configure_args="-DLEATHERMAN_SHARED=ON" +hostmakedepends="pkg-config python3" makedepends="boost-devel libcurl-devel" short_desc="Collection of C++ and CMake utility libraries" maintainer="Jürgen Buchmüller " license="Apache-2.0" -homepage="https://github.com/puppetlabs/leatherman" +homepage="https://github.com/puppetlabs/leatherman/" distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=38fe9a272fec824c503a9dc91b79cfe6e05b868e55fba9977de9baff5ad1be7e +checksum=93b9f6889963b98aaf64fa4098b5f3402fed1fe0b8e08ff7bcd3abfb00e5a3aa +python_version=3 CXXFLAGS+=" -Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy" + +leatherman-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +}