alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #282493 from simonhollingshead/libwpd0103

Browse source 
libwpd: 0.10.0 -> 0.10.3
This commit is contained in:
Luke Granger-Brown 2024-02-10 22:05:02 +00:00 committed by GitHub
parent 0b2e2cab82 cf938b42d0
commit 167e9bf51a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/libwpd/default.nix
View file

@ -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 ];

12
pkgs/development/libraries/libwpd/gcc-1.0.patch Normal file
View file

@ -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];
}