From cf938b42d02e9a150d9b077b8a83b009d5808716 Mon Sep 17 00:00:00 2001 From: Simon Hollingshead Date: Sun, 21 Jan 2024 05:45:07 +0000 Subject: [PATCH] libwpd: 0.10.0 -> 0.10.3 --- pkgs/development/libraries/libwpd/default.nix | 10 ++++++---- pkgs/development/libraries/libwpd/gcc-1.0.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/libwpd/gcc-1.0.patch diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 47755e18e223..99d81870cce0 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }: +{ lib, stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge, boost }: stdenv.mkDerivation rec { pname = "libwpd"; - version = "0.10.0"; + version = "0.10.3"; src = fetchurl { url = "mirror://sourceforge/libwpd/libwpd-${version}.tar.xz"; - sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx"; + hash = "sha256-JGWwtmL9xdTjvrzcmnkCdxP7Ypyiv/BKPJJR/exC3Qk="; }; - buildInputs = [ glib libgsf libxml2 zlib librevenge ]; + patches = [ ./gcc-1.0.patch ]; + + buildInputs = [ glib libgsf libxml2 zlib librevenge boost ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libwpd/gcc-1.0.patch b/pkgs/development/libraries/libwpd/gcc-1.0.patch new file mode 100644 index 000000000000..3059450b4531 --- /dev/null +++ b/pkgs/development/libraries/libwpd/gcc-1.0.patch @@ -0,0 +1,12 @@ +diff -Naur libwpd-0.10.3/src/lib/WPXTable.h libwpd-0.10.3-modified/src/lib/WPXTable.h +--- libwpd-0.10.3/src/lib/WPXTable.h 2018-12-25 16:19:19.000000000 +0000 ++++ libwpd-0.10.3-modified/src/lib/WPXTable.h 2024-01-21 05:41:23.623457028 +0000 +@@ -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]; + }