From e392e77382a5e40ab6e5ae9d2cdec536b53be6c7 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Fri, 28 Aug 2009 06:21:16 +0000
Subject: [PATCH] Use GTK+ 2.16.5 and Glib 2.20.4.

svn path=/trunk/; revision=29593
---
 config.nmake         | 8 ++++----
 tools/win32-setup.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.nmake b/config.nmake
index 90c8d2e150..dbb5d74e9e 100644
--- a/config.nmake
+++ b/config.nmake
@@ -137,7 +137,7 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
 # Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
 #
 GLIB_VERSION=2.0
-GLIB_PKG=2.20.3-1
+GLIB_PKG=2.20.4-1
 GLIB_DIR=$(WIRESHARK_LIBS)\glib
 
 ##### To Use new packet list uncomment this line ####
@@ -153,15 +153,15 @@ GLIB_DIR=$(WIRESHARK_LIBS)\glib
 # directory in which the "include" and "lib" directories reside.
 #
 GTK_DIR=$(WIRESHARK_LIBS)\gtk2
-GTK_PKG=2.16.2-1
-CAIRO_PKG=1.8.6-1
+GTK_PKG=2.16.5-1
+CAIRO_PKG=1.8.8-1
 ATK_PKG=1.26.0-1
 LIBPNG_PKG=1.2.37-1
 TIFF_PKG=libtiff-3.8.2
 TIFF_DLL=libtiff3.dll
 JPEG_PKG=jpeg-6b-4-bin
 JPEG_DLL=jpeg62.dll
-PANGO_PKG=1.24.2-1
+PANGO_PKG=1.24.5-1
 
 #
 # Mandatory: Version numbers of GTK and pango.
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index f35fb173b3..823ec7bf10 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -9,7 +9,7 @@
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
 # Save previous tag.
-DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-06-10-1.0"}
+DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-08-28"}
 WIRESHARK_TARGET_PLATFORM=${WIRESHARK_TARGET_PLATFORM:-"win32"}
 
 DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/"