[gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     80e884d2a91e5e3a83def06a41c44bb312f0a45e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 21:06:03 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 21:31:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e884d2

dev-libs/libical: Fix tests

Reported-by: eroen <gentoo <AT> eroen.eu>
Bug: https://bugs.gentoo.org/532296
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/libical/files/libical-2.0.0-tests.patch | 38 ++++++++++++++++++++++++
 dev-libs/libical/libical-2.0.0-r2.ebuild         |  5 +++-
 dev-libs/libical/libical-2.0.0-r3.ebuild         |  1 +
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
new file mode 100644
index 00000000000..a274382b315
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-tests.patch
@@ -0,0 +1,38 @@
+From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter@kdab.com>
+Date: Thu, 24 Mar 2016 16:28:02 -0400
+Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
+ data thereby fixing in-source building ISSUE#228
+ https://bugs.gentoo.org/show_bug.cgi?id=532296
+
+---
+ src/test/recur.c    | 2 +-
+ src/test/testvcal.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/recur.c b/src/test/recur.c
+index d427137a..873ec48a 100644
+--- a/src/test/recur.c
++++ b/src/test/recur.c
+@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
+ #endif
+ 
+     if (argc <= 1) {
+-        file = "../../test-data/recur.txt";
++        file = TEST_DATADIR "/recur.txt";
+     } else if (argc == 2) {
+         file = argv[1];
+     } else {
+diff --git a/src/test/testvcal.c b/src/test/testvcal.c
+index feee8147..024bbe99 100644
+--- a/src/test/testvcal.c
++++ b/src/test/testvcal.c
+@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
+     char *file;
+ 
+     if (argc != 2) {
+-        file = "../../test-data/user-cal.vcf";
++        file = TEST_DATADIR "/user-cal.vcf";
+     } else {
+         file = argv[1];
+     }

diff --git a/dev-libs/libical/libical-2.0.0-r2.ebuild b/dev-libs/libical/libical-2.0.0-r2.ebuild
index 591441b014b..c0e34d96a4e 100644
--- a/dev-libs/libical/libical-2.0.0-r2.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r2.ebuild
@@ -27,7 +27,10 @@ DOCS=(
 	doc/{AddingOrModifyingComponents,UsingLibical}.txt
 )
 
-PATCHES=( "${FILESDIR}/fix-libdir-location.patch" )
+PATCHES=(
+	"${FILESDIR}/fix-libdir-location.patch"
+	"${FILESDIR}/${P}-tests.patch" #bug 532296
+)
 
 src_configure() {
 	# See above, introspection is disabled for v2.0.0 at least.

diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
index 3b8c09f8c43..18915f35433 100644
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
 	"${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
 	"${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
+	"${FILESDIR}/${P}-tests.patch" #bug 532296
 )
 
 src_configure() {