From c74abf990d32765245eeb94b36ad4af642cae8c0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 17 Aug 2023 15:32:39 +0100 Subject: gentoo auto-resync : 17:08:2023 - 15:32:39 --- dev-libs/Manifest.gz | Bin 97315 -> 97318 bytes dev-libs/libstrophe/Manifest | 3 ++ ...libstrophe-0.12.3-allow-tests-when-static.patch | 59 +++++++++++++++++++++ dev-libs/libstrophe/libstrophe-0.12.3.ebuild | 57 ++++++++++++++++++++ 4 files changed, 119 insertions(+) create mode 100644 dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch create mode 100644 dev-libs/libstrophe/libstrophe-0.12.3.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 3c1024c56176..cae0444144fb 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest index f474c48d422f..6db6c5c1c739 100644 --- a/dev-libs/libstrophe/Manifest +++ b/dev-libs/libstrophe/Manifest @@ -1,4 +1,7 @@ +AUX libstrophe-0.12.3-allow-tests-when-static.patch 1581 BLAKE2B 64b11197dab020f6a853caf33371084647aa28fe775912924e64caf87f3f1469396b8e8bca12eb929fa5c549e7a7dd578a28bc1ef8d9f5176a7ffba7eb78b737 SHA512 d1b63e850206b5757261a0cbd53ff8b7400d660cbea054d6d69b1ce47918bf9d4dc356e5a53a6eb917a7a45322a80dfadc69099f13002d3b22f6adcc09946156 DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086 +DIST libstrophe-0.12.3.tar.xz 399056 BLAKE2B 9e7e344d46c78393ee2386a842895e29c417eeffbf41bd2e1c775f16bd40cb2387b59e56955a5331242af74932f61abb8afec2bda49c97063689b976b4892a52 SHA512 fa0fcb91c47197391f3b7f186b49ca4921f1937e2d1c9d25afdb73ee766bbeae5efbdeddde9cb6361eb58997c2fb136e2c1ed73a62f8c5618805a9555c473e0b DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5 EBUILD libstrophe-0.12.2.ebuild 1516 BLAKE2B b6d288af1ba33da119fb36a9d881b74103d29e3fb6c0a981eb55258be8a684c9cb522d980266446ace28833aa85a44f97776c4e7206a7d69431eb3057d1452ba SHA512 cd95366161631bfcfb24b70814bc84dba62915b020ed57b0d5fdc326d0933c35adc6eb3d6e0b5c076ff2a991b00b6afd04e5602d194ea4d2b19f48a8c7867a29 +EBUILD libstrophe-0.12.3.ebuild 1162 BLAKE2B 289f4117bc00ebb076e8bf524b6c26dc1c6c9ff5fc8a2cb10af9fc5a060be360e636f5b9b40882d1574965555ec68958c28be6e2e64295310b8fd9885bf39ca1 SHA512 2b7306c485b6ff043cece6216f910128eec4cc5326090dfd145265e086308108acf5983fd7bcacd6da9251a2751fecd9296b9fe695f950abc0c9be5d06a6dda9 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817 diff --git a/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch b/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch new file mode 100644 index 000000000000..b351bb0137c7 --- /dev/null +++ b/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch @@ -0,0 +1,59 @@ +From 9eba8e873847b6ed6e4aa8e9e887d45c2351f6ed Mon Sep 17 00:00:00 2001 +From: Steffen Jaeckel +Date: Wed, 9 Aug 2023 13:34:18 +0200 +Subject: [PATCH] Allow running tests when static library is disabled + +We then only run a subset of the tests, but still better than failing to +build. + +Signed-off-by: Steffen Jaeckel +--- a/Makefile.am ++++ b/Makefile.am +@@ -175,23 +175,29 @@ endif + + + ## Tests +-TESTS = \ ++STATIC_TESTS = \ + tests/check_parser \ ++ tests/test_hash \ ++ tests/test_jid \ ++ tests/test_ctx \ ++ tests/test_send_queue \ ++ tests/test_string \ ++ tests/test_resolver ++ ++TESTS = \ + tests/test_sha1 \ + tests/test_sha256 \ + tests/test_sha512 \ + tests/test_md5 \ + tests/test_rand \ + tests/test_scram \ +- tests/test_ctx \ + tests/test_base64 \ +- tests/test_hash \ +- tests/test_jid \ +- tests/test_send_queue \ + tests/test_snprintf \ +- tests/test_string \ +- tests/test_stanza \ +- tests/test_resolver ++ tests/test_stanza ++ ++if !DISABLE_STATIC ++TESTS += $(STATIC_TESTS) ++endif + + if !DISABLE_TLS + TESTS += tests/test_xmppaddr +--- a/configure.ac ++++ b/configure.ac +@@ -256,6 +256,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], + + AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2]) + AM_CONDITIONAL([DISABLE_TLS], [test x$enable_tls = xno]) ++AM_CONDITIONAL([DISABLE_STATIC], [test x$enable_static = xno]) + AM_CONDITIONAL([NEED_SNPRINTF], [test x$have_snprintf = xno]) + AM_CONDITIONAL([TLS_WITH_GNUTLS], [test x$with_gnutls = xyes]) + AM_CONDITIONAL([TLS_WITH_SCHANNEL], [test x$with_schannel = xyes]) diff --git a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild new file mode 100644 index 000000000000..bfa7f2b9db7f --- /dev/null +++ b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A simple, lightweight C library for writing XMPP clients" +HOMEPAGE="https://strophe.im/libstrophe/" +SRC_URI=" + https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz +" +LICENSE="|| ( MIT GPL-3 )" +# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME +SLOT="0/0.1" +KEYWORDS="~amd64 ~arm64" +IUSE="doc expat gnutls" + +RDEPEND=" + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2:2 ) + gnutls? ( net-libs/gnutls:0= ) + !gnutls? ( dev-libs/openssl:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +DOCS=( ChangeLog ) + +PATCHES=( + "${FILESDIR}/${PN}-0.12.3-allow-tests-when-static.patch" +) + +src_configure() { + # shellcheck disable=SC2207 + local myeconf=( + --enable-tls + $(use_with !expat libxml2) + $(use_with gnutls) + ) + econf "${myeconf[@]}" +} + +src_compile() { + default + if use doc; then + doxygen || die + HTML_DOCS=( docs/html/* ) + fi +} + +src_install() { + default + use doc && dodoc -r examples + find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die +} -- cgit v1.2.3