public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libstrophe/, dev-libs/libstrophe/files/
@ 2023-08-17 13:07 Florian Schmaus
  0 siblings, 0 replies; 2+ messages in thread
From: Florian Schmaus @ 2023-08-17 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     657b220f0313ff9a1f1ba2a476e71597f4d67202
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 13:06:35 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 13:07:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657b220f

dev-libs/libstrophe: fix tests

Closes: https://bugs.gentoo.org/912410
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 ...libstrophe-0.12.3-allow-tests-when-static.patch | 59 ++++++++++++++++++++++
 dev-libs/libstrophe/libstrophe-0.12.3.ebuild       |  4 ++
 2 files changed, 63 insertions(+)

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 <jaeckel-floss@eyet-services.de>
+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 <jaeckel-floss@eyet-services.de>
+--- 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
index 84880fd6c622..e1970434de69 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 
 DOCS=( ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.3-allow-tests-when-static.patch"
+)
+
 src_configure() {
 	# shellcheck disable=SC2207
 	local myeconf=(


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libstrophe/, dev-libs/libstrophe/files/
@ 2025-01-15 20:18 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-01-15 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     9b8a67badd94763230bd7a5663e5a28261201447
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 20:16:45 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 20:18:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b8a67ba

dev-libs/libstrophe: drop 0.12.2, 0.12.3, 0.13.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libstrophe/Manifest                       |  4 --
 ...libstrophe-0.12.3-allow-tests-when-static.patch | 59 ------------------
 dev-libs/libstrophe/libstrophe-0.12.2.ebuild       | 69 ----------------------
 dev-libs/libstrophe/libstrophe-0.12.3.ebuild       | 65 --------------------
 dev-libs/libstrophe/libstrophe-0.13.0.ebuild       | 61 -------------------
 5 files changed, 258 deletions(-)

diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 12475731329b..83459f94e189 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,5 +1 @@
-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-0.13.0.tar.xz 405368 BLAKE2B 8fb29b5f396a75620df6948b1ef109f846832f7781a527221d6781b350b522ac314cd5d44558757787659476481f66d4dcaa9ccea68dfa56fd907578eb74f78a SHA512 b7c3c728af986a6a3a7b9efcdc107f96f857ee3397cc5c2569fa033be47960cc0045a2d6c1b20524b1e1483d0d7234a3987490c0e0ebfea1371013d28de60384
 DIST libstrophe-0.13.1.tar.xz 405676 BLAKE2B b5ee084899c01d600c23e8d54e600bf72c2a92147e739d3b286c034ea3badf5e924b11a08c8c84f1453e88df40d494549286897ac3e90fb9af18b29da9754e07 SHA512 e150567db75ce615d7946471d15f968f8825ae75aa349a3c3be4e960eaea0b4960ac4c2da9aec40e984678361d89db3055062aa523ef485e9ea58a761bbcceed
-DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5

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
deleted file mode 100644
index b351bb0137c7..000000000000
--- a/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9eba8e873847b6ed6e4aa8e9e887d45c2351f6ed Mon Sep 17 00:00:00 2001
-From: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
-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 <jaeckel-floss@eyet-services.de>
---- 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.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
deleted file mode 100644
index 304dae8e12ed..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-HOMEPAGE="https://strophe.im/libstrophe/"
-# 2nd SRC is a backport of the /bin/sh -> dash fix, #877049, #879533
-SRC_URI="
-	https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz
-	https://github.com/strophe/libstrophe/commit/7352bd5cdbacf98771fdc0d32a606c4b6718077c.patch -> ${PN}-fix-configure-bashisms.patch
-"
-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-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	# https://github.com/strophe/libstrophe/pull/218
-	"${DISTDIR}/${PN}-fix-configure-bashisms.patch"
-)
-
-src_prepare() {
-	default
-
-	# Needed for bashisms patch which touches configure
-	eautoreconf
-}
-
-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
-}

diff --git a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
deleted file mode 100644
index f195859a711c..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-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-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.3-allow-tests-when-static.patch"
-)
-
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
-src_configure() {
-	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
-}

diff --git a/dev-libs/libstrophe/libstrophe-0.13.0.ebuild b/dev-libs/libstrophe/libstrophe-0.13.0.ebuild
deleted file mode 100644
index c1a86333b67e..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.13.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-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-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
-src_configure() {
-	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
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-01-15 20:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-15 20:18 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libstrophe/, dev-libs/libstrophe/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-08-17 13:07 Florian Schmaus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox