Try a experimental gtk3 build

svn path=/trunk/; revision=45540

4 files changed, 30 insertions, 7 deletions

diff --git a/config.nmake b/config.nmake
index 8642a935f5..e7365a51ef 100644
--- a/config.nmake
+++ b/config.nmake
@@ -233,7 +233,7 @@ GLIB_VERSION=2.0
 # directory in which the "include" and "lib" directories reside.
 #
 # Set the name to gtk3 if you want to use gtk3 - Not yet working
-GTK_NAME=gtk2
+GTK_NAME=gtk3
 GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
 
 # These macros are used by the nsis installer script and by the install target.
@@ -252,11 +252,15 @@ XML_DLL=libxml2-2.dll
 
 # This macro is used by the setup target.
 !IF "$(GTK_NAME)" == "gtk2"
+GDK_DLL=libgdk-win32-2.0-0.dll
+GTK_DLL=libgtk-win32-2.0-0.dll
 #GTK_PKG=2.16.6-20100912
 #GTK_PKG=2.22.1-20101227
 GTK_PKG=2.24.10-2.7
 PKG_SUFIX=ws
 !ELSE
+GDK_DLL=libgdk-3-0.dll
+GTK_DLL=libgtk-3-0.dll
 PKG_SUFIX=ws
 GTK_PKG=3.4.4-2.1
 !ENDIF
@@ -444,7 +448,7 @@ GLIB_VERSION=2.0
 #
 #
 # Set the name to gtk3 if you want to use gtk3 - Not yet working
-GTK_NAME=gtk2
+GTK_NAME=gtk3
 GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
 
 # These macros are used by the nsis installer script and by the install target.
@@ -463,10 +467,14 @@ XML_DLL=libxml2-2.dll
 
 # These macros are used by the setup target.
 !IF "$(GTK_NAME)" == "gtk2"
+GDK_DLL=libgdk-win32-2.0-0.dll
+GTK_DLL=libgtk-win32-2.0-0.dll
 #GTK_PKG=2.16.6-20100912
 GTK_PKG=2.24.10-2.7
 PKG_SUFIX=ws
 !ELSE
+GDK_DLL=libgdk-3-0.dll
+GTK_DLL=libgtk-3-0.dll
 PKG_SUFIX=ws
 GTK_PKG=3.4.4-2.1
 !ENDIF
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 6fedf591f9..c78a423ba7 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -110,6 +110,9 @@ NSIS_FLAGS=\
 	/DGTK_DIR=$(GTK_DIR) \
 	/DGTK_LIB_DIR=$(GTK_LIB_DIR) \
 	/DPANGO_LIB_DIR=$(PANGO_LIB_DIR) \
+	/DGDK_DLL=$(GDK_DLL) \
+	/DGTK_DLL=$(GTK_DLL) \
+	/DGTK_NAME=$(GTK_NAME) \
 !IFDEF NEED_CAIRO_DLL
        /DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \
 !ENDIF
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index 2f603d85b3..a345ee9689 100755
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -128,6 +128,7 @@ DeleteRegKey HKCR "${WIRESHARK_ASSOC}\DefaultIcon"
 !insertmacro UpdateIcons
 
 Delete "$INSTDIR\etc\gtk-2.0\*.*"
+Delete "$INSTDIR\etc\gtk-3.0\*.*"
 Delete "$INSTDIR\etc\pango\*.*"
 Delete "$INSTDIR\lib\gtk-2.0\2.2.0\engines\*.*"
 Delete "$INSTDIR\lib\gtk-2.0\2.2.0\loaders\*.*"
@@ -143,6 +144,7 @@ Delete "$INSTDIR\lib\pango\1.2.0\modules\*.*"
 Delete "$INSTDIR\lib\pango\1.4.0\modules\*.*"
 Delete "$INSTDIR\lib\pango\1.5.0\modules\*.*"
 Delete "$INSTDIR\share\themes\Default\gtk-2.0\*.*"
+Delete "$INSTDIR\share\glib-2.0\schemas\*.*"
 Delete "$INSTDIR\help\*.*"
 Delete "$INSTDIR\diameter\*.*"
 Delete "$INSTDIR\snmp\mibs\*.*"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 7822cd0461..5869ecf4d4 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -19,7 +19,7 @@ SetCompressor /SOLID lzma
 ; ============================================================================
 
 ; The file to write
-OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
+OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-gtk3-${VERSION}.exe"
 
 ; Installer icon
 Icon "..\..\image\wiresharkinst.ico"
@@ -741,15 +741,18 @@ Section "Wireshark" SecWireshark
 ;-------------------------------------------
 SetOutPath $INSTDIR
 File "${STAGING_DIR}\wireshark.exe"
-File "${STAGING_DIR}\libgdk-win32-2.0-0.dll"
+File "${STAGING_DIR}\${GDK_DLL}"
 File "${STAGING_DIR}\libgdk_pixbuf-2.0-0.dll"
-File "${STAGING_DIR}\libgtk-win32-2.0-0.dll"
+File "${STAGING_DIR}\${GTK_DLL}"
 File "${STAGING_DIR}\libatk-1.0-0.dll"
 File "${STAGING_DIR}\libpango-1.0-0.dll"
 File "${STAGING_DIR}\libpangowin32-1.0-0.dll"
 !ifdef NEED_CAIRO_DLL
 File "${STAGING_DIR}\libcairo-2.dll"
 File "${STAGING_DIR}\libpangocairo-1.0-0.dll"
+!if ${GTK_NAME} == "gtk3"
+File "${STAGING_DIR}\libcairo-gobject-2.dll"
+!endif
 !endif
 !ifdef NEED_EXPAT_DLL
 File "${STAGING_DIR}\${EXPAT_DLL}"
@@ -786,14 +789,21 @@ File "${STAGING_DIR}\${TIFF_DLL}"
 File "${STAGING_DIR}\${XML_DLL}"
 !endif
 
+!if ${GTK_NAME} == "gtk2"
 SetOutPath $INSTDIR\etc\gtk-2.0
 File "${GTK_DIR}\etc\gtk-2.0\*.*"
-
+!else
+SetOutPath $INSTDIR\etc\gtk-3.0
+File "${STAGING_DIR}\etc\gtk-3.0\*.*"
+SetOutPath $INSTDIR\share\glib-2.0\schemas
+File "${STAGING_DIR}\share\glib-2.0\schemas\*.*"
+!endif
 #!if ${WIRESHARK_TARGET_PLATFORM} == "win32"
 #SetOutPath $INSTDIR\etc\pango
 #File "${GTK_DIR}\etc\pango\pango.*"
 #!endif
 
+!if ${GTK_NAME} == "gtk2"
 SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines
 File "${STAGING_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\engines\libpixmap.dll"
 SetOutPath $INSTDIR\lib\gtk-2.0\modules
@@ -804,7 +814,7 @@ SetOutPath $INSTDIR\${GTK_WIMP_DLLDST_DIR}
 File "${STAGING_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\engines\libwimp.dll"
 SetOutPath $INSTDIR\${GTK_WIMP_RCDST_DIR}
 File "${GTK_WIMP_RCSRC_DIR}\gtkrc"
-
+!endif
 SectionEnd ; "Wireshark"
 !endif