Build with GTK+ 2.24.23.

Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460
Reviewed-on: https://code.wireshark.org/review/1665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>

6 files changed, 64 insertions, 13 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index e930f809b3..066577ea67 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1300,6 +1300,9 @@ install-all: install-generated-files
 	xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d
 	xcopy $(GTK_DIR)\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d
 !ENDIF
+!IFDEF NEED_HARFBUZZ_DLL
+	xcopy $(GTK_DIR)\bin\$(HARFBUZZ_DLL) $(INSTALL_DIR) /d
+!ENDIF
 !IFDEF NEED_JASPER_DLL
 	xcopy $(GTK_DIR)\bin\$(JASPER_DLL) $(INSTALL_DIR) /d
 !ENDIF
@@ -1315,6 +1318,12 @@ install-all: install-generated-files
 !IFDEF NEED_PNG_DLL
 	xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d
 !ENDIF
+!IFDEF NEED_SEH_DLL
+	xcopy $(GTK_DIR)\bin\$(SEH_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_SJLJ_DLL
+	xcopy $(GTK_DIR)\bin\$(SJLJ_DLL) $(INSTALL_DIR) /d
+!ENDIF
 !IFDEF NEED_TIFF_DLL
 	xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d
 !ENDIF
diff --git a/config.nmake b/config.nmake
index 64c9c24a20..fb5d2b3c65 100644
--- a/config.nmake
+++ b/config.nmake
@@ -289,15 +289,17 @@ 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
 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
+SJLJ_DLL=libgcc_s_sjlj-1.dll
 TIFF_DLL=libtiff-5.dll
 XML_DLL=libxml2-2.dll
 
@@ -306,7 +308,7 @@ XML_DLL=libxml2-2.dll
 GDK_DLL=libgdk-win32-2.0-0.dll
 GTK_DLL=libgtk-win32-2.0-0.dll
 #GTK_PKG=2.24.10-2.7
-GTK_PKG=2.24.14-1.1
+GTK_PKG=2.24.23-1.1
 PKG_SUFIX=ws
 !ELSE
 GDK_DLL=libgdk-3-0.dll
@@ -546,15 +548,17 @@ 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
 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
+SEH_DLL=libgcc_s_seh-1.dll
 TIFF_DLL=libtiff-5.dll
 XML_DLL=libxml2-2.dll
 
@@ -563,7 +567,7 @@ XML_DLL=libxml2-2.dll
 GDK_DLL=libgdk-win32-2.0-0.dll
 GTK_DLL=libgtk-win32-2.0-0.dll
 #GTK_PKG=2.24.10-2.7
-GTK_PKG=2.24.14-1.1
+GTK_PKG=2.24.23-1.1
 PKG_SUFIX=ws
 !ELSE
 GDK_DLL=libgdk-3-0.dll
@@ -1384,27 +1388,35 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
 
 GTK_LIB_DIR=2.10.0
 
-!IFDEF PNG_DLL
-NEED_PNG_DLL=USE
+!IFDEF HARFBUZZ_DLL
+NEED_HARFBUZZ_DLL=USE
 !ENDIF
 !IFDEF JPEG_DLL
 NEED_JPEG_DLL=USE
 !ENDIF
+!IFDEF PNG_DLL
+NEED_PNG_DLL=USE
+!ENDIF
+!IFDEF SEH_DLL
+NEED_SEH_DLL=USE
+!ENDIF
+!IFDEF SJLJ_DLL
+NEED_SJLJ_DLL=USE
+!ENDIF
 !IFDEF TIFF_DLL
 NEED_TIFF_DLL=USE
 !ENDIF
 NEED_CAIRO_DLL=USE
 # Pango >=1.24.5 Needs these:
-NEED_FREETYPE_DLL=USE
-NEED_FONTCONFIG_DLL=USE
 #NEED_EXPAT_DLL=USE
-NEED_XML_DLL=USE
-NEED_PIXMAN_DLL=USE
 NEED_FFI_DLL=USE
+NEED_FONTCONFIG_DLL=USE
+NEED_FREETYPE_DLL=USE
 NEED_JASPER_DLL=USE
 NEED_JPEG_DLL=USE
-NEED_TIFF_DLL=USE
 NEED_LZMA_DLL=USE
+NEED_PIXMAN_DLL=USE
+NEED_XML_DLL=USE
 
 !ELSEIF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
 
@@ -1454,6 +1466,9 @@ NEED_FONTCONFIG_DLL=USE
 !IFDEF FREETYPE_DLL
 NEED_FREETYPE_DLL=USE
 !ENDIF
+!IFDEF HARFBUZZ_DLL
+NEED_HARFBUZZ_DLL=USE
+!ENDIF
 !IFDEF JASPER_DLL
 NEED_JASPER_DLL=USE
 !ENDIF
@@ -1469,6 +1484,12 @@ NEED_PIXMAN_DLL=USE
 !IFDEF PNG_DLL
 NEED_PNG_DLL=USE
 !ENDIF
+!IFDEF SEH_DLL
+NEED_SEH_DLL=USE
+!ENDIF
+!IFDEF SJLJ_DLL
+NEED_SJLJ_DLL=USE
+!ENDIF
 !IFDEF TIFF_DLL
 NEED_TIFF_DLL=USE
 !ENDIF
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index ae9a144fc3..1c32f06f06 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -144,6 +144,10 @@ NSIS_FLAGS=\
 	/DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \
 	/DFREETYPE_DLL=$(FREETYPE_DLL) \
 !ENDIF
+!IFDEF NEED_HARFBUZZ_DLL
+	/DNEED_HARFBUZZ_DLL=$(NEED_HARFBUZZ_DLL) \
+	/DHARFBUZZ_DLL=$(HARFBUZZ_DLL) \
+!ENDIF
 !IFDEF NEED_JASPER_DLL
 	/DNEED_JASPER_DLL=$(NEED_JASPER_DLL) \
 	/DJASPER_DLL=$(JASPER_DLL) \
@@ -164,6 +168,14 @@ NSIS_FLAGS=\
 	/DNEED_PNG_DLL=$(NEED_PNG_DLL) \
 	/DPNG_DLL=$(PNG_DLL) \
 !ENDIF
+!IFDEF NEED_SEH_DLL
+	/DNEED_SEH_DLL=$(NEED_SEH_DLL) \
+	/DSEH_DLL=$(SEH_DLL) \
+!ENDIF
+!IFDEF NEED_SJLJ_DLL
+	/DNEED_SJLJ_DLL=$(NEED_SJLJ_DLL) \
+	/DSJLJ_DLL=$(SJLJ_DLL) \
+!ENDIF
 !IFDEF NEED_TIFF_DLL
 	/DNEED_TIFF_DLL=$(NEED_TIFF_DLL) \
 	/DTIFF_DLL=$(TIFF_DLL) \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 5cd71ee446..6fe00bd0a6 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -803,6 +803,9 @@ File "${STAGING_DIR}\${FONTCONFIG_DLL}"
 File "${STAGING_DIR}\libpangoft2-1.0-0.dll"
 File "${STAGING_DIR}\${FREETYPE_DLL}"
 !endif
+!ifdef NEED_HARFBUZZ_DLL
+File "${STAGING_DIR}\${HARFBUZZ_DLL}"
+!endif
 !ifdef NEED_JASPER_DLL
 File "${STAGING_DIR}\${JASPER_DLL}"
 !endif
@@ -818,6 +821,12 @@ File "${STAGING_DIR}\${PIXMAN_DLL}"
 !ifdef NEED_PNG_DLL
 File "${STAGING_DIR}\${PNG_DLL}"
 !endif
+!ifdef NEED_SEH_DLL
+File "${STAGING_DIR}\${SEH_DLL}"
+!endif
+!ifdef NEED_SJLJ_DLL
+File "${STAGING_DIR}\${SJLJ_DLL}"
+!endif
 !ifdef NEED_TIFF_DLL
 File "${STAGING_DIR}\${TIFF_DLL}"
 !endif
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 76205c180f..bc9bd4ba4d 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -22,7 +22,7 @@
 
 # 32-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2014-04-16"
+export DOWNLOAD_TAG="2014-05-16"
 export WIRESHARK_TARGET_PLATFORM="win32"
 
 WIN_SETUP=`echo $0 | sed -e s/win32/win/`
diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh
index a56259159e..bd61722dfe 100755
--- a/tools/win64-setup.sh
+++ b/tools/win64-setup.sh
@@ -22,7 +22,7 @@
 
 # 64-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2014-04-16"
+export DOWNLOAD_TAG="2014-05-16"
 export WIRESHARK_TARGET_PLATFORM="win64"
 
 WIN_SETUP=`echo $0 | sed -e s/win64/win/`