r19641 - gnucash/trunk/packaging/win32 - Revert r19576, r19590, r19593, r19601: "Update gtk versions..."
Christian Stimming
cstim at code.gnucash.org
Tue Oct 5 15:29:09 EDT 2010
Author: cstim
Date: 2010-10-05 15:29:09 -0400 (Tue, 05 Oct 2010)
New Revision: 19641
Trac: http://svn.gnucash.org/trac/changeset/19641
Modified:
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/install-impl.sh
Log:
Revert r19576, r19590, r19593, r19601: "Update gtk versions..."
It's been 3 weeks without a working windows build. Apparently this
has to wait until we have an updated webkit again. Revert this back once
we have a working webkit with gtk-2.20.
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2010-10-05 19:05:26 UTC (rev 19640)
+++ gnucash/trunk/packaging/win32/defaults.sh 2010-10-05 19:29:09 UTC (rev 19641)
@@ -202,49 +202,46 @@
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
#set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz" # unused
-set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32.zip"
-set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
+set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
+set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.4-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip"
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.24/glib_2.24.2-2_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.24/glib-dev_2.24.2-2_win32.zip"
-#set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip" # ?!?
-set_default LIBJPEG_7_URL "$GNOME_WIN32_DEPS_URL/jpeg_7-1_win32.zip"
-set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/jpeg_8-1_win32.zip"
-set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_8-1_win32.zip"
-set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
-set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32.zip"
-set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
-set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
-set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
+set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
+set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.0-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.0-1_win32.zip"
+set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.1-1_win32.zip"
+set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.1-1_win32.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-3_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.23-3_win32.zip"
-CAIRO_VERSION="1.10.0"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-1_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-1_win32.zip"
-set_default PIXMAN_URL "$GNOME_WIN32_DEPS_URL/pixman_0.18.4-2_win32.zip"
-set_default PIXMAN_DEV_URL "$GNOME_WIN32_DEPS_URL/pixman-dev_0.18.4-2_win32.zip"
+CAIRO_VERSION="1.8.8"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-4_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-4_win32.zip"
+set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.2-1_win32.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.2-1_win32.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.30/atk_1.30.0-2_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.30/atk-dev_1.30.0-2_win32.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.28/pango_1.28.1-2_win32.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.1-2_win32.zip"
-set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
-set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
-GTK_VERSION="2.20.1"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.20/gtk+_${GTK_VERSION}-3_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.20/gtk+-dev_${GTK_VERSION}-3_win32.zip"
+set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.3.11-2_win32.zip"
+set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.3.11-2_win32.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.28/atk_1.28.0-1_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.28/atk-dev_1.28.0-1_win32.zip"
+set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.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"
+GTK_VERSION="2.16.6"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_${GTK_VERSION}-2_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_${GTK_VERSION}-2_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.16-1_win32.zip"
-set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev_2.14.16-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"
@@ -258,13 +255,13 @@
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-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.30/libgnomecanvas_2.30.1-1_win32.zip"
-set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.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 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.4-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
-set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2"
+set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
@@ -282,12 +279,12 @@
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-LIBGSF_VERSION="1.14.18"
+LIBGSF_VERSION="1.14.17"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-GOFFICE_VERSION="0.8.10"
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
+GOFFICE_VERSION="0.7.18"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2010-10-05 19:05:26 UTC (rev 19640)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2010-10-05 19:29:09 UTC (rev 19641)
@@ -543,7 +543,6 @@
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_7_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -556,8 +555,6 @@
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PIXMAN_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -640,6 +637,17 @@
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
fi
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/pixman-*
+ qpushd $TMP_UDIR/pixman-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=$_GNOME_UDIR \
+ --disable-static
+ make
+ make install
+ qpopd
+ rm -rf $TMP_UDIR/pixman-*
+ ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
More information about the gnucash-changes
mailing list