From d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 12 Aug 2014 01:39:48 +0400
Subject: Update libreoffice to the version 4.3.0.4

Also update its dependencies.

Update libcdr to 0.1.0
Update libmwaw to 0.3.2 from 0.3.1
Update libvisio to 0.1.0
Update libwpd to 0.10.0
Update libwpg to 0.3.0

These updates are require by LO update and also require each other.

Note that many of these libraries now require librevenge.

In LibreOffice expression per se:

- Note that liborcus is built separately because it wants Boost to be
  specified in a way that main LO build doesn't ensure.

- libixion from 0.7.0 tarball has libixion-0.8 package version.

- libgltf is in src/libgltf but listed in download.lst without any
  comments.

- Make variable with the name libreoffice-translations-${version}.tar.xz
  and the same value is inserted; the same for -help-. Fetching gives
  a strange error without that. Apparently everyone just builds git
  checkouts.

- There are some conditionals in download.lst that require manual
  handling. I am not sure there is a simple way to process them in
  generate-libreoffice-srcs.sh.
---
 pkgs/development/libraries/libcdr/default.nix   | 10 +++++-----
 pkgs/development/libraries/libmwaw/default.nix  |  7 +++----
 pkgs/development/libraries/libvisio/default.nix | 12 +++++++-----
 pkgs/development/libraries/libwpd/default.nix   |  8 ++++----
 pkgs/development/libraries/libwpg/default.nix   |  8 ++++----
 5 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 1da25527ef7..23fafb44c81 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig }:
+{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }:
 
 stdenv.mkDerivation rec {
-  name = "libcdr-0.0.8";
+  name = "libcdr-0.1.0";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/${name}.tar.xz";
-    sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0";
+    url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
+    sha256 = "1l4glkyyxhzqq6j9n9cc01sf1q7xx8dd97cl3bwj8w4fp06ihv7g";
   };
 
-  buildInputs = [ libwpg libwpd lcms ];
+  buildInputs = [ libwpg libwpd lcms librevenge icu boost ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 0a7b76edab1..297d0a2f2ee 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.1";
+    version="0.3.2";
     name="${baseName}-${version}";
-    hash="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.1/libmwaw-0.3.1.tar.xz";
-    sha256="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb";
+    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.bz2";
+    sha256="0rzp2bbwyxdq1i9b2y5jz5b2ic7466l8ifgmz7lk8bsmqxbb0a0d";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index 7d24fc9a8a6..c015e7473bd 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib }:
+{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf
+, librevenge, libxml2, icu, perl
+}:
 
 stdenv.mkDerivation rec {
-  name = "libvisio-0.0.19";
+  name = "libvisio-0.1.0";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/${name}.tar.xz";
-    sha256 = "1iqkz280mi066bdccyxagkqm41i270nx01cacvgjq2pflgd3njd1";
+    url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
+    sha256 = "1vpb7nbk5qh6w3jz9rl9w8p25invcvj46parb9ld13h9777kyf0j";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ boost libwpd libwpg zlib ];
+  buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ];
 
   configureFlags = "--disable-werror";
 
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 830890fad56..df5917fb05c 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2 }:
+{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }:
 
 stdenv.mkDerivation rec {
-  name = "libwpd-0.9.9";
+  name = "libwpd-0.10.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.xz";
-    sha256 = "1cn2z89yzsz8k6xjl02jdfhm0pkarw3yxj9ijnz5dx7h1v5g87dr";
+    sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx";
   };
   
-  buildInputs = [ glib libgsf libxml2 zlib ];
+  buildInputs = [ glib libgsf libxml2 zlib librevenge ];
 
   nativeBuildInputs = [ pkgconfig ];
 }
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index f71cc965472..0cb405d4837 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, libwpd, zlib }:
+{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }:
 
 stdenv.mkDerivation rec {
-  name = "libwpg-0.2.2";
+  name = "libwpg-0.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/libwpg/${name}.tar.xz";
-    sha256 = "1kd6d583s9162z023gh5jqrhkjsdig2bsfylw3g38xa4p5vzv6xl";
+    sha256 = "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g";
   };
 
-  buildInputs = [ libwpd zlib ];
+  buildInputs = [ libwpd zlib librevenge ];
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-- 
cgit 1.4.1