diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-03-14 07:12:55 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-03-14 07:12:55 +0000 |
| commit | 96838a7064c68d34d8a3b7f4333db6233bc7130e (patch) | |
| tree | 794c31850c0d2dbc24c867eeb724011cdf60ca03 | |
| parent | 8f92a66a89795a76b7e9ca9e0bb34a85732df949 (diff) | |
Use the latest GTK packages for Windows.
svn path=/trunk/; revision=21024
| -rw-r--r-- | Makefile.nmake | 16 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 16a974c69b..54c58b8c5f 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -537,9 +537,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.7.zip + glib gtk2.10/glib-2.12.10.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - glib gtk2.10/glib-dev-2.12.7.zip + glib gtk2.10/glib-dev-2.12.10.zip !ELSEIF "$(GTK2_INST_VERSION)" == "2.8" @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ glib gtk2.8/glib-2.12.4.zip @@ -622,13 +622,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.7.zip + gtk2 gtk2.10/gtk+-2.10.9.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.10/gtk+-dev-2.10.7.zip + gtk2 gtk2.10/gtk+-dev-2.10.9.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.10/cairo-1.2.6.zip + gtk2 gtk2.10/cairo-1.4.0.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.10/cairo-dev-1.2.6.zip + gtk2 gtk2.10/cairo-dev-1.4.0.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ gtk2 gtk2.10/atk-1.12.3.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ @@ -680,9 +680,9 @@ setup: verify_tools clean_setup !ENDIF !IF "$(PANGO_INST_VERSION)" == "1.14" @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.10/pango-1.14.9.zip + gtk2 gtk2.10/pango-1.14.10.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.10/pango-dev-1.14.9.zip + gtk2 gtk2.10/pango-dev-1.14.10.zip !ELSEIF "$(PANGO_INST_VERSION)" == "1.10" @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ gtk2 gtk2.8/pango-1.10.1.zip diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 8441f8f292..449004b803 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -4,7 +4,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-01-19/packages" +DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-03-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/" |