aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2008-11-15 16:36:27 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2008-11-15 16:36:27 +0000
commitd6cb53f3d41994e60b276098f9b14122516da4ea (patch)
tree130f94572af158c1a419694e685f3aaf377d33c6
parent5972c8c64cde47a5e04eb19f94d21086c7a7a7ea (diff)
Update GTK packages.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26786 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--Makefile.nmake12
-rwxr-xr-xtools/win32-setup.sh2
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 5296375063..c16aaacbd6 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -710,9 +710,9 @@ process_libs:
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!IF "$(GTK_INST_VERSION)" == "2.14"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- glib gtk2.14/glib_2.18.1-1_win32.zip
+ glib gtk2.14/glib_2.18.2-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- glib gtk2.14/glib-dev_2.18.1-1_win32.zip
+ glib gtk2.14/glib-dev_2.18.2-1_win32.zip
!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib_2.18.0-1_win32.zip
@@ -778,13 +778,13 @@ process_libs:
!IFDEF GTK_DIR
!IF "$(GTK_INST_VERSION)" == "2.14"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.14/gtk+_2.14.3-2_win32.zip
+ gtk2 gtk2.14/gtk+_2.14.4-2_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.14/gtk+-dev_2.14.3-2_win32.zip
+ gtk2 gtk2.14/gtk+-dev_2.14.4-2_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.14/cairo_1.7.6-1_win32.zip
+ gtk2 gtk2.14/cairo_1.8.0-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.14/cairo-dev_1.7.6-1_win32.zip
+ gtk2 gtk2.14/cairo-dev_1.8.0-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.14/atk_1.24.0-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index f269490f1d..af41285fa4 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -7,7 +7,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="2008-10-01"
+DOWNLOAD_TAG="2008-11-15"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/"
TAG_FILE="current_tag.txt"