HexChat 2.9.6.1, fix HEAD

Closes #29077.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 30 insertions, 17 deletions

diff --git a/Library/Formula/hexchat.rb b/Library/Formula/hexchat.rb
index d826ee602..3dd8e803f 100644
--- a/Library/Formula/hexchat.rb
+++ b/Library/Formula/hexchat.rb
@@ -2,9 +2,14 @@ require 'formula'
 
 class Hexchat < Formula
   homepage 'http://hexchat.github.io/'
-  url 'https://github.com/hexchat/hexchat/archive/v2.9.6.tar.gz'
-  sha1 'f19248e8d255cf463d5c0eba3e3df02a431f3911'
-  head 'https://github.com/hexchat/hexchat.git'
+  url 'http://dl.hexchat.net/hexchat/hexchat-2.9.6.1.tar.xz'
+  sha1 'a2978606df331117440614cce188494f97ebed31'
+
+  head do
+    url 'https://github.com/hexchat/hexchat.git'
+    depends_on 'intltool' => :build
+    depends_on 'gnome-common' => :build
+  end
 
   depends_on :macos => :lion
 
@@ -23,11 +28,7 @@ class Hexchat < Formula
   def install
     args = %W[--prefix=#{prefix}
               --disable-dependency-tracking
-              --enable-openssl
-              --disable-xlib]
-
-    # Fails on 32-bit core solo without this
-    args << "--disable-mmx" unless MacOS.prefer_64_bit?
+              --enable-openssl]
 
     if build.with? "python"
       python = Formula["python"]
@@ -44,17 +45,29 @@ class Hexchat < Formula
     args << "--disable-perl" if build.without? "perl"
     args << "--disable-plugin" if build.without? "plugins"
 
-    # Build fails because of a conflict with the system 'strptime',
-    # so rename the function
-    inreplace "src/fe-gtk/banlist.c" do |s|
-      s.gsub! "strptime", "_strptime"
-    end
+    # > 2.9.6.1 has these issues fixed
+    if not build.head?
+      args << "--disable-xlib"
+
+      # Fails on 32-bit core solo without this
+      args << "--disable-mmx" unless MacOS.prefer_64_bit?
 
-    # The locations of the gettext dependencies are hardcoded, so copy them
-    gettext = Formula["gettext"].opt_prefix/"share/gettext"
-    cp_r ["#{gettext}/intl", "#{gettext}/po"], "."
+      # Build fails because of a conflict with the system 'strptime',
+      # so rename the function
+      inreplace "src/fe-gtk/banlist.c" do |s|
+        s.gsub! "strptime", "_strptime"
+      end
+
+      # The locations of the gettext dependencies are hardcoded, so copy them
+      gettext = Formula["gettext"].opt_prefix/"share/gettext"
+      cp_r ["#{gettext}/intl", "#{gettext}/po"], "."
+    end
 
-    system "autoreconf -vi"
+    if build.head?
+      system "./autogen.sh"
+    else
+      system "autoreconf -vi"
+    end
     system "./configure", *args
     system "make"
     system "make install"