gnucash-on-windows master: Use new built gtk stack from GnuCash's SF downloads area.
John Ralls
jralls at code.gnucash.org
Sat Oct 4 17:48:03 EDT 2014
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/22cb89a3 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/f4124796 (commit)
commit 22cb89a34220e957ebec780244424a6aa9943ef6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 4 15:48:23 2014 -0700
Use new built gtk stack from GnuCash's SF downloads area.
diff --git a/defaults.sh b/defaults.sh
index 60e1b7f..85008b7 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -77,6 +77,7 @@ set_default GTK_MIRROR "ftp.gtk.org/pub"
set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
+set_default GC_DEPS_URL "$SF_MIRROR/gnucash/Dependencies"
# Mingw toolchain
@@ -225,11 +226,6 @@ set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.32/atk_1.32.0-2_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.32/atk-dev_1.32.0-2_win32.zip"
-CAIRO_VERSION="1.10.2"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-2_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-2_win32.zip"
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"
@@ -238,17 +234,9 @@ set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win3
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.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"
-GDK_PIXBUF_VERSION=2.24.0
-set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf_${GDK_PIXBUF_VERSION}-1_win32.zip"
-set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf-dev_${GDK_PIXBUF_VERSION}-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.8-1_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.8-1_win32.zip"
-GTK_VERSION="2.24.10"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+_${GTK_VERSION}-1_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+-dev_${GTK_VERSION}-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
@@ -266,12 +254,14 @@ set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32
set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
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 PANGO_URL "$GNOME_WIN32_URL/pango/1.29/pango_1.29.4-1_win32.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.29/pango-dev_1.29.4-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-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 "$GC_DEPS_URL/glib-2.38.2-minGW.tgz"
+set_default CAIRO_VERSION="1.12.2"
+set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.12.16-minGW.tgz"
+set_default GTK_VERSION="2.24.24"
+set_default GTK_URL "$GC_DEPS_URL/gtk+-2.24.24-minGW.tgz"
+
set_default GNOME_DIR $GLOBAL_DIR\\gnome
set_default SWIG_URL "$SF_MIRROR/swig/swigwin-2.0.11.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index 3617d2c..b6e1a9f 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -85,13 +85,11 @@ function dist_aqbanking() {
function dist_gnome() {
setup Gnome platform
- wget_unpacked $ATK_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
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
@@ -103,8 +101,6 @@ function dist_gnome() {
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
#wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
echo 'gtk-theme-name = "Nimbus"' > $DIST_DIR/etc/gtk-2.0/gtkrc
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
diff --git a/install-impl.sh b/install-impl.sh
index 8dd16a6..e5de149 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -358,10 +358,7 @@ function inst_gnome() {
echo "gnome packages installed in $_GNOME_UDIR. skipping."
else
mkdir -p $_GNOME_UDIR
- wget_unpacked $ATK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ATK_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 $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -370,12 +367,8 @@ function inst_gnome() {
wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GDK_PIXBUF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -387,12 +380,9 @@ function inst_gnome() {
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 $PANGO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PANGO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+
echo 'gtk-theme-name = "Nimbus"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
Summary of changes:
defaults.sh | 24 +++++++-----------------
dist-impl.sh | 4 ----
install-impl.sh | 12 +-----------
3 files changed, 8 insertions(+), 32 deletions(-)
More information about the gnucash-changes
mailing list