From a51ca622156528c293a400cb2111656d39415ce5 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Wed, 7 Mar 2012 22:38:42 +0000 Subject: Fixing the build of libwpd 0.8. That will help openoffice to go on building. svn path=/nixpkgs/trunk/; revision=32871 --- pkgs/development/libraries/libwpd/0.8.nix | 2 ++ pkgs/development/libraries/libwpd/gcc-0.8.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/libwpd/gcc-0.8.patch (limited to 'pkgs/development/libraries/libwpd') diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 504bddb777a..ceaa0d36d4b 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01"; }; + patches = [ ./gcc-0.8.patch ]; + buildInputs = [ glib libgsf libxml2 ]; buildNativeInputs = [ pkgconfig bzip2 ]; diff --git a/pkgs/development/libraries/libwpd/gcc-0.8.patch b/pkgs/development/libraries/libwpd/gcc-0.8.patch new file mode 100644 index 00000000000..05eb3293ed7 --- /dev/null +++ b/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: -- cgit 1.4.1