diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2008-04-24 19:45:29 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2008-04-24 19:45:29 +0000 |
| commit | 8fbe2f530ad211a7f9b98cfe95cd0e7cbd99416a (patch) | |
| tree | 5aa7bbe85d0122a08b5cd737b31ca9f1425842fe | |
| parent | b7051d5fd66c91e4608b37a602183a95062f6ef1 (diff) | |
Use cairo-1.6.4-1 and pango-dev-1.20.2
svn path=/trunk/; revision=25165
| -rw-r--r-- | Makefile.nmake | 8 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index baa99db57f..793d6dbb72 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -717,9 +717,9 @@ process_libs: @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/gtk+-dev-2.12.9.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/cairo-1.6.4.zip + gtk2 gtk2.12/cairo-1.6.4-1.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/cairo-dev-1.6.4.zip + gtk2 gtk2.12/cairo-dev-1.6.4-1.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/atk-1.22.0.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -750,9 +750,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.0.zip + gtk2 gtk2.12/pango-1.20.2.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/pango-dev-1.20.0.zip + gtk2 gtk2.12/pango-dev-1.20.2.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/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index a890f93002..ba67ed9d7e 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -416,6 +416,7 @@ CLEAN_DISSECTOR_SRC = \ packet-gprs-ns.c \ packet-gre.c \ packet-gsm_a.c \ + packet-gsm_bsslap.c \ packet-gsm_sms.c \ packet-gsm_sms_ud.c \ packet-gssapi.c \ diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index fc66a6c836..d9742b216f 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -7,8 +7,8 @@ # 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-04-21/packages/" -DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-22/packages/" +#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-22/packages/" +DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-24/packages/" # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag. #DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/" |