From f84a08bac3bb93f05eaea9e63e9cc86296b9b0c6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 17:05:31 +0000
Subject: [PATCH] Upgrade libwpd and libwpg to latest versions

svn path=/nixpkgs/trunk/; revision=31313
---
 pkgs/development/libraries/libwpd/default.nix | 14 ++++++++------
 pkgs/development/libraries/libwpg/default.nix |  9 +++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 78487a9f323..dc3f8b5352d 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }:
 
-stdenv.mkDerivation {
-  name = "libwpd-0.8.14";
+stdenv.mkDerivation rec {
+  name = "libwpd-0.9.4";
   
   src = fetchurl {
-    url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz;
-    sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
+    url = "mirror://sourceforge/libwpd/${name}.tar.xz";
+    sha256 = "0qba429cqd72nwn1mzpj7llyi3kwykb2lplcfxffvq8svzxyzkxy";
   };
   
-  buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ];
+  buildInputs = [ glib libgsf libxml2 ];
+
+  buildNativeInputs = [ pkgconfig xz ];
 }
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 14c34eaf419..d140b8b8a0c 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libwpd }:
 
 stdenv.mkDerivation rec {
-  name = "libwpg-0.1.3";
+  name = "libwpg-0.2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libwpg/${name}.tar.bz2";
-    sha256 = "086mgy36mia76mpfa2qgn0q44b3aigvvng9snzrxh60v3v9wixa7";
+    url = "mirror://sourceforge/libwpg/${name}.tar.xz";
+    sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d";
   };
 
-  buildInputs = [ pkgconfig libwpd ];
+  buildInputs = [ libwpd ];
+  buildNativeInputs = [ pkgconfig ];
 
   meta = {
     homepage = http://libwpg.sourceforge.net;