libkml: use checksummed patches

1 files changed, 24 insertions, 20 deletions

diff --git a/Library/Formula/libkml.rb b/Library/Formula/libkml.rb
index eac7eadc9..25370671c 100644
--- a/Library/Formula/libkml.rb
+++ b/Library/Formula/libkml.rb
@@ -2,22 +2,10 @@ require 'formula'
 
 class Libkml < Formula
   homepage 'http://code.google.com/p/libkml/'
-  url 'https://libkml.googlecode.com/files/libkml-1.2.0.tar.gz'
-  sha1 '3fa5acdc2b2185d7f0316d205002b7162f079894'
 
-  head do
-    url 'http://libkml.googlecode.com/svn/trunk/'
-
-    depends_on :autoconf
-    depends_on :automake
-    depends_on :libtool
-  end
-
-  def patches
-    p = []
-    # Fix compilation with clang and gcc 4.7+
-    # https://code.google.com/p/libkml/issues/detail?id=179
-    p << DATA
+  stable do
+    url "https://libkml.googlecode.com/files/libkml-1.2.0.tar.gz"
+    sha1 "3fa5acdc2b2185d7f0316d205002b7162f079894"
 
     # Correct an issue where internal third-party libs (libminizip and liburiparser)
     # are installed as dylibs. liburiparser conflicts with uriparser formula.
@@ -25,14 +13,30 @@ class Libkml < Formula
     # renamed with prefixes of "libkml_", i.e, can't be linked against for other builds
     # Fix just forces internal libs to be linked statically until the following
     # is addressed upstream: https://code.google.com/p/libkml/issues/detail?id=50
-    if build.head?
-      p << "https://gist.github.com/dakcarto/7420023/raw/65cdb088c91a7da844251e348eeda8df1d903f1d/libkml-svn-static-deps"
-    else
-      p << "https://gist.github.com/dakcarto/7419882/raw/10ae08af224b3fee0617fa6288d806d3ccf37c0f/libkml-1.2-static-deps"
+    patch do
+      url "https://gist.github.com/dakcarto/7419882/raw/10ae08af224b3fee0617fa6288d806d3ccf37c0f/libkml-1.2-static-deps"
+      sha1 "eba47421e64e75bcf68026bbbe7c985b3bebcde5"
     end
-    return p
   end
 
+
+  head do
+    url 'http://libkml.googlecode.com/svn/trunk/'
+
+    depends_on :autoconf
+    depends_on :automake
+    depends_on :libtool
+
+    # see stable patch
+    patch do
+      url "https://gist.github.com/dakcarto/7420023/raw/65cdb088c91a7da844251e348eeda8df1d903f1d/libkml-svn-static-deps"
+    end
+  end
+
+  # Fix compilation with clang and gcc 4.7+
+  # https://code.google.com/p/libkml/issues/detail?id=179
+  patch :DATA
+
   def install
     if build.head?
       # The inreplace line below is only required until the patch in #issue 186