summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2007-08-10 11:42:31 +0000
committerAnders Broman <anders.broman@ericsson.com>2007-08-10 11:42:31 +0000
commit8ae37d9391abedad4139ea2c0583ef92bcbadd36 (patch)
tree537c912dcdd0f7728e45ddffa18b742b763ec48a
parent5856a9e4e35d4a2f5ebb59e4f1ed32d3ec3f1f62 (diff)
downloadwireshark-8ae37d9391abedad4139ea2c0583ef92bcbadd36.tar.gz
Use the latest GTK2 packages
svn path=/trunk/; revision=22482
-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 db69f89287..af54a25f17 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -585,9 +585,9 @@ 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.12.zip
+ glib gtk2.10/glib-2.12.13.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- glib gtk2.10/glib-dev-2.12.12.zip
+ glib gtk2.10/glib-dev-2.12.13.zip
!ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.8/glib-2.12.12.zip
@@ -670,13 +670,13 @@ 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.12.zip
+ gtk2 gtk2.10/gtk+-2.10.14.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.10/gtk+-dev-2.10.12.zip
+ gtk2 gtk2.10/gtk+-dev-2.10.14.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.10/cairo-1.4.2.zip
+ gtk2 gtk2.10/cairo-1.4.8.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.10/cairo-dev-1.4.2.zip
+ gtk2 gtk2.10/cairo-dev-1.4.8.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/atk-1.18.0.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 0ae30ab760..5862664ee3 100755
--- 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-05-14/packages"
+DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-08-10/packages"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"