From 1e3e12cbfdb7c416ce195021deab41fe8063a518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 15 Mar 2021 22:01:47 +0700 Subject: [PATCH 1/5] spdlog: build shared lib --- common/shlibs | 1 + srcpkgs/spdlog/template | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 86567af2ad0f..d463813d035e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3966,3 +3966,4 @@ libsimavrparts.so.1 simavr-1.6_2 libsword-1.8.1.so libsword-1.8.1_6 libpari-gmp.so.7 pari-2.13.0_1 libtree-sitter.so.0 tree-sitter-0.19.0_1 +libspdlog.so.1 libspdlog-1.8.2_2 diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template index 2a8e1c9e8f16..fc3f6e7d6b60 100644 --- a/srcpkgs/spdlog/template +++ b/srcpkgs/spdlog/template @@ -1,11 +1,13 @@ # Template file for 'spdlog' pkgname=spdlog version=1.8.2 -revision=1 +revision=2 build_style=cmake -configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON" +configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON + -DSPDLOG_BUILD_SHARED=ON" hostmakedepends="pkg-config" makedepends="fmt-devel" +depends="libspdlog>=${version}_${revision}" short_desc="Fast C++ logging library" maintainer="Orphaned " license="MIT" @@ -17,6 +19,10 @@ if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON" fi -post_install() { - vlicense LICENSE +libspdlog_package() { + short_desc+=" - libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + vlicense LICENSE + } } From c6c68e55c5af4a26257dcb7b45a5b798f170584f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 15 Mar 2021 22:02:20 +0700 Subject: [PATCH 2/5] Waybar: use shared spdlog --- srcpkgs/Waybar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 16588a75f874..13b84b38d847 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,7 +1,7 @@ # Template file for 'Waybar' pkgname=Waybar version=0.9.5 -revision=1 +revision=2 _date_version=3.0.0 create_wrksrc=yes build_wrksrc=${pkgname}-${version} From 5634e6f71d46e185365e5e7e6c2d89563d72783f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 15 Mar 2021 22:02:29 +0700 Subject: [PATCH 3/5] gerbera: use shared spdlog --- srcpkgs/gerbera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index 451f9eff5398..13ff8252378d 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.6.4 -revision=2 +revision=3 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config" From c06d738c298594ff9338823b85f04a9dbb497440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 15 Mar 2021 22:02:34 +0700 Subject: [PATCH 4/5] libixion: use shared spdlog --- srcpkgs/libixion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index 2d709b3f88b6..6ffb939d830b 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion version=0.16.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel fmt-devel mdds python3-devel spdlog" From 1497a61705a05826ffcbf5cb3215416de5faae0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 15 Mar 2021 22:02:42 +0700 Subject: [PATCH 5/5] nheko: use shared spdlog --- srcpkgs/nheko/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index 541d113a16e6..dd635f70f249 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,7 +1,7 @@ # Template file for 'nheko' pkgname=nheko version=0.7.2 -revision=2 +revision=3 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative" makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel