diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-26 18:31:35 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-26 18:35:28 +0200 |
| commit | d6b863fd9b7bb962e6f9fdf292419a775e772891 (patch) | |
| tree | 8a5534f2435672c4f2a7a3884ff59af5591c8b88 /pkgs/applications/office | |
| parent | 7b57f59155b55250ea2d0871a7c0102d63fbba93 (diff) | |
| parent | 72fb66768e1ea1180b170ebea6ac5ac465e9f568 (diff) | |
Merge #226795: staging-next 2023-04-18
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e7633cdde0df3..25e8f18998e2e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -356,6 +356,9 @@ in sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" + + # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 + sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx '' # This to avoid using /lib:/usr/lib at linking + '' |