AUDIT: r17806 - gnucash/trunk/packaging/win32 - [Win32] Update a whole bunch of packages.

Andreas Köhler andi5 at cvs.gnucash.org
Sun Jan 11 10:37:26 EST 2009


Author: andi5
Date: 2009-01-11 10:37:26 -0500 (Sun, 11 Jan 2009)
New Revision: 17806
Trac: http://svn.gnucash.org/trac/changeset/17806

Added:
   gnucash/trunk/packaging/win32/goffice-0.7.2-patch.diff
Removed:
   gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff
Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/dist.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
[Win32] Update a whole bunch of packages.

* MinGW tools
* Autotools (ac 2.60, am 1.10.2, lt 2.2.6a)
  - libtool feels faster, needs confirmation
  - compiling ac needs a newer m4 version, add that
* Gnome
  - intltool needs a newer perl, so upgrade to activeperl 5.10
  - new libpng, separated into libpng and libpng-dev
  - newly packaged zlib (zlib-dev as well), no dlltool'ing anymore
  - remove libgnomeprint (cf. goffice), gtkprint finally seems to work
    -> goodbye mirrored printouts
* libxslt
  - not the newest because that will be moved to oldreleases/ soon
* openssl
  - watch for libeay32.dll in your Windows folder, it might be too old,
    better you remove it completely
* gmp
  - untested, no BP needed (yet)
* gnutls
  - untested, no BP needed (yet)
* swig
* pcre
* libgsf, goffice
  - goffice does not use libgnomeprint anymore, new patch necessary,
    grab gtk-doc.m4 from gtk-doc tarball instead of patching goffice
  - install htmlhelp earlier and add flags to link to it
* svn
  - includes an own libeay32.dll, may conflict with openssl/bin/libeay32.dll

BP


Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2009-01-11 12:46:57 UTC (rev 17805)
+++ gnucash/trunk/packaging/win32/defaults.sh	2009-01-11 15:37:26 UTC (rev 17806)
@@ -102,13 +102,14 @@
 set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
 
 set_default DTK_URL "$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
+set_default M4_URL "$SF_MIRROR/mingw/m4-1.4.7-MSYS.tar.bz2"
 
-set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.15.91-20040904-1.tar.gz"
-set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.2-20040916-1.tar.gz"
-set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.2-20040916-1.tar.gz"
-set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingw-runtime-3.12.tar.gz"
-set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.9.tar.gz"
-set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-2.tar.gz"
+set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.19-mingw32-bin.tar.gz"
+set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.5-20060117-3.tar.gz"
+set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.5-20060117-3.tar.gz"
+set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.15.1-mingw32.tar.gz"
+set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.13-mingw32-dev.tar.gz"
+set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
 set_default MINGW_DIR $GLOBAL_DIR\\mingw
 
 set_default UNZIP_URL "$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
@@ -119,19 +120,19 @@
 set_default REGEX_DEV_URL "$GNOME_WIN32_DEPS_URL/libgnurx-dev-2.5.zip"
 set_default REGEX_DIR $GLOBAL_DIR\\regex
 
-set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-bin.zip"
-set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-lib.zip"
+set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
+set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
 set_default READLINE_DIR $GLOBAL_DIR\\readline
 
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/Windows/5.10/ActivePerl-5.10.0.1004-MSWin32-x86-287188.zip"
 set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
 
-set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.bz2"
-set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2"
-set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
+set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
+set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2"
+set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz"
 set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
 
-set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.3.tar.bz2"
+set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.4.tar.bz2"
 set_default GMP_ABI 32
 set_default GMP_DIR $GLOBAL_DIR\\gmp
 
@@ -139,10 +140,10 @@
 set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
 set_default GUILE_DIR $GLOBAL_DIR\\guile
 
-set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8e.tar.gz"
+set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
 set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
 
-set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.4.1.zip"
+set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.7.3.zip"
 set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
 
 set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
