Switch to our custom GTK+ bundles derived from openSUSE Build Service

packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143

Makefile.nmake

@@ -849,7 +849,7 @@ process_libs:
 	@if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)"
 !IFDEF GTK_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
-		gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
+		gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF KFW_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
@@ -1103,28 +1103,43 @@ install-all: install-generated-files
 	if exist $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d
 	xcopy $(GTK_DIR)\lib\gtk-2.0\modules\libgail.dll $(INSTALL_DIR)\lib\gtk-2.0\modules /d
 	xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines\libpixmap.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines /d
-!IFDEF NEED_LIBPNG_DLL
-	xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d
-!ENDIF
-!IFDEF NEED_LIBTIFF_DLL
-	xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d
-!ENDIF
-!IFDEF NEED_LIBJPEG_DLL
-	xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d
-!ENDIF
 !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_EXPAT_DLL
+	xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_FFI_DLL
+	xcopy $(GTK_DIR)\bin\$(FFI_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_FONTCONFIG_DLL
+	xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d
+!ENDIF
 !IFDEF NEED_FREETYPE_DLL
 	xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d
 	xcopy $(GTK_DIR)\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d
 !ENDIF
-!IFDEF NEED_FONTCONFIG_DLL
-	xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d
+!IFDEF NEED_JASPER_DLL
+	xcopy $(GTK_DIR)\bin\$(JASPER_DLL) $(INSTALL_DIR) /d
 !ENDIF
-!IFDEF NEED_EXPAT_DLL
-	xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d
+!IFDEF NEED_JPEG_DLL
+	xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_LZMA_DLL
+	xcopy $(GTK_DIR)\bin\$(LZMA_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_PIXMAN_DLL
+	xcopy $(GTK_DIR)\bin\$(PIXMAN_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_PNG_DLL
+	xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_TIFF_DLL
+	xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d
+!ENDIF
+!IFDEF NEED_XML_DLL
+	xcopy $(GTK_DIR)\bin\$(XML_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

config.nmake

@@ -216,16 +216,25 @@ GLIB_VERSION=2.0
 # directory in which the "include" and "lib" directories reside.
 #
 GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
+
 # These macros are used by the nsis installer script and by the install target.
-PNG_DLL=libpng14-14.dll
-FREETYPE_DLL=freetype6.dll
+#EXPAT_DLL=libexpat-1.dll
+FFI_DLL=libffi-5.dll
 FONTCONFIG_DLL=libfontconfig-1.dll
-EXPAT_DLL=libexpat-1.dll
-INTL_DLL=intl.dll
+FREETYPE_DLL=libfreetype-6.dll
+INTL_DLL=libintl-8.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
+TIFF_DLL=libtiff-5.dll
+XML_DLL=libxml2-2.dll
+
 # This macro is used by the setup target.
-#GTK_PKG=2.16.6-20100912
 #GTK_PKG=2.22.1-20101227
-GTK_PKG=2.24.10-20120208
+#GTK_PKG=2.24.10-20120208
+GTK_PKG=2.24.10-1.15
 
 #
 # Mandatory: Version numbers of GTK and pango.
@@ -406,17 +415,22 @@ GLIB_VERSION=2.0
 #
 GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
 # These macros are used by the nsis installer script and by the install target.
-PNG_DLL=libpng14-14.dll
-#TIFF_DLL=libtiff-3.dll
-#JPEG_DLL=libjpeg-7.dll
-FREETYPE_DLL=libfreetype-6.dll
+#EXPAT_DLL=libexpat-1.dll
+FFI_DLL=libffi-5.dll
 FONTCONFIG_DLL=libfontconfig-1.dll
-EXPAT_DLL=libexpat-1.dll
+FREETYPE_DLL=libfreetype-6.dll
 INTL_DLL=libintl-8.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
+TIFF_DLL=libtiff-5.dll
+XML_DLL=libxml2-2.dll
 
 # These macros are used by the setup target.
 #GTK_PKG=2.16.6-20100912
-GTK_PKG=2.22.1-20101229
+GTK_PKG=2.24.10-1.18
 
 #
 # Mandatory: Version numbers of GTK and pango.
@@ -425,7 +439,7 @@ GTK_PKG=2.22.1-20101229
 # These macros are used by the nsis installer script and by the setup target.
 #
 #GTK_INST_VERSION=2.16
-GTK_INST_VERSION=2.22
+GTK_INST_VERSION=2.24
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -993,20 +1007,44 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
 !IF "$(GTK_INST_VERSION)" == "2.24" || "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
 GTK_LIB_DIR=2.10.0
 
-!IFDEF PNG_DLL
-NEED_LIBPNG_DLL=USE
+!IFDEF _DLL
+!ENDIF
+
+NEED_CAIRO_DLL=USE
+
+!IFDEF EXPAT_DLL
+NEED_EXPAT_DLL=USE
+!ENDIF
+!IFDEF FFI_DLL
+NEED_FFI_DLL=USE
+!ENDIF
+!IFDEF FONTCONFIG_DLL
+NEED_FONTCONFIG_DLL=USE
+!ENDIF
+!IFDEF FREETYPE_DLL
+NEED_FREETYPE_DLL=USE
+!ENDIF
+!IFDEF JASPER_DLL
+NEED_JASPER_DLL=USE
 !ENDIF
 !IFDEF JPEG_DLL
-NEED_LIBJPEG_DLL=USE
+NEED_JPEG_DLL=USE
+!ENDIF
+!IFDEF LZMA_DLL
+NEED_LZMA_DLL=USE
+!ENDIF
+!IFDEF PIXMAN_DLL
+NEED_PIXMAN_DLL=USE
+!ENDIF
+!IFDEF PNG_DLL
+NEED_PNG_DLL=USE
 !ENDIF
 !IFDEF TIFF_DLL
-NEED_LIBTIFF_DLL=USE
+NEED_TIFF_DLL=USE
+!ENDIF
+!IFDEF XML_DLL
+NEED_XML_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
 
 GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines
 GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines

packaging/nsis/Makefile.nmake

@@ -103,32 +103,52 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
 	/DGTK_DIR=$(GTK_DIR) \
 	/DGTK_LIB_DIR=$(GTK_LIB_DIR) \
 	/DPANGO_LIB_DIR=$(PANGO_LIB_DIR) \
-!IFDEF NEED_LIBPNG_DLL
-	/DNEED_LIBPNG_DLL=$(NEED_LIBPNG_DLL) \
-	/DPNG_DLL=$(PNG_DLL) \
-!ENDIF
-!IFDEF NEED_LIBJPEG_DLL
-	/DNEED_LIBJPEG_DLL=$(NEED_LIBJPEG_DLL) \
-	/DJPEG_DLL=$(JPEG_DLL) \
-!ENDIF
-!IFDEF NEED_LIBTIFF_DLL
-	/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) \
+!IFDEF NEED_CAIRO_DLL
+	/DNEED_CAIRO_DLL=$(NEED_CAIRO_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) \
+!IFDEF NEED_FFI_DLL
+	/DNEED_FFI_DLL=$(NEED_FFI_DLL) \
+	/DFFI_DLL=$(FFI_DLL) \
+!ENDIF
+!IFDEF NEED_FONTCONFIG_DLL
+	/DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \
+	/DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \
+!ENDIF
+!IFDEF NEED_FREETYPE_DLL
+	/DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \
+	/DFREETYPE_DLL=$(FREETYPE_DLL) \
+!ENDIF
+!IFDEF NEED_JASPER_DLL
+	/DNEED_JASPER_DLL=$(NEED_JASPER_DLL) \
+	/DJASPER_DLL=$(JASPER_DLL) \
+!ENDIF
+!IFDEF NEED_JPEG_DLL
+	/DNEED_JPEG_DLL=$(NEED_JPEG_DLL) \
+	/DJPEG_DLL=$(JPEG_DLL) \
+!ENDIF
+!IFDEF NEED_LZMA_DLL
+	/DNEED_LZMA_DLL=$(NEED_LZMA_DLL) \
+	/DLZMA_DLL=$(LZMA_DLL) \
+!ENDIF
+!IFDEF NEED_PIXMAN_DLL
+	/DNEED_PIXMAN_DLL=$(NEED_PIXMAN_DLL) \
+	/DPIXMAN_DLL=$(PIXMAN_DLL) \
+!ENDIF
+!IFDEF NEED_PNG_DLL
+	/DNEED_PNG_DLL=$(NEED_PNG_DLL) \
+	/DPNG_DLL=$(PNG_DLL) \
+!ENDIF
+!IFDEF NEED_TIFF_DLL
+	/DNEED_TIFF_DLL=$(NEED_TIFF_DLL) \
+	/DTIFF_DLL=$(TIFF_DLL) \
+!ENDIF
+!IFDEF NEED_XML_DLL
+	/DNEED_XML_DLL=$(NEED_XML_DLL) \
+	/DXML_DLL=$(XML_DLL) \
 !ENDIF
 !ENDIF
 	/DGTK_WIMP_DLLDST_DIR=$(GTK_WIMP_DLLDST_DIR) \

packaging/nsis/wireshark.nsi

@@ -862,32 +862,48 @@ File "..\..\wireshark-gtk2\libpangowin32-1.0-0.dll"
 File "..\..\wireshark-gtk2\libcairo-2.dll"
 File "..\..\wireshark-gtk2\libpangocairo-1.0-0.dll"
 !endif
-!ifdef NEED_LIBPNG_DLL
-File "..\..\wireshark-gtk2\${PNG_DLL}"
+!ifdef NEED_EXPAT_DLL
+File "..\..\wireshark-gtk2\${EXPAT_DLL}"
 !endif
-!ifdef NEED_LIBTIFF_DLL
-File "..\..\wireshark-gtk2\${TIFF_DLL}"
+!ifdef NEED_FFI_DLL
+File "..\..\wireshark-gtk2\${FFI_DLL}"
 !endif
-!ifdef NEED_LIBJPEG_DLL
-File "..\..\wireshark-gtk2\${JPEG_DLL}"
+!ifdef NEED_FONTCONFIG_DLL
+File "..\..\wireshark-gtk2\${FONTCONFIG_DLL}"
 !endif
 !ifdef NEED_FREETYPE_DLL
 File "..\..\wireshark-gtk2\libpangoft2-1.0-0.dll"
 File "..\..\wireshark-gtk2\${FREETYPE_DLL}"
 !endif
-!ifdef NEED_FONTCONFIG_DLL
-File "..\..\wireshark-gtk2\${FONTCONFIG_DLL}"
+!ifdef NEED_JASPER_DLL
+File "..\..\wireshark-gtk2\${JASPER_DLL}"
 !endif
-!ifdef NEED_EXPAT_DLL
-File "..\..\wireshark-gtk2\${EXPAT_DLL}"
+!ifdef NEED_JPEG_DLL
+File "..\..\wireshark-gtk2\${JPEG_DLL}"
 !endif
+!ifdef NEED_LZMA_DLL
+File "..\..\wireshark-gtk2\${LZMA_DLL}"
+!endif
+!ifdef NEED_PIXMAN_DLL
+File "..\..\wireshark-gtk2\${PIXMAN_DLL}"
+!endif
+!ifdef NEED_PNG_DLL
+File "..\..\wireshark-gtk2\${PNG_DLL}"
+!endif
+!ifdef NEED_TIFF_DLL
+File "..\..\wireshark-gtk2\${TIFF_DLL}"
+!endif
+!ifdef NEED_XML_DLL
+File "..\..\wireshark-gtk2\${XML_DLL}"
+!endif
+
 SetOutPath $INSTDIR\etc\gtk-2.0
 File "${GTK_DIR}\etc\gtk-2.0\*.*"
 
-!if ${WIRESHARK_TARGET_PLATFORM} == "win32"
-SetOutPath $INSTDIR\etc\pango
-File "${GTK_DIR}\etc\pango\pango.*"
-!endif
+;!if ${WIRESHARK_TARGET_PLATFORM} == "win32"
+;SetOutPath $INSTDIR\etc\pango
+;File "${GTK_DIR}\etc\pango\pango.*"
+;!endif
 
 SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines
 File "..\..\wireshark-gtk2\lib\gtk-2.0\${GTK_LIB_DIR}\engines\libpixmap.dll"

tools/win32-setup.sh

@@ -4,7 +4,7 @@
 
 # 32-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2012-03-26"
+export DOWNLOAD_TAG="2012-04-19"
 export WIRESHARK_TARGET_PLATFORM="win32"
 
 WIN_SETUP=`echo $0 | sed -e s/win32/win/`

tools/win64-setup.sh

@@ -4,7 +4,7 @@
 
 # 64-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2012-03-29"
+export DOWNLOAD_TAG="2012-04-19"
 export WIRESHARK_TARGET_PLATFORM="win64"
 
 WIN_SETUP=`echo $0 | sed -e s/win64/win/`