diff options
author | K900 <me@0upti.me> | 2024-02-24 13:41:12 +0300 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-04-07 22:27:26 +0200 |
commit | b7da079f641cbb9ebd08835eea672a8cffa2772e (patch) | |
tree | a90f7a8985025a4dee3bf97c3cd398c302596815 /pkgs/development | |
parent | b5c5d062fa5c65996fdba0cdf9569bedb1373383 (diff) |
opencolorio: fix tests on staging-next-23.11
(cherry picked from commit 2b0673c217a04a40b9195deb84b103f6dc54343a)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/opencolorio/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/opencolorio/line-numbers.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 9b5018ef41826..496d68c330186 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. # Needed for zlib >= 1.3 && cmake < 3.27.4. ./broken-cmake-zlib-version.patch + # Fix incorrect line number in test + ./line-numbers.patch ]; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/opencolorio/line-numbers.patch b/pkgs/development/libraries/opencolorio/line-numbers.patch new file mode 100644 index 0000000000000..21b6820b4f868 --- /dev/null +++ b/pkgs/development/libraries/opencolorio/line-numbers.patch @@ -0,0 +1,13 @@ +diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp +index 7a7ab67b..18c1f55e 100644 +--- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp ++++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp +@@ -1416,7 +1416,7 @@ OCIO_ADD_TEST(FileFormatCTF, difficult_xml_unknown_elements) + "(37): Unrecognized element 'just_ignore' where its parent is 'ProcessList' (8): Unknown element", + "(69): Unrecognized element 'just_ignore' where its parent is 'Description' (66)", + "(70): Unrecognized element 'just_ignore' where its parent is 'just_ignore' (69)", +- "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (43): 'Matrix' not allowed in this element", ++ "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (46): 'Matrix' not allowed in this element", + "(76): Unrecognized element 'Description' where its parent is 'Matrix' (75)", + "(77): Unrecognized element 'Array' where its parent is 'Matrix' (75)" + }; |