@@ -151,7 +152,7 @@
 set_default EXETYPE_SCRIPT `pwd`/exetype.pl
 set_default EXETYPE_DIR $TOOLS_DIR
 
-set_default LIBXSLT_URL "http://www.zlatkovic.com/pub/libxml/oldreleases/libxslt-1.1.19.win32.zip"
+set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/oldreleases/libxslt-1.1.23+.win32.zip"
 set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
 
 set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2-2.6.27.zip"
@@ -160,77 +161,81 @@
 set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
 set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
 set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.14/glib-2.14.6-2.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.14/glib-dev-2.14.6-2.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.18/glib_2.18.3-1_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.18/glib-dev_2.18.3-1_win32.zip"
 set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
-set_default LIBPNG_URL "$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff-3.7.1.zip"
-set_default ZLIB_URL "$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
-set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.20.zip"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo-1.4.14.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev-1.4.14.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.2.32-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.2.32-1_win32.zip"
+set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff-3.8.2.zip"
+set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev-3.8.2.zip"
+set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
+set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
+set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.23.zip"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.6-1_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.6-1_win32.zip"
 set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
 set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig-2.4.2-tml-20071015.zip"
 set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.4.2-tml-20071015.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype-2.3.5.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev-2.3.5.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.20/atk-1.20.0.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.20/atk-dev-1.20.0.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.18/pango-1.18.4.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.18/pango-dev-1.18.4.zip"
-set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.19.zip"
-set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.19.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.12/gtk+-2.12.8.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.12/gtk+-dev-2.12.8.zip"
-set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.5.zip"
-set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.12.zip"
-set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.12.zip"
-set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.20/gail-1.20.1.zip"
-set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.20/gail-dev-1.20.1.zip"
+set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype-2.3.6.zip"
+set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev-2.3.6.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.24/atk_1.24.0-1_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.24/atk-dev_1.24.0-1_win32.zip"
+set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.22/pango_1.22.2-1_win32.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.22/pango-dev_1.22.2-1_win32.zip"
+set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
+set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+_2.14.6-1_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+-dev_2.14.6-1_win32.zip"
+set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
+set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
+set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
+set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
+set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
 set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
 set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
-set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.18/GConf-2.18.0.1.zip"
-set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.18/GConf-dev-2.18.0.1.zip"
-set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.20/libbonobo-2.20.1.zip"
-set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.20/libbonobo-dev-2.20.1.zip"
+set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_2.22.0-2_win32.zip"
+set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_2.22.0-2_win32.zip"
+set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
+set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
 # work-around #504261, GetVolumePathNamesForVolumeNameW missing on Win2k
 set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2-no-openssl.zip" 
 set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2-no-openssl.zip" 
-#set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.18/gnome-vfs-2.18.0.1.zip"
-#set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.18/gnome-vfs-dev-2.18.0.1.zip"
-set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.20/libgnome-2.20.1.zip"
-set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.20/libgnome-dev-2.20.1.zip"
+#set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.0-1_win32.zip"
+#set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.0-1_win32.zip"
+set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
+set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
 set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
 set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
-set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.20/libbonoboui-2.20.0.zip"
-set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.20/libbonoboui-dev-2.20.0.zip"
-set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.16/libgnomeui-2.16.0.zip"
-set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.16/libgnomeui-dev-2.16.0.zip"
-set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-2.6.2.zip"
-set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev-2.6.2.zip"
-set_default LIBGNOMEPRINT_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip"
-set_default LIBGNOMEPRINT_DEV_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
-set_default LIBGNOMEPRINTUI_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip"  # gnomeprint
-set_default LIBGNOMEPRINTUI_DEV_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip"  # gnomeprint
-set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip"  # gnomeprint
-set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip"  # gnomeprint
-#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-3.14.0.zip"  # not gnomeprint
-#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-dev-3.14.0.zip"  # not gnomeprint
+set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
+set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
+set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
+set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
+set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.3-1_win32.zip"
+set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.3-1_win32.zip"
+#set_default LIBGNOMEPRINT_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip"
+#set_default LIBGNOMEPRINT_DEV_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
+#set_default LIBGNOMEPRINTUI_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip"  # gnomeprint
+#set_default LIBGNOMEPRINTUI_DEV_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip"  # gnomeprint
+#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip"  # gnomeprint
+#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip"  # gnomeprint
+set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-3.18.2.zip"  # not gnomeprint
+set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-dev-3.18.2.zip"  # not gnomeprint
+set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2"
 set_default GNOME_DIR $GLOBAL_DIR\\gnome
 
