Use New GTK packages:

Overview of Changes from GLib 2.14.4 to GLib 2.14.5
===================================================

* Bugs fixed:
 482313 gregex: no way to tell why compilation failed
 315437 extern inline -> static inline
 480122 g_module_open fails to open modules with ".la" extension
 495589 gspawn.c failing to set FD_CLOEXEC
 500638 gkeyfile speedup ...
 503029 g_time_val_from_iso8601 parse non-ISO8601 dates
 503420 gkeyfile leaks a hash table 

Overview of Changes from GTK+ 2.12.3 to 2.12.4
==============================================

 * Bugs fixed:
 494667 gdkpixloader jpeg loader problems with some files
 496546 Tooltips may crashe because a window is destroyed
 503824 gtk_paned_find_neighbours aborts with assertion failure
 388321 gtk_notebook_remove_tab_label
 503190 Doesn't build with directfb >= 1.0
 491847 gtk-builder-convert --root option doesn't work for GtkWin...
 492977 Setup autorelease pool automatically in each mainloop ite...
 499951 GtkAssistant remove_page may leave current_page as a dang...
 502250 Leak in gtkfilechooserdefault.c:shortcuts_reload_icons()
 503569 Leak in GtkTreeViewColumn
 504753 Destroyed subviews are not removed from the view hierarchy
 504804 Typo in TEST_EXPAND_ROW signal
 504984 Problems with hiding/showing transient windows
 505708 compatibility macros for signals has wrong type.
 506107 mem leak in print dialogue
 502850 gtk-builder-convert program not found
 504749 gtk-builder-convert and GtkMenu 

GTK+ 2.12.5
This release fixes an incomplete icon cache that was
accidentally shipped in 2.12.4.

svn path=/trunk/; revision=24101

2 files changed, 10 insertions, 10 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 870542b43f..17508c13bb 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -642,9 +642,9 @@ process_libs:
     if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
 !IF "$(GTK2_INST_VERSION)" == "2.12"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		glib gtk2.12/glib-2.14.4.zip
+		glib gtk2.12/glib-2.14.5.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		glib gtk2.12/glib-dev-2.14.4.zip
+		glib gtk2.12/glib-dev-2.14.5.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.10"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		glib gtk2.10/glib-2.12.13.zip
@@ -713,13 +713,13 @@ process_libs:
 !IFDEF GTK2_DIR
 !IF "$(GTK2_INST_VERSION)" == "2.12"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/gtk+-2.12.3.zip
+		gtk2 gtk2.12/gtk+-2.12.5.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/gtk+-dev-2.12.3.zip
+		gtk2 gtk2.12/gtk+-dev-2.12.5.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/cairo-1.4.10.zip
+		gtk2 gtk2.12/cairo-1.4.14.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/cairo-dev-1.4.10.zip
+		gtk2 gtk2.12/cairo-dev-1.4.14.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		gtk2 gtk2.12/atk-1.20.0.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -757,9 +757,9 @@ process_libs:
 !ENDIF
 !IF "$(PANGO_INST_VERSION)" == "1.18"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/pango-1.18.3.zip
+		gtk2 gtk2.12/pango-1.18.4.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/pango-dev-1.18.3.zip
+		gtk2 gtk2.12/pango-dev-1.18.4.zip
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		gtk2 gtk2.10/pango-1.16.4.zip
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 800e036b45..448aa23761 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -7,8 +7,8 @@
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
 # Save privious tag.
-# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-15/packages/"
-DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-25/packages/"
+#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-25/packages/"
+DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-01-15/packages/"
 
 # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
 # DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"