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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9EF81158030 for ; Mon, 27 Feb 2023 13:48:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4D6FE0794; Mon, 27 Feb 2023 13:48:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83DD9E0794 for ; Mon, 27 Feb 2023 13:48:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B271C340D35 for ; Mon, 27 Feb 2023 13:48:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2348D7D0 for ; Mon, 27 Feb 2023 13:48:25 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1677505700.26859d60f5731734157b21fad361e99ebbc93e94.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-xmp-toolkit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch X-VCS-Directories: dev-python/python-xmp-toolkit/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 26859d60f5731734157b21fad361e99ebbc93e94 X-VCS-Branch: master Date: Mon, 27 Feb 2023 13:48:25 +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: 2ab654f2-d0aa-4e98-9805-a3723c279804 X-Archives-Hash: dad55149263a01de46f8e856d2ad58ee commit: 26859d60f5731734157b21fad361e99ebbc93e94 Author: Jérôme Carretero zougloub eu> AuthorDate: Mon Feb 27 10:14:59 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 27 13:48:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26859d60 dev-python/python-xmp-toolkit: update patch to please testing Update patch to include 2 more changes. Closes: https://bugs.gentoo.org/883939 Signed-off-by: Jérôme Carretero zougloub.eu> Closes: https://github.com/gentoo/gentoo/pull/29826 Signed-off-by: Michał Górny gentoo.org> .../files/python-xmp-toolkit-2.0.1-test.patch | 68 ++++++++++++++++++++-- 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch b/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch index 7679542cf535..e2adc3c05403 100644 --- a/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch +++ b/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch @@ -1,7 +1,67 @@ -diff -r -U1 python-xmp-toolkit-2.0.1.orig/test/test_exempi.py python-xmp-toolkit-2.0.1/test/test_exempi.py ---- python-xmp-toolkit-2.0.1.orig/test/test_exempi.py 2014-03-09 19:42:07.000000000 +0700 -+++ python-xmp-toolkit-2.0.1/test/test_exempi.py 2020-01-21 18:16:13.470778818 +0700 -@@ -539,2 +539,3 @@ +Squashed patches of the following: + +- https://github.com/exmakhina/python-xmp-toolkit/commit/3f7546173980610e0687f4eae4eb28aa026e4674 + gentoo commit 14321e655b7b3f6e531c0a079cb131dbd767e1be + +- https://github.com/exmakhina/python-xmp-toolkit/commit/1459510907764746534ce41afa85a3bedd7029b9 + test: disable tests involving BlueSquare.gif + +- https://github.com/exmakhina/python-xmp-toolkit/commit/bd8a0babef830e9a2c06150f6277ba0ddb1220bd + libxmp: exempi: exempi returns char-sized bool, not int + +diff --git a/libxmp/exempi.py b/libxmp/exempi.py +index 683e240..cddc038 100644 +--- a/libxmp/exempi.py ++++ b/libxmp/exempi.py +@@ -1693,6 +1693,7 @@ def check_error(success): + Return value from library function indicating success or failure. + """ + ++ success = success & 0xff + # Unfortunately the success parameter does not seem to always be reliable + # so we supplement it by explicitly checking the error code. + ecode = EXEMPI.xmp_get_error() +diff --git a/test/common_fixtures.py b/test/common_fixtures.py +index 135a795..363246c 100644 +--- a/test/common_fixtures.py ++++ b/test/common_fixtures.py +@@ -44,7 +44,6 @@ samplefiles = { + 'BlueSquare.ai' : libxmp.consts.XMP_FT_ILLUSTRATOR, + 'BlueSquare.avi' : libxmp.consts.XMP_FT_AVI, + 'BlueSquare.eps' : libxmp.consts.XMP_FT_EPS, +- 'BlueSquare.gif' : libxmp.consts.XMP_FT_GIF, + 'BlueSquare.indd' : libxmp.consts.XMP_FT_INDESIGN, + 'BlueSquare.jpg' : libxmp.consts.XMP_FT_JPEG, + 'BlueSquare.mov' : libxmp.consts.XMP_FT_MOV, +diff --git a/test/samples.py b/test/samples.py +index 4a97203..a7e0412 100644 +--- a/test/samples.py ++++ b/test/samples.py +@@ -65,7 +65,6 @@ samplefiles = { + 'BlueSquare.ai' : libxmp.consts.XMP_FT_ILLUSTRATOR, + 'BlueSquare.avi' : libxmp.consts.XMP_FT_AVI, + 'BlueSquare.eps' : libxmp.consts.XMP_FT_EPS, +- 'BlueSquare.gif' : libxmp.consts.XMP_FT_GIF, + 'BlueSquare.indd' : libxmp.consts.XMP_FT_INDESIGN, + 'BlueSquare.jpg' : libxmp.consts.XMP_FT_JPEG, + 'BlueSquare.mov' : libxmp.consts.XMP_FT_MOV, +diff --git a/test/test_exempi.py b/test/test_exempi.py +index 690ce15..54065e2 100644 +--- a/test/test_exempi.py ++++ b/test/test_exempi.py +@@ -422,7 +422,6 @@ class TestExempi(unittest.TestCase): + """Verify that check_file_format function works as expected.""" + pairs = { 'avi': libxmp.consts.XMP_FT_AVI, + 'eps': libxmp.consts.XMP_FT_EPS, +- 'gif': libxmp.consts.XMP_FT_GIF, + 'indd': libxmp.consts.XMP_FT_INDESIGN, + 'jpg': libxmp.consts.XMP_FT_JPEG, + 'mov': libxmp.consts.XMP_FT_MOV, +@@ -540,6 +539,7 @@ class TestIteration(unittest.TestCase): + self.assertEqual(props, ["2006, Hubert Figuiere"]) + + @unittest.skip("Issue x1") def test_single_namespace_single_path_leaf_names(self): + """Get just leaf names from a single path, single namespace.""" + # TODO: why?