commit: cb658281569eb887138e836f0c17a6855c84f047
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 22:16:24 2020 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 22:31:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb658281
sci-libs/libsigrok: Fix FEATURES=test with >=dev-libs/check-0.15
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
.../files/libsigrok-0.5.2-check-0.15.patch | 26 ++++++++++++++++++++++
sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch
b/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch
new file mode 100644
index 00000000000..8099dcc6c49
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch
@@ -0,0 +1,26 @@
+From 505a55f7899ee2eb41418e753a1290252202ecd3 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jsl...@suse.cz>
+Date: Tue, 15 Sep 2020 08:50:48 +0200
+Subject: [PATCH] tests: strutil, use ck_assert
+
+We pass no message, so use ck_assert instead of ck_assert_msg. This
+results in an error with check 0.15:
+tests/strutil.c:157:2: error: too few arguments to function '_ck_assert_failed'
+ 157 | ck_assert_msg(saved_locale != NULL);
+---
+ tests/strutil.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/strutil.c b/tests/strutil.c
+index fca70eaae..ec2233329 100644
+--- a/tests/strutil.c
++++ b/tests/strutil.c
+@@ -154,7 +154,7 @@ START_TEST(test_locale)
+ fprintf(stderr, "Old locale = %s\n", old_locale);
+ /* Copy the name so it won’t be clobbered by setlocale. */
+ saved_locale = g_strdup(old_locale);
+- ck_assert_msg(saved_locale != NULL);
++ ck_assert(saved_locale != NULL);
+
+ #ifdef _WIN32
+ /*
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index bff13a8719a..17fe88bad8f 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
"${FILESDIR}/${P}-swig-4.patch"
# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
"${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+ "${FILESDIR}/${P}-check-0.15.patch"
)
pkg_setup() {
