[133911] trunk/dports/net/wireshark

[ricci at macports.org]

Revision: 133911
          https://trac.macports.org/changeset/133911
Author:   ricci at macports.org
Date:     2015-03-15 11:42:08 -0700 (Sun, 15 Mar 2015)
Log Message:
-----------
wireshark:
	add patch to configure from #46850
	resolves #46850

Modified Paths:
--------------
    trunk/dports/net/wireshark/Portfile

Added Paths:
-----------
    trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2015-03-15 18:38:57 UTC (rev 133910)
+++ trunk/dports/net/wireshark/Portfile	2015-03-15 18:42:08 UTC (rev 133911)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		wireshark
 version		1.12.4
-revision	0
+revision	1
 categories	net
 license		{GPL-2 GPL-3}
 maintainers	darkart.com:opendarwin.org
@@ -28,7 +28,8 @@
 
 conflicts	wireshark-devel
 
-patchfiles	patch-configure.diff
+patchfiles	patch-configure.diff	\
+			patch-configure.pixmap-fix.diff
 
 depends_build 		\
 		port:pkgconfig

Added: trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff
===================================================================
--- trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff	                        (rev 0)
+++ trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff	2015-03-15 18:42:08 UTC (rev 133911)
@@ -0,0 +1,14 @@
+--- configure.old	2015-03-04 16:56:11.000000000 +1300
++++ configure	2015-03-04 17:08:33.000000000 +1300
+@@ -31054,7 +31054,10 @@
+ if test "$have_gtk" = "yes" ; then
+ 	# If we have GTK then add flags for it.
+ 
+-	CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
++	# 2015-03-04 - disabled to fix SegFault, see
++	# https://trac.macports.org/ticket/46850
++	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195980#c45
++	#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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150315/c33a23ea/attachment-0001.html>