-set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.31.zip"
+set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
 set_default SWIG_DIR $GLOBAL_DIR\\swig
 
-set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-6.4-1-bin.zip"
-set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-6.4-1-lib.zip"
+set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
+set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
 set_default PCRE_DIR $GLOBAL_DIR\\pcre
 
-set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.5.tar.bz2"
+set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.11.tar.bz2"
 set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
 
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.4/goffice-0.4.3.tar.bz2"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-0.7.2.tar.bz2"
 set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-set_default GOFFICE_PATCH `pwd`/goffice-0.4.3-patch.diff
+set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
 
 set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
 set_default GLADE_DIR $GLOBAL_DIR\\glade
@@ -241,7 +246,7 @@
 set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
 set_default HH_DIR $GLOBAL_DIR\\hh
 
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
+set_default SVN_URL "http://subversion.tigris.org/files/documents/15/44582/svn-win32-1.5.5.zip"
 set_default SVN_DIR $GLOBAL_DIR\\svn
 
 # OFX import in gnucash and ofx directconnect support for aqbanking
@@ -335,6 +340,9 @@
 add_step inst_swig
 add_step inst_pcre
 add_step inst_libgsf
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_hh
+fi
 add_step inst_goffice
 #add_step inst_glade
 add_step inst_opensp
@@ -345,15 +353,14 @@
 add_step inst_aqbanking
 add_step inst_libdbi
 ##
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_inno
- add_step inst_hh
-fi
 if [ "$UPDATE_SOURCES" = "yes" ]; then
  add_step svn_up
 fi
 add_step inst_gnucash
 add_step inst_docs
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_inno
+fi
 add_step finish
 
 # run commands registered with late_eval

Modified: gnucash/trunk/packaging/win32/dist.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist.sh	2009-01-11 12:46:57 UTC (rev 17805)
+++ gnucash/trunk/packaging/win32/dist.sh	2009-01-11 15:37:26 UTC (rev 17806)
@@ -87,11 +87,9 @@
     unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
     wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
-    smart_wget $LIBPNG_URL $DOWNLOAD_DIR
-    unzip -q $LAST_FILE bin/libpng13.dll -d $DIST_DIR
+    wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
-    smart_wget $ZLIB_URL $DOWNLOAD_DIR
-    unzip -q $LAST_FILE zlib1.dll -d $DIST_DIR\\bin
+    wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
@@ -112,8 +110,6 @@
     wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
-    wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $DIST_DIR
-    wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $DIST_DIR  # gnomeprint
     wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
     rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
     cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share

Deleted: gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff	2009-01-11 12:46:57 UTC (rev 17805)
+++ gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff	2009-01-11 15:37:26 UTC (rev 17806)
@@ -1,69 +0,0 @@
-diff -Nur goffice-0.4.3-old/goffice/Makefile.am goffice-0.4.3/goffice/Makefile.am
---- goffice-0.4.3-old/goffice/Makefile.am	Sat Jul  7 00:44:32 2007
-+++ goffice-0.4.3/goffice/Makefile.am	Sat Jul 21 23:24:22 2007
-@@ -24,7 +24,7 @@
- libgoffice_0_la_DEPENDENCIES = goffice.def
- libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
- if WITH_NATIVE_WIN32
--libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
-+libgoffice_0_la_LIBADD += -luuid
- endif
- endif
- 
-diff -Nur goffice-0.4.3-old/gtk-doc.m4 goffice-0.4.3/gtk-doc.m4
---- goffice-0.4.3-old/gtk-doc.m4	Thu Jan  1 00:00:00 1970
-+++ goffice-0.4.3/gtk-doc.m4	Sat Jul 21 23:25:04 2007
-@@ -0,0 +1,53 @@
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  dnl for overriding the documentation installation directory
-+  AC_ARG_WITH(html-dir,
-+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+    [with_html_dir='${datadir}/gtk-doc/html'])
-+  HTML_DIR="$with_html_dir"
-+  AC_SUBST(HTML_DIR)
-+
-+  dnl enable/disable documentation building
-+  AC_ARG_ENABLE(gtk-doc,
-+    AC_HELP_STRING([--enable-gtk-doc],
-+                   [use gtk-doc to build documentation [default=no]]),,
-+    enable_gtk_doc=no)
-+
-+  have_gtk_doc=no
-+  if test x$enable_gtk_doc = xyes; then
-+    if test -z "$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    fi
-+    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-+      have_gtk_doc=yes
-+    fi
-+
-+  dnl do we want to do a version check?
-+ifelse([$1],[],,
-+    [gtk_doc_min_version=$1
-+    if test "$have_gtk_doc" = yes; then
-+      AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-+      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-+        AC_MSG_RESULT(yes)
-+      else
-+        AC_MSG_RESULT(no)
-+        have_gtk_doc=no
-+      fi
-+    fi
-+])
-+    if test "$have_gtk_doc" != yes; then
-+      enable_gtk_doc=no
-+    fi
-+  fi
-+
-+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+])

Added: gnucash/trunk/packaging/win32/goffice-0.7.2-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.7.2-patch.diff	                        (rev 0)
+++ gnucash/trunk/packaging/win32/goffice-0.7.2-patch.diff	2009-01-11 15:37:26 UTC (rev 17806)
@@ -0,0 +1,86 @@
+--- goffice-0.7.2-old/goffice/Makefile.am	Fri Dec 28 22:55:15 2007
++++ goffice-0.7.2/goffice/Makefile.am	Sat Jan 10 21:50:04 2009
+@@ -27,7 +27,6 @@
+ if WITH_NATIVE_WIN32
+ # libtool thinks there are undefined refs in libhtmlhelp, by pass libtool
+ libgoffice_ at GOFFICE_API_VER@_la_LDFLAGS += -Wl,-lhtmlhelp
+-libgoffice_ at GOFFICE_API_VER@_la_LIBADD += -lurlmon
+ endif
+ endif
+ 
+--- goffice-0.7.2-old/goffice/utils/go-file.c	Tue Oct 14 10:52:48 2008
++++ goffice-0.7.2/goffice/utils/go-file.c	Sat Jan 10 20:33:58 2009
+@@ -31,11 +31,11 @@
+ #include <glib/gi18n-lib.h>
+ #include <gsf/gsf-input-gio.h>
+ #include <gsf/gsf-output-gio.h>
+-#ifdef GOFFICE_WITH_GNOME
++#ifdef G_OS_WIN32
++#include <windows.h>
++/*#include <io.h>*/
++#elif defined GOFFICE_WITH_GNOME
+ #include <libgnome/gnome-url.h>
+-#elif defined G_OS_WIN32
+-#include <urlmon.h>
+-#include <io.h>
+ #endif
+ 
+ #include <string.h>
+@@ -1065,6 +1065,7 @@
+ go_get_mime_type (gchar const *uri)
+ {
+ #if defined(G_OS_WIN32)
++#if defined(FindMimeFromData)
+ 	/* Do we really need that? */
+ 	LPWSTR wuri, mime_type;
+ 
+@@ -1079,6 +1080,7 @@
+ 	}
+ 
+ 	g_free (wuri);
++#endif
+ 
+ 	/* We try to determine mime using FindMimeFromData().
+ 	 * However, we are not sure whether the functions will know about
+@@ -1117,6 +1119,7 @@
+ go_get_mime_type_for_data (gconstpointer data, int data_size)
+ {
+ #if defined(G_OS_WIN32)
++#if defined(FindMimeFromData)
+ 	/* Do we really need that? */
+ 	LPWSTR mime_type;
+ 
+@@ -1126,6 +1129,7 @@
+ 	{
+ 		return g_utf16_to_utf8 (mime_type, -1, NULL, NULL, NULL);
+ 	}
++#endif
+ 
+ 	/* We try to determine mime using FindMimeFromData().
+ 	 * However, we are not sure whether the functions will know about
+--- goffice-0.7.2-old/goffice/gtk/goffice-gtk.c	Sun Sep 14 11:15:14 2008
++++ goffice-0.7.2/goffice/gtk/goffice-gtk.c	Sat Jan 10 20:59:39 2009
+@@ -779,11 +779,11 @@
+ 	char const *link;
+ } CBHelpPaths;
+ 
+-#ifdef GOFFICE_WITH_GNOME
+-#include <libgnome/gnome-help.h>
+-#elif defined(G_OS_WIN32)
++#ifdef G_OS_WIN32
+ #include <windows.h>
+ #include <htmlhelp.h>
++#elif defined(GOFFICE_WITH_GNOME)
++#include <libgnome/gnome-help.h>
+ #endif
+ static void
+ go_help_display (CBHelpPaths const *paths)
+@@ -837,7 +837,7 @@
+ 		gchar *path = g_build_filename (paths->data_dir, "doc", "C", chmfile, NULL);
+ 
+ 		g_free (chmfile);
+-		if (!HtmlHelp (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
++		if (!HtmlHelpW (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
+ 			go_gtk_notice_dialog (NULL, GTK_MESSAGE_ERROR, "Failed to spawn HtmlHelp");
+ 		g_free (path);
+ 	}

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2009-01-11 12:46:57 UTC (rev 17805)
+++ gnucash/trunk/packaging/win32/install.sh	2009-01-11 15:37:26 UTC (rev 17806)
@@ -103,7 +103,8 @@
 function inst_dtk() {
     setup MSYS DTK
     _MSYS_UDIR=`unix_path $MSYS_DIR`
-    if quiet ${_MSYS_UDIR}/bin/perl --help
+    if quiet ${_MSYS_UDIR}/bin/perl --help &&
+        [ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ]
     then
         echo "msys dtk already installed.  skipping."
     else
@@ -118,7 +119,10 @@
             while [ -e $_dst_file ]; do _dst_file=$_dst_file.bak; done
             mv $file $_dst_file
         done
-        quiet ${_MSYS_UDIR}/bin/perl --help || die "msys dtk not installed correctly"
+        wget_unpacked $M4_URL $DOWNLOAD_DIR $TMP_DIR
+        mv $TMP_UDIR/usr/bin/m4.exe /bin
+        quiet ${_MSYS_UDIR}/bin/perl --help &&
+        [ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ] || die "msys dtk not installed correctly"
     fi
 }
 
@@ -217,6 +221,10 @@
         echo "ActivePerl already installed.  skipping."
     else
         wget_unpacked $ACTIVE_PERL_URL $DOWNLOAD_DIR $ACTIVE_PERL_DIR
+        qpushd $_ACTIVE_PERL_UDIR
+            assert_one_dir ActivePerl-*
+            mv ActivePerl-* ActivePerl
+        qpopd
         quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly"
     fi
 }
@@ -376,8 +384,11 @@
     then
         echo "subversion already installed.  skipping."
     else
-        smart_wget $SVN_URL $DOWNLOAD_DIR
-        $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
+        wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/svn-win32-*
+        mkdir -p $_SVN_UDIR
+        mv $TMP_UDIR/svn-win32-*/* $_SVN_UDIR
+        quiet svn --version || die "svn not installed correctly"
     fi
 }
 
@@ -492,8 +503,7 @@
         add_to_env pkg-config PKG_CONFIG
     fi
     if quiet gconftool-2 --version &&
-        ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 &&  # gnomeprint
-#        ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 &&  # not gnomeprint
+        quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
         quiet intltoolize --version
     then
         echo "gnome packages installed.  skipping."
@@ -509,8 +519,11 @@
         wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
+        wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
+        wget_unpacked $LIBTIFF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
+        wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -550,28 +563,20 @@
         wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
-        wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $GNOME_DIR
-        wget_unpacked $LIBGNOMEPRINT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
-        wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $GNOME_DIR  # gnomeprint
-        wget_unpacked $LIBGNOMEPRINTUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR  # gnomeprint
         wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+        wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
         qpushd $_GNOME_UDIR
-            [ -f bin/zlib1.dll ] || mv zlib1.dll bin
-            if [ ! -f lib/libz.dll.a ]; then
-                qpushd bin
-                    ${DLLTOOL} -D zlib1.dll -d ../lib/zlib.def -l libz.dll.a
-                    mv libz.dll.a ../lib
-                qpopd
-            fi
+            assert_one_dir $TMP_UDIR/gtk-doc-*
+            mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
             if [ ! -f libexec/gconfd-2.console.exe ]; then
                 cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
             fi
             exetype libexec/gconfd-2.exe windows
-            sed '1s,!.*perl,!/bin/perl,;s,/opt/gnu/bin/iconv,iconv,' bin/intltool-merge > tmp
-            mv tmp bin/intltool-merge
-#            sed 's#gtk+-unix-print-2.0 >= [0-9\.]* *##' lib/pkgconfig/libgtkhtml-3.14.pc > tmp  # not gnomeprint
-#            mv tmp lib/pkgconfig/libgtkhtml-3.14.pc  # not gnomeprint
+            for file in bin/intltool-*; do
+                sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
+                mv tmp $file
+            done
             # work around a bug in msys bash, adding 0x01 smilies
             cat > bin/pkg-config-msys.sh <<EOF
 #!/bin/sh
@@ -586,8 +591,8 @@
             chmod +x bin/pkg-config{.exe,-msys.sh}
         qpopd
         quiet gconftool-2 --version &&
-        ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 &&  # gnomeprint
-#        ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 &&  # not gnomeprint
+#        quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 &&  # gnomeprint
+        quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&  # not gnomeprint
         quiet intltoolize --version || die "gnome not installed correctly"
     fi
     if [ "$CROSS_COMPILE" = "yes" ]; then
@@ -671,7 +676,7 @@
     _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
     add_to_env $_GOFFICE_UDIR/bin PATH
     add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --exists libgoffice-0.4
+    if quiet ${PKG_CONFIG} --exists libgoffice-0.8
     then
         echo "goffice already installed.  skipping."
     else
@@ -687,14 +692,14 @@
             automake
             autoconf
             ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
-                CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS}" \
-                LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS}"
+                CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS} ${HH_CPPFLAGS}" \
+                LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS} ${HH_LDFLAGS}"
             [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
             [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
             make
             make install
         qpopd
-        ${PKG_CONFIG} --exists libgoffice-0.4 || die "goffice not installed correctly"
+        ${PKG_CONFIG} --exists libgoffice-0.8 || die "goffice not installed correctly"
     fi
 }
 
@@ -1140,7 +1145,7 @@
         grep -v "need_relink=yes" ltmain.sh > ltmain.sh.new ; mv ltmain.sh.new ltmain.sh
     qpopd
 
-    qpushd $BUILD_DIR
+   qpushd $BUILD_DIR
         $_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} \
             --prefix=$_INSTALL_WFSDIR \
             --enable-debug \



More information about the gnucash-changes mailing list