forked from pool/wireshark
51 lines
2.3 KiB
Diff
51 lines
2.3 KiB
Diff
|
From: Andreas Stieger <andreas.stieger@gmx.de>
|
||
|
|
Date: Wed, 03 Dec 2014 00:09:42 +0000
|
||
|
|
Subject: allow use of deprecated gdk-pixbuf functions
|
||
|
|
References: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10750 https://git.gnome.org/browse/gdk-pixbuf/commit/?id=48d76fb7f2d059013f5781b199245274998f05c9
|
||
|
|
Upstream: no
|
||
|
|
|
||
|
|
gdk-pixbuf 2.31.2 marked GdkPixdata including as deprecated,
|
||
|
|
including gdk_pixbuf_new_from_inline. Wireshark builds with
|
||
|
|
deprecated functions turned off by default, in this case
|
||
|
|
GDK_PIXBUF_DISABLE_DEPRECATED. Patch to configure.ac to allow use of
|
||
|
|
deprecated function until upstream has ported the code, or a
|
||
|
|
replacement patch is available.
|
||
|
|
|
||
|
|
Reported upstream:
|
||
|
|
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10750
|
||
|
|
|
||
|
|
gdk-pixbuf change:
|
||
|
|
https://git.gnome.org/browse/gdk-pixbuf/commit/?id=48d76fb7f2d059013f5781b199245274998f05c9
|
||
|
|
|
||
|
|
Initial warning:
|
||
|
|
ui_utils.c: In function 'window_icon_realize_cb':
|
||
|
|
ui_utils.c:115:5: warning: implicit declaration of function 'gdk_pixbuf_new_from_inline' [-Wimplicit-function-declaration]
|
||
|
|
icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL);
|
||
|
|
^
|
||
|
|
Causes these warnings due to the implicit declaration:
|
||
|
|
gui_utils.c:115:10: warning: assignment makes pointer from integer without a cast [enabled by default]
|
||
|
|
icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL);
|
||
|
|
^
|
||
|
|
Fails the package checks in these lines:
|
||
|
|
E: wireshark 64bit-portability-issue gui_utils.c:115, 117, 119, 121, 512
|
||
|
|
E: wireshark 64bit-portability-issue main.c:1513, 1519, 1525, 1531
|
||
|
|
E: wireshark 64bit-portability-issue prefs_layout.c:346, 347, 348, 349, 350, 351
|
||
|
|
E: wireshark 64bit-portability-issue stock_icons.c:413, 425
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
Index: wireshark-1.12.2/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- wireshark-1.12.2.orig/configure.ac 2014-11-12 18:44:05.000000000 +0000
|
||
|
|
+++ wireshark-1.12.2/configure.ac 2014-12-03 00:06:17.000000000 +0000
|
||
|
|
@@ -1531,7 +1531,6 @@ fi
|
||
|
|
if test "$have_gtk" = "yes" ; then
|
||
|
|
# If we have GTK then add flags for it.
|
||
|
|
|
||
|
|
- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
|
||
|
|
CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
|
||
|
|
if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
|
||
|
|
## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
|