diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2008-07-21 10:03:47 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2008-07-21 10:03:47 +0000 |
| commit | 2207fb2aff4d863471a7dc7355e8087c58489e64 (patch) | |
| tree | ee53c17ae97f66a369dcf3646f82f6a4c8af1859 | |
| parent | e711dad8e3d97ebceec4860791b13813e77329b6 (diff) | |
Use the latest GTK libraries for GTK+ 2.12.11
svn path=/trunk/; revision=25777
| -rw-r--r-- | Makefile.nmake | 12 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1bf6a8d831..e9d69e5fe0 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -692,9 +692,9 @@ process_libs: if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) !IF "$(GTK_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.12/glib-2.16.3.zip + glib gtk2.12/glib-2.16.5.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.12/glib-dev-2.16.3.zip + glib gtk2.12/glib-dev-2.16.5.zip !ELSEIF "$(GTK_INST_VERSION)" == "2.10" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ glib gtk2.10/glib-2.12.13.zip @@ -756,9 +756,9 @@ process_libs: !IFDEF GTK_DIR !IF "$(GTK_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/gtk+-2.12.10.zip + gtk2 gtk2.12/gtk+-2.12.11.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/gtk+-dev-2.12.10.zip + gtk2 gtk2.12/gtk+-dev-2.12.11.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/cairo-1.6.4-2.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -793,9 +793,9 @@ process_libs: !ENDIF !IF "$(PANGO_INST_VERSION)" == "1.20" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/pango-1.20.3.zip + gtk2 gtk2.12/pango-1.20.5.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/pango-dev-1.20.3.zip + gtk2 gtk2.12/pango-dev-1.20.5.zip !ELSEIF "$(PANGO_INST_VERSION)" == "1.16" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.10/pango-1.16.4.zip diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index ee267e185c..692ab95206 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -7,10 +7,10 @@ # in order to provide backward compatibility with older trees (e.g. a # previous release or an older SVN checkout). # Save previous tag. -DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-07-15/packages/" +#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-07-15/packages/" # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag. -#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/" +DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/" err_exit () { echo "" |