Update to the latest Win32 libraries.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21770 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index c53e728ca1db0fd1a4f0b8dd675b4552887f9a9b..61e24e805dfe348d98103c1133a6afc5ed0e9585 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -582,14 +582,14 @@ setup: verify_tools clean_setup
     if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
 !IF "$(GTK2_INST_VERSION)" == "2.10"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               glib gtk2.10/glib-2.12.11.zip
+               glib gtk2.10/glib-2.12.12.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               glib gtk2.10/glib-dev-2.12.11.zip
+               glib gtk2.10/glib-dev-2.12.12.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               glib gtk2.8/glib-2.12.4.zip
+               glib gtk2.8/glib-2.12.12.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               glib gtk2.8/glib-dev-2.12.4.zip
+               glib gtk2.8/glib-dev-2.12.12.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.6/glib-2.6.6.zip
@@ -667,17 +667,17 @@ setup: verify_tools clean_setup
 !IFDEF GTK2_DIR
 !IF "$(GTK2_INST_VERSION)" == "2.10"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/gtk+-2.10.11.zip
+               gtk2 gtk2.10/gtk+-2.10.12.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/gtk+-dev-2.10.11.zip
+               gtk2 gtk2.10/gtk+-dev-2.10.12.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/cairo-1.4.0.zip
+               gtk2 gtk2.10/cairo-1.4.2.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/cairo-dev-1.4.0.zip
+               gtk2 gtk2.10/cairo-dev-1.4.2.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/atk-1.12.3.zip
+               gtk2 gtk2.10/atk-1.18.0.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/atk-dev-1.12.3.zip
+               gtk2 gtk2.10/atk-dev-1.18.0.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.10/libpng-1.2.8-bin.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
@@ -725,9 +725,9 @@ setup: verify_tools clean_setup
 !ENDIF
 !IF "$(PANGO_INST_VERSION)" == "1.16"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/pango-1.16.1.zip
+               gtk2 gtk2.10/pango-1.16.4.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.10/pango-dev-1.16.1.zip
+               gtk2 gtk2.10/pango-dev-1.16.4.zip
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.14"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.10/pango-1.14.10.zip

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index a3d906dd2190a7cd4fee7cfb74869371024c549d..0ae30ab7601e9864e4cb8e20517f4956beb808f8 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -6,7 +6,7 @@
 #   http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
-DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-03-22/packages"
+DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-05-14/packages"
 
 # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
 #DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"