diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-29 14:34:13 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-29 21:39:41 +0000 |
| commit | 5330875336fef3366b6b3c8f9696a289d39dbe29 (patch) | |
| tree | 612d62aa2708b197a8904a9994dddb48c5542ddf /config.nmake | |
| parent | 0744558a35f8cd91a3243cd10842c6971205e9c5 (diff) | |
GTK+: Revert back to 2.24.14-1.1 on Win64.
As Pascal discovered in
https://www.wireshark.org/lists/wireshark-dev/201409/msg00045.html
Wireshark-gtk.exe crashes at startup on Windows 8.1 x64 when compiled
with the GTK+ 2.24.23-1.1 bundle and Visual C++ 2013. Revert to the
Win64 build to the prior GTK+ bundle, which works on my test system.
Update the release notes. Make sure we use a libintl-8.dll that's
compatible with GnuTLS.
Ideally we'd just upgrade or rebuild the GTK+ bundle but so far that
hasn't worked. Prior to this I tried:
Updating the gtk2 package at build.opensuse.org to 2.24.24. This fails with
[ 187s] make[3]: Leaving directory `/home/abuild/rpmbuild/BUILD/gtk+-2.24.24/gtk'
[ 187s] /usr/bin/gtk-update-icon-cache --force --ignore-theme-index \
[ 187s] --include-image-data \
[ 187s] --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
[ 187s] mv gtkbuiltincache.h.tmp gtkbuiltincache.h
[ 187s] gtk-update-icon-cache: No theme index file.
[ 187s] make[2]: *** [gtkbuiltincache.h] Error 1
Switching to the OBS GTK+ 3.14 package. It looks like a lot of our GTK+ code is
deprecated, including GtkAction and GtkAttachOptions.
Change-Id: I1548c84022f02895e5d424cd61e0fed7b57b2e75
Ping-Bug: 9914
Reviewed-on: https://code.wireshark.org/review/4379
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index acd65615d8..d804079711 100644 --- a/config.nmake +++ b/config.nmake @@ -525,17 +525,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-6.dll +FFI_DLL=libffi-5.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 -SEH_DLL=libgcc_s_seh-1.dll +#SEH_DLL=libgcc_s_seh-1.dll TIFF_DLL=libtiff-5.dll XML_DLL=libxml2-2.dll @@ -543,8 +543,8 @@ 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.10-2.7 -GTK_PKG=2.24.23-1.1 +GTK_PKG=2.24.14-1.1 +#GTK_PKG=2.24.23-1.1 PKG_SUFIX=ws !ELSE GDK_DLL=libgdk-3-0.dll |