HexChat 2.10.0

Closes #29752.

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

1 files changed, 13 insertions, 29 deletions

diff --git a/Library/Formula/hexchat.rb b/Library/Formula/hexchat.rb
index 6f316c9f6..8f1a92d1f 100644
--- a/Library/Formula/hexchat.rb
+++ b/Library/Formula/hexchat.rb
@@ -2,13 +2,17 @@ require 'formula'
 
 class Hexchat < Formula
   homepage 'http://hexchat.github.io/'
-  url 'http://dl.hexchat.net/hexchat/hexchat-2.9.6.1.tar.xz'
-  sha1 'a2978606df331117440614cce188494f97ebed31'
+  head 'https://github.com/hexchat/hexchat.git'
 
-  head do
-    url 'https://github.com/hexchat/hexchat.git'
-    depends_on 'intltool' => :build
-    depends_on 'gnome-common' => :build
+  stable do
+    url 'http://dl.hexchat.net/hexchat/hexchat-2.10.0.tar.xz'
+    sha256 'a0247f1e12379154d0719d9c6861dc22817b588562653bb9d3626863d8eca916'
+
+    patch do
+      # Fixes building --with-plugin on older than Mavericks and --without-plugin on all
+      url 'https://github.com/hexchat/hexchat/commit/8578a9d52d993f4425259462c01854ea7784c57f.diff'
+      sha256 '77575dc70943299422d87c9d5b57061f49aa7bd58c03fbd78973e37a8310c625'
+    end
   end
 
   depends_on :macos => :lion
@@ -17,6 +21,8 @@ class Hexchat < Formula
   depends_on 'automake' => :build
   depends_on 'autoconf' => :build
   depends_on 'libtool' => :build
+  depends_on 'intltool' => :build
+  depends_on 'gnome-common' => :build
   depends_on :python => :optional
   depends_on :python3 => :optional
   depends_on 'gettext'
@@ -46,29 +52,7 @@ class Hexchat < Formula
     args << "--disable-perl" if build.without? "perl"
     args << "--disable-plugin" if build.without? "plugins"
 
-    # > 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?
-
-      # 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
-
-    if build.head?
-      system "./autogen.sh"
-    else
-      system "autoreconf -vi"
-    end
+    system "./autogen.sh"
     system "./configure", *args
     system "make"
     system "make install"