From 0eeae100fd039067347f814dde29a351d13799e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Feb 2013 19:29:02 +0100
Subject: [PATCH] wv2: update and fix

---
 pkgs/tools/misc/wv2/default.nix       | 21 +++++++++++++++------
 pkgs/tools/misc/wv2/fix-include.patch | 12 ++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/misc/wv2/fix-include.patch

diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix
index 7a30d011be26..a3938c1af4c4 100644
--- a/pkgs/tools/misc/wv2/default.nix
+++ b/pkgs/tools/misc/wv2/default.nix
@@ -1,10 +1,19 @@
-{stdenv, fetchurl, pkgconfig, libgsf, glib, libxml2}:
+{ stdenv, fetchurl, pkgconfig, cmake, libgsf, glib, libxml2 }:
 
-stdenv.mkDerivation {
-  name = "wv2-0.3.1";
+stdenv.mkDerivation rec {
+  name = "wv2-0.4.2";
   src = fetchurl {
-    url = mirror://sourceforge/wvware/wv2-0.3.1.tar.bz2;
-    sha256 = "896ff8ec59e280e8cb1ef9a953b364845dd65de1cdf8e4ed8a7e045a3f81c546";
+    url = "mirror://sourceforge/wvware/${name}.tar.bz2";
+    sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz";
+  };
+
+  patches = [ ./fix-include.patch ];
+
+  buildInputs = [ pkgconfig cmake libgsf glib libxml2 ];
+
+  meta = {
+    description = "Excellent MS Word filter lib, used in most Office suites";
+    license = "LGPLv2";
+    homepage = http://wvware.sourceforge.net;
   };
-  buildInputs = [ pkgconfig libgsf glib libxml2 ];
 }
diff --git a/pkgs/tools/misc/wv2/fix-include.patch b/pkgs/tools/misc/wv2/fix-include.patch
new file mode 100644
index 000000000000..df34d24af942
--- /dev/null
+++ b/pkgs/tools/misc/wv2/fix-include.patch
@@ -0,0 +1,12 @@
+From: http://sourceforge.net/tracker/?func=detail&aid=3544851&group_id=10501&atid=110501
+--- a/src/olestream.h
++++ b/src/olestream.h
+@@ -23,7 +23,7 @@
+ #include "global.h"  // U8,... typedefs
+ #include <stack>
+ 
+-#include <glib/giochannel.h> // GSeekType
++#include <glib.h> // GSeekType
+ 
+ namespace wvWare {
+