From 36646e4264d3e62fc3755e89a5b89974efaab6ac Mon Sep 17 00:00:00 2001
From: Andrew Wellington
Date: Wed, 3 Nov 2010 17:16:44 +1100
Subject: Add optional X11 support to wireshark

Wireshark continues to build with no X11 support by default, but --with-x is
available to add support for the X11 GUI to wireshark.

Includes patch from wireshark svn that fixes a crash on launch.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/wireshark.rb | 44 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/wireshark.rb b/Library/Formula/wireshark.rb
index accc7a8b0..43a1b0eab 100644
--- a/Library/Formula/wireshark.rb
+++ b/Library/Formula/wireshark.rb
@@ -8,17 +8,47 @@ class Wireshark <Formula
   depends_on 'gnutls' => :optional
   depends_on 'pcre' => :optional
   depends_on 'glib'
+  depends_on 'gtk+' if ARGV.include? "--with-x"
+
+  def options
+    [["--with-x", "Include X11 support"]]
+  end
+  
+  def patches
+    # Fix a crash on launch bug in 1.4.1 as fixed in wireshark SVN revision 34494
+    DATA
+  end
 
   def install
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-dependency-tracking",
-                          "--disable-wireshark" # actually just disables the GTK GUI
+    args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
+
+    # actually just disables the GTK GUI
+    args << "--disable-wireshark" if not ARGV.include? "--with-x"
+
+    system "./configure", *args
     system "make"
     ENV.j1 # Install failed otherwise.
     system "make install"
   end
-
-  def caveats
-    "We don't build the X11-enabled GUI by default"
-  end
 end
+
+
+__END__
+--- trunk-1.4/gtk/main.c	2010/10/12 21:33:08	34493
++++ trunk-1.4/gtk/main.c	2010/10/13 00:50:07	34494
+@@ -2787,7 +2787,6 @@
+      changed either from one of the preferences file or from the command
+      line that their preferences have changed. */
+   prefs_apply_all();
+-  macros_post_update();
+ 
+   /* disabled protocols as per configuration file */
+   if (gdp_path == NULL && dp_path == NULL) {
+@@ -3731,6 +3730,7 @@
+ 
+    prefs_to_capture_opts();
+    prefs_apply_all();
++   macros_post_update();
+ 
+    /* Update window view and redraw the toolbar */
+    update_main_window_name();
-- 
cgit v1.2.3