diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-01-13 23:21:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-01-13 23:21:19 +0000 |
| commit | 2b3540be16e295ce902ebbc167984c9e66f04196 (patch) | |
| tree | 936def820d9f3bfd7bc09f52b9f057fd3afe6a2c | |
| parent | 2f8bc6f65e2659aeb29bb5c9883b4b15bfcaf038 (diff) | |
Use Glib 2.18-4 GTK+ 2.14.7 and Cairo 1.8.6.
svn path=/trunk/; revision=27226
| -rw-r--r-- | Makefile.nmake | 12 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index b776df2b9b..1f5416a180 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -716,9 +716,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.3-1_win32.zip + glib gtk2.14/glib_2.18.4-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.14/glib-dev_2.18.3-1_win32.zip + glib gtk2.14/glib-dev_2.18.4-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 @@ -788,13 +788,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.6-1_win32.zip + gtk2 gtk2.14/gtk+_2.14.7-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.14/gtk+-dev_2.14.6-1_win32.zip + gtk2 gtk2.14/gtk+-dev_2.14.7-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.14/cairo_1.8.0-1_win32.zip + gtk2 gtk2.14/cairo_1.8.6-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.14/cairo-dev_1.8.0-1_win32.zip + gtk2 gtk2.14/cairo-dev_1.8.6-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 61fe8c1e54..792300d4fd 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-12-27" +DOWNLOAD_TAG="2009-01-13" DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/" TAG_FILE="current_tag.txt" |