From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7EC60138334 for ; Thu, 3 Jan 2019 10:54:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3555FE0986; Thu, 3 Jan 2019 10:54:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5E94E0986 for ; Thu, 3 Jan 2019 10:54:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD8BA335D0A for ; Thu, 3 Jan 2019 10:54:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EEE92A7 for ; Thu, 3 Jan 2019 10:54:41 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1546512861.c00985c576a4af05b6cc871fe63f93a6537bb20e.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxml2/files/, dev-libs/libxml2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch dev-libs/libxml2/libxml2-2.9.8.ebuild X-VCS-Directories: dev-libs/libxml2/files/ dev-libs/libxml2/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: c00985c576a4af05b6cc871fe63f93a6537bb20e X-VCS-Branch: master Date: Thu, 3 Jan 2019 10:54:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6a2fd2c5-8b61-4321-b957-10b8b2f8eae1 X-Archives-Hash: ff526f2f71fcd92428f9d3b202e48f1d commit: c00985c576a4af05b6cc871fe63f93a6537bb20e Author: Mike Frysinger chromium org> AuthorDate: Thu Jan 3 10:52:31 2019 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 3 10:54:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00985c5 dev-libs/libxml2: fix reader5.py test #565576 Closes: https://bugs.gentoo.org/565576 Signed-off-by: Mike Frysinger gentoo.org> .../files/libxml2-2.9.8-out-of-tree-test.patch | 40 ++++++++++++++++++++++ dev-libs/libxml2/libxml2-2.9.8.ebuild | 3 ++ 2 files changed, 43 insertions(+) diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch new file mode 100644 index 00000000000..fcc441d05de --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch @@ -0,0 +1,40 @@ +https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14 + +From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 3 Jan 2019 05:44:03 -0500 +Subject: [PATCH] fix reader5.py test when building out of tree + +When building out of tree, the relative path this test uses doesn't +work. Resolve the path relative to the test script itself instead. + +Url: https://bugs.gentoo.org/565576 +--- + python/tests/reader5.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/python/tests/reader5.py b/python/tests/reader5.py +index 82d0daea474a..da5355ffc4c6 100755 +--- a/python/tests/reader5.py ++++ b/python/tests/reader5.py +@@ -4,6 +4,7 @@ + # this extract the Dragon bibliography entries from the XML specification + # + import libxml2 ++import os + import sys + + # Memory debug specific +@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman. + Compilers: Principles, Techniques, and Tools. + Reading: Addison-Wesley, 1986, rpt. corr. 1988.""" + +-f = open('../../test/valid/REC-xml-19980210.xml', 'rb') ++basedir = os.path.dirname(os.path.realpath(__file__)) ++f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb') + input = libxml2.inputBuffer(f) + reader = input.newTextReader("REC") + res="" +-- +2.19.1 + diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild index 1917e19e628..fbb37285cb7 100644 --- a/dev-libs/libxml2/libxml2-2.9.8.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild @@ -81,6 +81,9 @@ src_prepare() { # https://bugzilla.gnome.org/show_bug.cgi?id=760458 eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch + # Fix python tests when building out of tree #565576 + eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch + if [[ ${CHOST} == *-darwin* ]] ; then # Avoid final linking arguments for python modules sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die