[gnumeric] win32: disable evince; enable libbz2.

[Morten Welinder <mortenw src gnome org>]

commit 43d154b98a5936215a3cacf68931795f72738bd4
Author: Morten Welinder <terra gnome org>
Date:   Mon Oct 7 20:57:22 2013 -0400

    win32: disable evince; enable libbz2.

 tools/win32/jhbuildrc.py         |    2 +-
 tools/win32/moduleset.in         |   21 ++++++++++++---------
 tools/win32/patches/libbz2.patch |    2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index 8e6a7fe..e7be6cf 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -9,7 +9,7 @@
 # Author: Jody Goldberg <jody gnome org>
 
 moduleset = os.getenv('JH_MODULE_SET')
-modules = ['gnumeric', 'evince']
+modules = ['gnumeric']
 
 # checkoutroot: path to download packages elsewhere
 # prefix:       target path to install the compiled binaries
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 5db0320..d4eb038 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -9,6 +9,8 @@
                href="http://download.gnome.org"/>
     <repository type="tarball" name="zlib.net"
                href="http://www.zlib.net"/>
+    <repository type="tarball" name="bzip.org"
+               href="http://www.bzip.org"/>
     <repository type="tarball" name="savannah"
                href="http://savannah.nongnu.org/download/"/>
     <repository type="tarball" name="fontconfig"
@@ -52,12 +54,12 @@
            <patch file="&patch_dir;zlib.patch" strip="1"/>
        </branch>
     </autotools>
-    <tarball id="libbz2" version="1.0.6">
-       <source href="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"/>
-       <patches>
-           <patch file="&patch_dir;libbz2.patch" strip="1"/>
-       </patches>
-    </tarball>
+    <autotools id="libbz2" version="1.0.6" skip-autogen="true">
+       <branch repo="bzip.org" module="1.0.6/bzip2-1.0.6.tar.gz"
+               version="1.0.6">
+         <patch file="&patch_dir;libbz2.patch" strip="1"/>
+       </branch>
+    </autotools>
 
     <autotools id="gtk-doc"
        autogen-sh="autoreconf"  skip-autogen="never">
@@ -316,6 +318,7 @@
     </autotools>
 
 <!-- print preview -->
+<!--
   <tarball id="poppler" version="0.12.2">
     <source href="http://poppler.freedesktop.org/poppler-0.12.2.tar.gz"/>
     <dependencies>
@@ -333,6 +336,7 @@
     <patches>
     </patches>
   </tarball>
+-->
 <!-- Check license and fix make
   <tarball id="poppler-data" version="0.3.1">
     <source href="http://poppler.freedesktop.org/poppler-data-0.3.1.tar.gz"/>
@@ -343,19 +347,18 @@
   </tarball>
 -->
 
+<!--
     <autotools id="evince">
        <branch repo="gnome.org" module="sources/evince/2.30/evince-2.30.1.tar.bz2" version="2.30.1">
-           <!-- <patch file="&patch_dir;evince-no-mkdtemp.patch"/> -->
        </branch>
        <dependencies>
            <dep package="glib"/>
            <dep package="gtk+"/>
            <dep package="libxml2"/>
-           <!-- <dep package="gnome-icon-theme"/>-->
            <dep package="poppler"/>
-           <!-- <dep package="gnome-doc-utils"/>-->
        </dependencies>
     </autotools>
+-->
 
 <!-- Gnumeric stack -->
     <autotools id="libgsf">
diff --git a/tools/win32/patches/libbz2.patch b/tools/win32/patches/libbz2.patch
index 6ca1ac4..d7961f1 100644
--- a/tools/win32/patches/libbz2.patch
+++ b/tools/win32/patches/libbz2.patch
@@ -33,7 +33,7 @@ diff -crN bzip2-1.0.5/Makefile bzip2-1.0.5-patched/Makefile
   CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
   
   # Where you want it installed when you do 'make install'
-! PREFIX=$(prefix)
+! PREFIX=$(DESTDIR)/$(prefix)
   
 + RC =$(WINDRES)
 + RCFLAGS = --define GCC_WINDRES