Author: viric
Date: Wed Mar 7 22:38:42 2012
New Revision: 32871
URL: https://nixos.org/websvn/nix/?rev=32871&sc=1
Log:
Fixing the build of libwpd 0.8. That will help openoffice to go on building.
Added:
nixpkgs/trunk/pkgs/development/libraries/libwpd/gcc-0.8.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix Wed Mar 7
22:34:54 2012 (r32870)
+++ nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix Wed Mar 7
22:38:42 2012 (r32871)
@@ -8,6 +8,8 @@
sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
};
+ patches = [ ./gcc-0.8.patch ];
+
buildInputs = [ glib libgsf libxml2 ];
buildNativeInputs = [ pkgconfig bzip2 ];
Added: nixpkgs/trunk/pkgs/development/libraries/libwpd/gcc-0.8.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libwpd/gcc-0.8.patch Wed Mar
7 22:38:42 2012 (r32871)
@@ -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:
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
