push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,43 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
glib,
libgsf,
libxml2,
bzip2,
}:
stdenv.mkDerivation rec {
pname = "libwpd";
version = "0.8.14";
src = fetchurl {
url = "mirror://sourceforge/libwpd/libwpd-${version}.tar.gz";
sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
};
patches = [ ./gcc-0.8.patch ];
buildInputs = [
glib
libgsf
libxml2
];
nativeBuildInputs = [
pkg-config
bzip2
];
meta = with lib; {
description = "Library for importing WordPerfect documents";
homepage = "https://libwpd.sourceforge.net";
license = with licenses; [
lgpl21
mpl20
];
platforms = platforms.unix;
};
}

View File

@@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchurl,
zlib,
pkg-config,
glib,
libgsf,
libxml2,
librevenge,
boost,
}:
stdenv.mkDerivation rec {
pname = "libwpd";
version = "0.10.3";
src = fetchurl {
url = "mirror://sourceforge/libwpd/libwpd-${version}.tar.xz";
hash = "sha256-JGWwtmL9xdTjvrzcmnkCdxP7Ypyiv/BKPJJR/exC3Qk=";
};
patches = [ ./gcc-1.0.patch ];
buildInputs = [
glib
libgsf
libxml2
zlib
librevenge
boost
];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "Library for importing and exporting WordPerfect documents";
homepage = "https://libwpd.sourceforge.net/";
license = licenses.lgpl21;
platforms = platforms.unix;
};
}

View File

@@ -0,0 +1,13 @@
diff --git a/src/lib/WPXTable.h b/src/lib/WPXTable.h
index 6d1e921..0234ad7 100644
--- a/src/lib/WPXTable.h
+++ b/src/lib/WPXTable.h
@@ -76,7 +76,7 @@ public:
WPXTableList & operator=(const WPXTableList & tableList);
virtual ~WPXTableList();
- WPXTable * operator[](size_t i) { return (*m_tableList)[i]; }
+ WPXTable * operator[](std::size_t i) { return (*m_tableList)[i]; }
void add(WPXTable *table) { m_tableList->push_back(table); }
private:

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