diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-23 06:27:30 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-23 19:43:12 +0200 |
| commit | 0c7cfbb82b3e500795952acaba56e9ede37c8600 (patch) | |
| tree | 2b634108bbf6a1cd92203c4993fc4ca5a541dbc7 /gnu/packages | |
| parent | cafb72db5d2ff5240c67e2a2684f4603977c7214 (diff) | |
gnu: libwpd: Fix build with newer GCC.
* gnu/packages/patches/libwpd-gcc-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly
* gnu/packages/libreoffice.scm (libwpd)[source](patches): New field.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/libreoffice.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/libwpd-gcc-compat.patch | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b17a144f7cd..77527b909a3 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -236,6 +236,7 @@ spreadsheets and presentations.") (method url-fetch) (uri (string-append "mirror://sourceforge/libwpd/libwpd/" "libwpd-" version "/libwpd-" version ".tar.xz")) + (patches (search-patches "libwpd-gcc-compat.patch")) (sha256 (base32 "02fx8bngslcj7i5g1gx2kiign4vp09wrmp5wpvix9igxcavb0r94")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/libwpd-gcc-compat.patch b/gnu/packages/patches/libwpd-gcc-compat.patch new file mode 100644 index 00000000000..ee206beafe6 --- /dev/null +++ b/gnu/packages/patches/libwpd-gcc-compat.patch @@ -0,0 +1,17 @@ +Fix build with newer GCC. + +Taken from upstream: + + https://sourceforge.net/p/libwpd/code/ci/333c8a26f231bea26ec3d56245315041bbf5577f/ + +--- a/src/lib/WPXTable.h ++++ b/src/lib/WPXTable.h +@@ -53,7 +53,7 @@ + ~WPXTable(); + void insertRow(); + void insertCell(unsigned char colSpan, unsigned char rowSpan, unsigned char borderBits); +- const WPXTableCell *getCell(size_t i, size_t j) ++ const WPXTableCell *getCell(std::size_t i, std::size_t j) + { + return &(m_tableRows[i])[j]; + } |