forked from mirrors/nixpkgs
libwpd: 0.10.0 -> 0.10.3
This commit is contained in:
parent
28330aa204
commit
cf938b42d0
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libwpd";
|
pname = "libwpd";
|
||||||
version = "0.10.0";
|
version = "0.10.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/libwpd/libwpd-${version}.tar.xz";
|
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 ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
12
pkgs/development/libraries/libwpd/gcc-1.0.patch
Normal file
12
pkgs/development/libraries/libwpd/gcc-1.0.patch
Normal 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];
|
||||||
|
}
|
Loading…
Reference in a new issue