Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'

git-subtree-dir: nixpkgs
git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a
git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199

3 files changed, 57 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix b/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
new file mode 100644
index 000000000000..736b1a45fa20
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libwpd/0.8.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+
+stdenv.mkDerivation rec {
+  name = "libwpd-0.8.14";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libwpd/${name}.tar.gz";
+    sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
+  };
+
+  patches = [ ./gcc-0.8.patch ];
+
+  buildInputs = [ glib libgsf libxml2 ];
+
+  nativeBuildInputs = [ pkgconfig bzip2 ];
+
+  meta = with stdenv.lib; {
+    description = "Library for importing WordPerfect documents";
+    homepage = http://libwpd.sourceforge.net;
+    license = with licenses; [ lgpl21 mpl20 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libwpd/default.nix b/nixpkgs/pkgs/development/libraries/libwpd/default.nix
new file mode 100644
index 000000000000..56c598ca7de9
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libwpd/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }:
+
+stdenv.mkDerivation rec {
+  name = "libwpd-0.10.0";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/libwpd/${name}.tar.xz";
+    sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx";
+  };
+  
+  buildInputs = [ glib libgsf libxml2 zlib librevenge ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "A library for importing and exporting WordPerfect documents";
+    homepage = http://libwpd.sourceforge.net/;
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libwpd/gcc-0.8.patch b/nixpkgs/pkgs/development/libraries/libwpd/gcc-0.8.patch
new file mode 100644
index 000000000000..05eb3293ed7c
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libwpd/gcc-0.8.patch
@@ -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: