osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use the latest GTK packages. 

svn path=/trunk/; revision=29943
This commit is contained in:
Anders Broman 2009-09-16 13:34:37 +00:00
parent 5a2247f5a3
commit ef2d9da167
5 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.nmake
View File

@ -834,6 +834,15 @@ process_libs:
!ERROR ? Unknown or invalid PANGO_INST_VERSION
!ENDIF
!ENDIF
# PANGO 1.24.5 needs these DLL:s
!IFDEF NEED_FREETYPE_DLL
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
expat gtk$(GTK_INST_VERSION)/expat_$(EXPAT_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
fontconfig gtk$(GTK_INST_VERSION)/fontconfig_$(FONTCONFIG_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
freetype gtk$(GTK_INST_VERSION)/freetype_$(FREETYPE_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
!ENDIF
!IFDEF HHC_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
user-guide user-guide-28526.zip
@ -1028,6 +1037,16 @@ install-all: install-generated-files
!IFDEF NEED_CAIRO_DLL
xcopy $(GTK_DIR)\bin\libcairo-2.dll $(INSTALL_DIR) /d
xcopy $(GTK_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL_DIR) /d
!ENDIF
!IFDEF NEED_FREETYPE_DLL
xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d
xcopy $(WIRESHARK_LIBS)\freetype\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d
!ENDIF
!IFDEF NEED_FONTCONFIG_DLL
xcopy $(WIRESHARK_LIBS)\fontconfig\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d
!ENDIF
!IFDEF NEED_EXPAT_DLL
xcopy $(WIRESHARK_LIBS)\expat\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d
!ENDIF
if not exist $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR)
xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) /d

24
config.nmake
View File

@ -139,7 +139,7 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
GLIB_VERSION=2.0
GLIB_DIR=$(WIRESHARK_LIBS)\glib
# This macro is used by the setup target.
GLIB_PKG=2.20.4-1
GLIB_PKG=2.20.5-1
##### To Use new packet list uncomment this line ####
### Warning Experimental - work in progress
@ -157,14 +157,20 @@ GTK_DIR=$(WIRESHARK_LIBS)\gtk2
# These macros are used by the nsis installer script and by the install target.
TIFF_DLL=libtiff3.dll
JPEG_DLL=jpeg62.dll
FREETYPE_DLL=freetype6.dll
FONTCONFIG_DLL=libfontconfig-1.dll
EXPAT_DLL=libexpat-1.dll
# These macros are used by the setup target.
GTK_PKG=2.16.5-1
CAIRO_PKG=1.8.8-1
GTK_PKG=2.16.6-1
CAIRO_PKG=1.8.8-2
ATK_PKG=1.26.0-1
LIBPNG_PKG=1.2.37-1
LIBPNG_PKG=1.2.38-1
TIFF_PKG=libtiff-3.8.2
JPEG_PKG=jpeg-6b-4-bin
PANGO_PKG=1.24.5-1
PANGO_PKG=1.24.5-2
FREETYPE_PKG=2.3.9-1
FONTCONFIG_PKG=2.7.3-1
EXPAT_PKG=2.0.1-1
#
# Mandatory: Version numbers of GTK and pango.
@ -366,7 +372,7 @@ GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws
GLIB_VERSION=2.0
GLIB_DIR=$(WIRESHARK_LIBS)\glib
# This macro is used by the setup target.
GLIB_PKG=2.20.3-1
GLIB_PKG=2.20.5-1
##### To Use new packet list uncomment this line ####
### Warning Experimental - work in progress
@ -949,6 +955,12 @@ PANGO_LIB_DIR=1.5.0
!ERROR ? Unknown or invalid PANGO_INST_VERSION
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.24"
#PANGO 1.24.5 Needs these:
NEED_FREETYPE_DLL=USE
NEED_FONTCONFIG_DLL=USE
NEED_EXPAT_DLL=USE
!ENDIF
!IFDEF AIRPCAP_DIR
AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
AIRPDCAP_CONFIG=^#define HAVE_AIRPDCAP 1

13
packaging/nsis/Makefile.nmake
View File

@ -84,6 +84,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
$(MAKENSIS) \
/DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \
/DMSVC_VARIANT=$(MSVC_VARIANT) \
/DWIRESHARK_LIBS=$(WIRESHARK_LIBS) \
!IFDEF MSVCR_DLL
/DMSVCR_DLL="$(MSVCR_DLL)" \
!ENDIF
@ -108,6 +109,18 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
/DNEED_LIBTIFF_DLL=$(NEED_LIBTIFF_DLL) \
/DTIFF_DLL=$(TIFF_DLL) \
!ENDIF
!IFDEF NEED_FREETYPE_DLL
/DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \
/DFREETYPE_DLL=$(FREETYPE_DLL) \
!ENDIF
!IFDEF NEED_FONTCONFIG_DLL
/DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \
/DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \
!ENDIF
!IFDEF NEED_EXPAT_DLL
/DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \
/DEXPAT_DLL=$(EXPAT_DLL) \
!ENDIF
!IFDEF NEED_CAIRO_DLL
/DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \
!ENDIF

10
packaging/nsis/wireshark.nsi
View File

@ -834,6 +834,16 @@ File "${GTK_DIR}\bin\${TIFF_DLL}"
!ifdef NEED_LIBJPEG_DLL
File "${GTK_DIR}\bin\${JPEG_DLL}"
!endif
!ifdef NEED_FREETYPE_DLL
File "${GTK_DIR}\bin\libpangoft2-1.0-0.dll"
File "${WIRESHARK_LIBS}\freetype\bin\${FREETYPE_DLL}"
!endif
!ifdef NEED_FONTCONFIG_DLL
File "${WIRESHARK_LIBS}\fontconfig\bin\${FONTCONFIG_DLL}"
!endif
!ifdef NEED_EXPAT_DLL
File "${WIRESHARK_LIBS}\expat\bin\${EXPAT_DLL}"
!endif
SetOutPath $INSTDIR\etc\gtk-2.0
File "${GTK_DIR}\etc\gtk-2.0\*.*"

2
tools/win32-setup.sh
View File

@ -9,7 +9,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=${DOWNLOAD_TAG:-"2009-08-28"}
DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-09-16B"}
WIRESHARK_TARGET_PLATFORM=${WIRESHARK_TARGET_PLATFORM:-"win32"}
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/"