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

Upgrade Win64 GTK2 package to 2.24.23-3.39 

Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7
Reviewed-on: https://code.wireshark.org/review/4656
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2014-10-13 21:01:11 +02:00
parent 05a6615965
commit 1f481258da
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.nmake
View File

@ -75,7 +75,6 @@ reordercap_OBJECTS = $(reordercap_SOURCES:.c=.obj)
wireshark_gtk_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib psapi.lib \
$(GTHREAD_LIBS) \
$(HHC_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
@ -96,7 +95,6 @@ wireshark_gtk_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib psapi.lib \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
@ -115,7 +113,6 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
tfshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib psapi.lib \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
@ -181,8 +178,7 @@ dumpcap_LIBS= \
wsock32.lib user32.lib \
caputils\libcaputils.lib \
wsutil\libwsutil.lib \
$(GLIB_LIBS) \
$(GTHREAD_LIBS)
$(GLIB_LIBS)
dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib psapi.lib \
@ -1370,7 +1366,6 @@ install-all: install-generated-files
xcopy $(GTK_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d
xcopy $(GTK_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d
xcopy $(GTK_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d
xcopy $(GTK_DIR)\bin\libgthread-2.0-0.dll $(INSTALL_DIR) /d
!IF "$(GTK_PKG)" != "2.24.14-1.1"
xcopy $(GTK_DIR)\bin\$(INTL_DLL) $(INSTALL_DIR) /d
!ENDIF

11
config.nmake
View File

@ -501,7 +501,7 @@ GEOIP_PKG=1.5.1-2
WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws
!else
DOWNLOAD_TAG=2014-10-01
DOWNLOAD_TAG=2014-10-13
##### Win64 Libraries #####
#
# Mandatory: GLib settings
@ -525,16 +525,16 @@ GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
# These macros are used by the nsis installer script and by the install target.
#EXPAT_DLL=libexpat-1.dll
FFI_DLL=libffi-5.dll
FFI_DLL=libffi-6.dll
FONTCONFIG_DLL=libfontconfig-1.dll
FREETYPE_DLL=libfreetype-6.dll
INTL_DLL=libintl-8.dll
#HARFBUZZ_DLL=libharfbuzz-0.dll
HARFBUZZ_DLL=libharfbuzz-0.dll
JASPER_DLL=libjasper-1.dll
JPEG_DLL=libjpeg-8.dll
LZMA_DLL=liblzma-5.dll
PIXMAN_DLL=libpixman-1-0.dll
PNG_DLL=libpng15-15.dll
PNG_DLL=libpng16-16.dll
#SEH_DLL=libgcc_s_seh-1.dll
TIFF_DLL=libtiff-5.dll
XML_DLL=libxml2-2.dll
@ -543,7 +543,7 @@ XML_DLL=libxml2-2.dll
!IF "$(GTK_NAME)" == "gtk2"
GDK_DLL=libgdk-win32-2.0-0.dll
GTK_DLL=libgtk-win32-2.0-0.dll
GTK_PKG=2.24.14-1.1
GTK_PKG=2.24.23-3.39
#GTK_PKG=2.24.23-1.1
PKG_SUFIX=ws
!ELSE
@ -1371,7 +1371,6 @@ GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \
GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \
$(GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
$(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib
GTHREAD_LIBS=$(GTK_DIR)\lib\gthread-$(GLIB_VERSION).lib
PROGRAM_NAME_GTK=$(PROGRAM_NAME)-gtk

1
packaging/nsis/wireshark.nsi
View File

@ -330,7 +330,6 @@ File "${STAGING_DIR}\libgio-2.0-0.dll"
File "${STAGING_DIR}\libglib-2.0-0.dll"
File "${STAGING_DIR}\libgobject-2.0-0.dll"
File "${STAGING_DIR}\libgmodule-2.0-0.dll"
File "${STAGING_DIR}\libgthread-2.0-0.dll"
!ifdef ICONV_DIR
File "${STAGING_DIR}\iconv.dll"
!endif

2
ui/qt/Wireshark.pro
View File

@ -452,7 +452,7 @@ win32 {
../../dumpcap.exe \
../../epan/libwireshark.dll ../../wiretap/wiretap-$${WTAP_VERSION}.dll ../../wsutil/libwsutil.dll \
$${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \
$${GLIB_DIR}/bin/libgthread-2.0-0.dll $${GLIB_DIR}/bin/$${INTL_DLL} \
$${GLIB_DIR}/bin/$${INTL_DLL} \
$${C_ARES_DIR}/bin/libcares-2.dll $${ZLIB_DIR}/zlib1.dll \
$${GNUTLS_DIR}/bin/libffi-6.dll $${GNUTLS_DIR}/bin/$${GCC_DLL} \
$${GNUTLS_DIR}/bin/libgcrypt-20.dll $${GNUTLS_DIR}/bin/libgmp-10.dll \