| 1 |
commit: 26859d60f5731734157b21fad361e99ebbc93e94 |
| 2 |
Author: Jérôme Carretero <cJ-gentoo <AT> zougloub <DOT> eu> |
| 3 |
AuthorDate: Mon Feb 27 10:14:59 2023 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 27 13:48:20 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26859d60 |
| 7 |
|
| 8 |
dev-python/python-xmp-toolkit: update patch to please testing |
| 9 |
|
| 10 |
Update patch to include 2 more changes. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/883939 |
| 13 |
Signed-off-by: Jérôme Carretero <cJ-gentoo <AT> zougloub.eu> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/29826 |
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
.../files/python-xmp-toolkit-2.0.1-test.patch | 68 ++++++++++++++++++++-- |
| 18 |
1 file changed, 64 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index 7679542cf535..e2adc3c05403 100644 |
| 22 |
--- a/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch |
| 23 |
+++ b/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch |
| 24 |
@@ -1,7 +1,67 @@ |
| 25 |
-diff -r -U1 python-xmp-toolkit-2.0.1.orig/test/test_exempi.py python-xmp-toolkit-2.0.1/test/test_exempi.py |
| 26 |
---- python-xmp-toolkit-2.0.1.orig/test/test_exempi.py 2014-03-09 19:42:07.000000000 +0700 |
| 27 |
-+++ python-xmp-toolkit-2.0.1/test/test_exempi.py 2020-01-21 18:16:13.470778818 +0700 |
| 28 |
-@@ -539,2 +539,3 @@ |
| 29 |
+Squashed patches of the following: |
| 30 |
+ |
| 31 |
+- https://github.com/exmakhina/python-xmp-toolkit/commit/3f7546173980610e0687f4eae4eb28aa026e4674 |
| 32 |
+ gentoo commit 14321e655b7b3f6e531c0a079cb131dbd767e1be |
| 33 |
+ |
| 34 |
+- https://github.com/exmakhina/python-xmp-toolkit/commit/1459510907764746534ce41afa85a3bedd7029b9 |
| 35 |
+ test: disable tests involving BlueSquare.gif |
| 36 |
+ |
| 37 |
+- https://github.com/exmakhina/python-xmp-toolkit/commit/bd8a0babef830e9a2c06150f6277ba0ddb1220bd |
| 38 |
+ libxmp: exempi: exempi returns char-sized bool, not int |
| 39 |
+ |
| 40 |
+diff --git a/libxmp/exempi.py b/libxmp/exempi.py |
| 41 |
+index 683e240..cddc038 100644 |
| 42 |
+--- a/libxmp/exempi.py |
| 43 |
++++ b/libxmp/exempi.py |
| 44 |
+@@ -1693,6 +1693,7 @@ def check_error(success): |
| 45 |
+ Return value from library function indicating success or failure. |
| 46 |
+ """ |
| 47 |
+ |
| 48 |
++ success = success & 0xff |
| 49 |
+ # Unfortunately the success parameter does not seem to always be reliable |
| 50 |
+ # so we supplement it by explicitly checking the error code. |
| 51 |
+ ecode = EXEMPI.xmp_get_error() |
| 52 |
+diff --git a/test/common_fixtures.py b/test/common_fixtures.py |
| 53 |
+index 135a795..363246c 100644 |
| 54 |
+--- a/test/common_fixtures.py |
| 55 |
++++ b/test/common_fixtures.py |
| 56 |
+@@ -44,7 +44,6 @@ samplefiles = { |
| 57 |
+ 'BlueSquare.ai' : libxmp.consts.XMP_FT_ILLUSTRATOR, |
| 58 |
+ 'BlueSquare.avi' : libxmp.consts.XMP_FT_AVI, |
| 59 |
+ 'BlueSquare.eps' : libxmp.consts.XMP_FT_EPS, |
| 60 |
+- 'BlueSquare.gif' : libxmp.consts.XMP_FT_GIF, |
| 61 |
+ 'BlueSquare.indd' : libxmp.consts.XMP_FT_INDESIGN, |
| 62 |
+ 'BlueSquare.jpg' : libxmp.consts.XMP_FT_JPEG, |
| 63 |
+ 'BlueSquare.mov' : libxmp.consts.XMP_FT_MOV, |
| 64 |
+diff --git a/test/samples.py b/test/samples.py |
| 65 |
+index 4a97203..a7e0412 100644 |
| 66 |
+--- a/test/samples.py |
| 67 |
++++ b/test/samples.py |
| 68 |
+@@ -65,7 +65,6 @@ samplefiles = { |
| 69 |
+ 'BlueSquare.ai' : libxmp.consts.XMP_FT_ILLUSTRATOR, |
| 70 |
+ 'BlueSquare.avi' : libxmp.consts.XMP_FT_AVI, |
| 71 |
+ 'BlueSquare.eps' : libxmp.consts.XMP_FT_EPS, |
| 72 |
+- 'BlueSquare.gif' : libxmp.consts.XMP_FT_GIF, |
| 73 |
+ 'BlueSquare.indd' : libxmp.consts.XMP_FT_INDESIGN, |
| 74 |
+ 'BlueSquare.jpg' : libxmp.consts.XMP_FT_JPEG, |
| 75 |
+ 'BlueSquare.mov' : libxmp.consts.XMP_FT_MOV, |
| 76 |
+diff --git a/test/test_exempi.py b/test/test_exempi.py |
| 77 |
+index 690ce15..54065e2 100644 |
| 78 |
+--- a/test/test_exempi.py |
| 79 |
++++ b/test/test_exempi.py |
| 80 |
+@@ -422,7 +422,6 @@ class TestExempi(unittest.TestCase): |
| 81 |
+ """Verify that check_file_format function works as expected.""" |
| 82 |
+ pairs = { 'avi': libxmp.consts.XMP_FT_AVI, |
| 83 |
+ 'eps': libxmp.consts.XMP_FT_EPS, |
| 84 |
+- 'gif': libxmp.consts.XMP_FT_GIF, |
| 85 |
+ 'indd': libxmp.consts.XMP_FT_INDESIGN, |
| 86 |
+ 'jpg': libxmp.consts.XMP_FT_JPEG, |
| 87 |
+ 'mov': libxmp.consts.XMP_FT_MOV, |
| 88 |
+@@ -540,6 +539,7 @@ class TestIteration(unittest.TestCase): |
| 89 |
+ self.assertEqual(props, ["2006, Hubert Figuiere"]) |
| 90 |
+ |
| 91 |
|
| 92 |
+ @unittest.skip("Issue x1") |
| 93 |
def test_single_namespace_single_path_leaf_names(self): |
| 94 |
+ """Get just leaf names from a single path, single namespace.""" |
| 95 |
+ # TODO: why? |
Archives