From c3052dc433716d486db9124108bd43454b625f59 Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Sat, 7 May 2016 10:09:56 -0700
Subject: [PATCH] libmarisa: new upstream repo and another clang fix

Upstream is now at https://github.com/s-yata/marisa-trie

Also, fix the following `make check` failure when using clang:

    TestEntry(): 212: Assertion `entry.ptr() == NULL' failed.

Uses the same method to fix this bug as upstream used to fix ReverseKey
in s-yata/marisa-trie@cbab26f0.

Closes #875.

Signed-off-by: ilovezfs <ilovezfs@icloud.com>
---
 Formula/libmarisa.rb | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/Formula/libmarisa.rb b/Formula/libmarisa.rb
index d1fc9df15e..e42c5df15a 100644
--- a/Formula/libmarisa.rb
+++ b/Formula/libmarisa.rb
@@ -1,8 +1,24 @@
 class Libmarisa < Formula
   desc "Static and space-efficient trie data structure"
-  homepage "https://code.google.com/p/marisa-trie/"
-  url "https://marisa-trie.googlecode.com/files/marisa-0.2.4.tar.gz"
-  sha256 "67a7a4f70d3cc7b0a85eb08f10bc3eaf6763419f0c031f278c1f919121729fb3"
+  homepage "https://github.com/s-yata/marisa-trie"
+  revision 1
+
+  stable do
+    url "https://marisa-trie.googlecode.com/files/marisa-0.2.4.tar.gz"
+    sha256 "67a7a4f70d3cc7b0a85eb08f10bc3eaf6763419f0c031f278c1f919121729fb3"
+
+    # trie-test.cc:71: TestKey(): 115: Assertion `r_key.ptr() == NULL' failed.
+    # Both upstream patches are needed since one unwinds the other.
+    patch do
+      url "https://github.com/s-yata/marisa-trie/commit/80f812304bcf6d2ca2f7d614cbb7b5fb07ac44f5.patch"
+      sha256 "e7882c93b470c1a079ee22805108f976b2a460759ea7656cf5264a793427cc8c"
+    end
+
+    patch do
+      url "https://github.com/s-yata/marisa-trie/commit/cbab26f05f92313e72f4a58262264879bdb37531.patch"
+      sha256 "dfce4e35db5a2b51bdcbc396dfd03cbf1c9b5e2f786548e8001e2af661d4b55c"
+    end
+  end
 
   bottle do
     cellar :any
@@ -11,7 +27,24 @@ class Libmarisa < Formula
     sha256 "b7d7691ab312b816b016a954f2e00106616870d388d2ccef5df68180bcaf30ef" => :mavericks
   end
 
+  head do
+    url "https://github.com/s-yata/marisa-trie.git"
+
+    depends_on "autoconf" => :build
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
+  end
+
+  # Fixes TestEntry(): 212: Assertion `entry.ptr() == NULL' failed.
+  # Same method as upstream used for the `r_key.ptr() == NULL' bug
+  # Upstream PR opened 7th May 2016
+  patch do
+    url "https://github.com/s-yata/marisa-trie/pull/9.patch"
+    sha256 "35cb5c33083e9780aed45cfddd45ebe6aea28ae1eb2a2014f5f02a48cdbc60a9"
+  end
+
   def install
+    system "autoreconf", "-fvi" if build.head?
     system "./configure", "--prefix=#{prefix}"
     system "make", "check"
     system "make", "install"