osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use GTK 2.14.5 and glib 2.18.2 

Overview of Changes from GLib 2.18.2 to GLib 2.18.3
===================================================

* Build with libtool 2.x

* Bugs fixed:
 557087 mem leak in g_content_types_get_registered
 558185 'parent' variable in g_local_file_get_child_for_display_name()
         hits g_object_unref(NULL) assertion
 557210 g_compute_checksum_for_* asserts with less than 2 bytes
 528320 Incorrect icons displayed for files with custom mimetype icons
 557592 Missing include in gwinhttpfile.c
 556415 Crash on Windows 2000 in g_winhttp_vfs_init()
 556910 Memory leak: sub
 561352 Leak of icon description
 561375 Leaks mountpoint description
 560569 gkeyfile doesn't use the set list_separator in some cases
 560568 gkeyfile docs buglet
 559413 g_option_group_set_error_hook docs buglet

Overview of Changes from GTK+ 2.14.4 to 2.14.5
==============================================

* Bugs fixed:
 556578 GIMP windows stay on top of other windows
 557059 crash when compositing emblems with icon
 557266 Window Management Problem
 528320 Incorrect icons displayed for files with custom mimetype icons
 557894 Wrong return value for gdk_pointer_grab_info_libgtk_only
 557316 GtkLinkButton should consider user-defined tooltip
 558323 glitches when popping up combos in treeviews
 558278 Crash when calling a callback set by
gdk_add_client_message_filter
 557212 Problem with which window gains focus and is visible
 541391 Unfocussable Treeview swallows focus
 552956 Should check composite extension version
 554567 warning fixes (missing format specifiers and NULL vs 0)

svn path=/trunk/; revision=26960
This commit is contained in:
Anders Broman 2008-12-10 20:30:34 +00:00
parent 82fd44f303
commit 8a1b0a0414
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.nmake
View File

@ -713,9 +713,9 @@ process_libs:
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!IF "$(GTK_INST_VERSION)" == "2.14"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.14/glib_2.18.2-1_win32.zip
glib gtk2.14/glib_2.18.3-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.14/glib-dev_2.18.2-1_win32.zip
glib gtk2.14/glib-dev_2.18.3-1_win32.zip
!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib_2.18.0-1_win32.zip
@ -781,9 +781,9 @@ process_libs:
!IFDEF GTK_DIR
!IF "$(GTK_INST_VERSION)" == "2.14"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.14/gtk+_2.14.4-2_win32.zip
gtk2 gtk2.14/gtk+_2.14.5-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.14/gtk+-dev_2.14.4-2_win32.zip
gtk2 gtk2.14/gtk+-dev_2.14.5-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.14/cairo_1.8.0-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@ -1019,7 +1019,7 @@ install-all: install-generated-files
if not exist $(INSTALL_DIR)\lib\gtk-2.0 mkdir $(INSTALL_DIR)\lib\gtk-2.0
if not exist $(INSTALL_DIR)\lib\gtk-2.0\modules mkdir $(INSTALL_DIR)\lib\gtk-2.0\modules
if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR) mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)
# if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders
if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders
# if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules
if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines
# if not exist $(INSTALL_DIR)\lib\pango mkdir $(INSTALL_DIR)\lib\pango
@ -1027,7 +1027,7 @@ install-all: install-generated-files
# if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
xcopy $(GTK_DIR)\etc\gtk-2.0\*.* $(INSTALL_DIR)\etc\gtk-2.0 /d
xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d
# 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\$(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
# xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\im-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules /d

2
packaging/nsis/wireshark.nsi
View File

@ -746,6 +746,8 @@ SetOutPath $INSTDIR\etc\gtk-2.0
File "${GTK_DIR}\etc\gtk-2.0\*.*"
SetOutPath $INSTDIR\etc\pango
File "${GTK_DIR}\etc\pango\pango.*"
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\loaders
File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\loaders\libpixbufloader-*.dll"
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines
File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\engines\libpixmap.dll"
SetOutPath $INSTDIR\lib\gtk-2.0\modules

2
tools/win32-setup.sh
View File

@ -7,7 +7,7 @@
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
# Save previous tag.
DOWNLOAD_TAG="2008-11-15"
DOWNLOAD_TAG="2008-12-09"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/"
TAG_FILE="current_tag.txt"