gnucash-on-windows master: Roll Cairo version back to 2.10.2, split out dev tarballs.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b0a113c8 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/409efbd7 (commit)



commit b0a113c8993d55e269e4ed7e10582a43fcafa0c2
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Oct 8 17:25:44 2014 -0700

    Roll Cairo version back to 2.10.2, split out dev tarballs.
    
    Themes don't work right with Cairo-2.12, and the app doesn't need
    headers, libtool files, or pkgconfig files, they are needed to build
    with.

diff --git a/defaults.sh b/defaults.sh
index e62df89..c595c50 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -255,10 +255,13 @@ set_default LIBXML2_DEV_URL         "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_w
 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 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 GLIB_DEV_URL            "$GC_DEPS_URL/glib-2.38.2-dev-minGW.tgz"
+set_default CAIRO_VERSION="1.10.2"
+set_default CAIRO_URL               "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
+set_default CAIRO_DEV_URL           "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
 set_default GTK_VERSION="2.24.24"
 set_default GTK_URL                 "$GC_DEPS_URL/gtk+-2.24.24-minGW.tgz"
+set_default GTK_DEV_URL             "$GC_DEPS_URL/gtk+-2.24.24-dev-minGW.tgz"
 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"
 
diff --git a/install-impl.sh b/install-impl.sh
index 4e584a8..f075ba5 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -359,6 +359,7 @@ function inst_gnome() {
     else
         mkdir -p $_GNOME_UDIR
         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 $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -366,7 +367,9 @@ function inst_gnome() {
         wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GAIL_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



Summary of changes:
 defaults.sh     | 7 +++++--
 install-impl.sh | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)