diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-07 22:38:42 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-07 22:38:42 +0000 |
| commit | a51ca622156528c293a400cb2111656d39415ce5 (patch) | |
| tree | 6030f61ea2b2595e9e55840f84123b7e986c043b /pkgs/development/libraries/libwpd | |
| parent | dc0fd8219c3346b7b72bafb5052eca823b774804 (diff) | |
| download | nixpkgs-a51ca622156528c293a400cb2111656d39415ce5.tar nixpkgs-a51ca622156528c293a400cb2111656d39415ce5.tar.gz nixpkgs-a51ca622156528c293a400cb2111656d39415ce5.tar.bz2 nixpkgs-a51ca622156528c293a400cb2111656d39415ce5.tar.lz nixpkgs-a51ca622156528c293a400cb2111656d39415ce5.tar.xz nixpkgs-a51ca622156528c293a400cb2111656d39415ce5.tar.zst nixpkgs-a51ca622156528c293a400cb2111656d39415ce5.zip | |
Fixing the build of libwpd 0.8. That will help openoffice to go on building.
svn path=/nixpkgs/trunk/; revision=32871
Diffstat (limited to 'pkgs/development/libraries/libwpd')
| -rw-r--r-- | pkgs/development/libraries/libwpd/0.8.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libwpd/gcc-0.8.patch | 13 |
2 files changed, 15 insertions, 0 deletions
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: |