diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/development/libraries/libwpd | |
parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libwpd')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libwpd/default.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libwpd/gcc-1.0.patch | 12 |
2 files changed, 18 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libwpd/default.nix b/nixpkgs/pkgs/development/libraries/libwpd/default.nix index 47755e18e223..99d81870cce0 100644 --- a/nixpkgs/pkgs/development/libraries/libwpd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/libwpd/gcc-1.0.patch b/nixpkgs/pkgs/development/libraries/libwpd/gcc-1.0.patch new file mode 100644 index 000000000000..3059450b4531 --- /dev/null +++ b/nixpkgs/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]; + } |