Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 491464 | Differences between
and this patch

Collapse All | Expand All

(-)wireshark-1.11.1-orig/config.nmake (-3 lines)
Lines 1299-1307 Link Here
1299
	/I$(GTK_DIR)\include\atk-1.0 \
1299
	/I$(GTK_DIR)\include\atk-1.0 \
1300
	/I$(GTK_DIR)\include\cairo \
1300
	/I$(GTK_DIR)\include\cairo \
1301
	/I$(GTK_DIR)\include\pango-1.0 \
1301
	/I$(GTK_DIR)\include\pango-1.0 \
1302
	-DGDK_DISABLE_DEPRECATED \
1303
	-DGDK_PIXBUF_DISABLE_DEPRECATED \
1304
	-DGTK_DISABLE_DEPRECATED \
1305
	-DGTK_DISABLE_SINGLE_INCLUDES \
1302
	-DGTK_DISABLE_SINGLE_INCLUDES \
1306
	-DGSEAL_ENABLE
1303
	-DGSEAL_ENABLE
1307
GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
1304
GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
(-)wireshark-1.11.1-orig/configure.ac (-3 lines)
Lines 1482-1490 Link Here
1482
if test "$have_gtk" = "yes" ; then
1482
if test "$have_gtk" = "yes" ; then
1483
	# If we have GTK then add flags for it.
1483
	# If we have GTK then add flags for it.
1484
1484
1485
	CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
1486
	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
1487
	CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
1488
	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
1485
	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
1489
	if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
1486
	if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
1490
		# Enable GSEAL when building with GTK > 2.20
1487
		# Enable GSEAL when building with GTK > 2.20

Return to bug 491464