osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update to gtk+ 2.14.2 and glib glib-2.14.4 

svn path=/trunk/; revision=23674
This commit is contained in:
Anders Broman 2007-11-29 21:34:38 +00:00
parent c068f9acf2
commit 26c07ee766
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.nmake
View File

@ -637,9 +637,9 @@ process_libs:
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!IF "$(GTK2_INST_VERSION)" == "2.12"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib-2.14.3.zip
glib gtk2.12/glib-2.14.4.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib-dev-2.14.3.zip
glib gtk2.12/glib-dev-2.14.4.zip
!ELSEIF "$(GTK2_INST_VERSION)" == "2.10"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.10/glib-2.12.13.zip
@ -660,7 +660,7 @@ process_libs:
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gettext-0.14.5 gettext-0.14.5.zip
gettext-runtime-0.17 gettext-runtime-0.17.zip
!IFDEF KFW_DIR
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
kfw-2.5 kfw-2.5.zip
@ -708,9 +708,9 @@ process_libs:
!IFDEF GTK2_DIR
!IF "$(GTK2_INST_VERSION)" == "2.12"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/gtk+-2.12.1.zip
gtk2 gtk2.12/gtk+-2.12.2.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/gtk+-dev-2.12.1.zip
gtk2 gtk2.12/gtk+-dev-2.12.2.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/cairo-1.4.10.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \

4
config.nmake
View File

@ -271,8 +271,8 @@ ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
# GETTEXT include files and library resides.
#
#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1
GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17
#
# Optional: AirPcap developer's pack to capture wireless network traffic
# incl. 802.11 management frames.

6
tools/win32-setup.sh
View File

@ -6,10 +6,12 @@
# 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-11-24/packages/"
# Save privious tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-11-24/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-11-29a/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 ""