Switch back to the gtk.org version of the GTK+ bundle since its Cairo

doesn't crash.

svn path=/trunk/; revision=42171

2 files changed, 31 insertions, 67 deletions

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 9bf9d281b5..1af5bf38fe 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -103,52 +103,32 @@ 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_CAIRO_DLL
-	/DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \
-!ENDIF
-!IFDEF NEED_EXPAT_DLL
-	/DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \
-	/DEXPAT_DLL=$(EXPAT_DLL) \
+!IFDEF NEED_LIBPNG_DLL
+	/DNEED_LIBPNG_DLL=$(NEED_LIBPNG_DLL) \
+	/DPNG_DLL=$(PNG_DLL) \
 !ENDIF
-!IFDEF NEED_FFI_DLL
-	/DNEED_FFI_DLL=$(NEED_FFI_DLL) \
-	/DFFI_DLL=$(FFI_DLL) \
+!IFDEF NEED_LIBJPEG_DLL
+	/DNEED_LIBJPEG_DLL=$(NEED_LIBJPEG_DLL) \
+	/DJPEG_DLL=$(JPEG_DLL) \
 !ENDIF
-!IFDEF NEED_FONTCONFIG_DLL
-	/DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \
-	/DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \
+!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_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) \
+!IFDEF NEED_FONTCONFIG_DLL
+	/DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \
+	/DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \
 !ENDIF
-!IFDEF NEED_TIFF_DLL
-	/DNEED_TIFF_DLL=$(NEED_TIFF_DLL) \
-	/DTIFF_DLL=$(TIFF_DLL) \
+!IFDEF NEED_EXPAT_DLL
+	/DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \
+	/DEXPAT_DLL=$(EXPAT_DLL) \
 !ENDIF
-!IFDEF NEED_XML_DLL
-	/DNEED_XML_DLL=$(NEED_XML_DLL) \
-	/DXML_DLL=$(XML_DLL) \
+!IFDEF NEED_CAIRO_DLL
+	/DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \
 !ENDIF
 !ENDIF
 	/DGTK_WIMP_DLLDST_DIR=$(GTK_WIMP_DLLDST_DIR) \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 3d0320f7cf..1e7ca8e210 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -862,48 +862,32 @@ 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_EXPAT_DLL
-File "..\..\wireshark-gtk2\${EXPAT_DLL}"
+!ifdef NEED_LIBPNG_DLL
+File "..\..\wireshark-gtk2\${PNG_DLL}"
 !endif
-!ifdef NEED_FFI_DLL
-File "..\..\wireshark-gtk2\${FFI_DLL}"
+!ifdef NEED_LIBTIFF_DLL
+File "..\..\wireshark-gtk2\${TIFF_DLL}"
 !endif
-!ifdef NEED_FONTCONFIG_DLL
-File "..\..\wireshark-gtk2\${FONTCONFIG_DLL}"
+!ifdef NEED_LIBJPEG_DLL
+File "..\..\wireshark-gtk2\${JPEG_DLL}"
 !endif
 !ifdef NEED_FREETYPE_DLL
 File "..\..\wireshark-gtk2\libpangoft2-1.0-0.dll"
 File "..\..\wireshark-gtk2\${FREETYPE_DLL}"
 !endif
-!ifdef NEED_JASPER_DLL
-File "..\..\wireshark-gtk2\${JASPER_DLL}"
-!endif
-!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}"
+!ifdef NEED_FONTCONFIG_DLL
+File "..\..\wireshark-gtk2\${FONTCONFIG_DLL}"
 !endif
-!ifdef NEED_XML_DLL
-File "..\..\wireshark-gtk2\${XML_DLL}"
+!ifdef NEED_EXPAT_DLL
+File "..\..\wireshark-gtk2\${EXPAT_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"