Accepting request 263910 from home:AndreasStieger:branches:network:utilities

Allow build with functions deprecated in gdk-pixbuf 2.31.2,
fixing build for openSUSE Factory

OBS-URL: https://build.opensuse.org/request/show/263910
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=130

wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch

@@ -0,0 +1,50 @@
+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;

wireshark.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec  3 20:37:44 UTC 2014 - andreas.stieger@gmx.de
+
+- Allow build with functions deprecated in gdk-pixbuf 2.31.2,
+  fixing build for openSUSE Factory,
+  add wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
+
 -------------------------------------------------------------------
 Thu Nov 13 18:38:56 UTC 2014 - andreas.stieger@gmx.de
 

wireshark.spec

@@ -40,6 +40,7 @@ Patch1:         wireshark-1.2.0-disable-warning-dialog.patch
 Patch2:         wireshark-1.2.0-geoip.patch
 Patch4:         wireshark-1.10.0-enable_lua.patch
 Patch5:         wireshark-1.10.0-authors-pod2man.patch
+Patch6:         wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  flex
@@ -93,7 +94,11 @@ BuildRequires:  libgnutls-devel >= 1.2.0
 BuildConflicts: libgnutls-devel >= 3.0.0
 %endif # SLE 11
 %endif # use_gnutls
-
+# for patch6 wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+#
 Requires:       wireshark-ui = %{version}
 
 %description
@@ -174,8 +179,11 @@ sed \
 %endif # with qt
 
 %patch5 -p1
+%patch6 -p1
 
 %build
+# for patch6 wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
+autoreconf -fiv
 
 # zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2
 %configure \