diff options
| author | Steven Peters | 2014-04-11 16:07:51 -0700 | 
|---|---|---|
| committer | Jack Nagel | 2014-04-11 20:53:22 -0500 | 
| commit | cd9c98b77e46ae1eb8c297ddcd80db48745b00a4 (patch) | |
| tree | bf1fe154a08ca111a0d19916b7f6b692d70623bf | |
| parent | 120b1658b485acba330ab5208962de455530d028 (diff) | |
| download | homebrew-cd9c98b77e46ae1eb8c297ddcd80db48745b00a4.tar.bz2 | |
Use .diff instead of .patch for github commit sourced patches
This modifies multiple formulae in a single commit, replacing
the patch suffix with diff per #28315. I used the following
command:
~~~
sed -i -e 's@patch"$@diff"@' `grep -rlI 'commit.*patch"$' .`
~~~
The patch shasums are then computed using:
~~~
brew fetch --build-from-source `git st | sed -e 's@^ M@@'`
~~~
and manually updated.
Fixes #28315.
Fixes #28335.
Closes #28339.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/boost.rb | 8 | ||||
| -rw-r--r-- | Library/Formula/calcurse.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/cfengine.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/cherokee.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/ettercap.rb | 8 | ||||
| -rw-r--r-- | Library/Formula/geoipupdate.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/groovyserv.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/iodine.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/libopkele.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/libplist.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/mtr.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/opencolorio.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/partio.rb | 12 | ||||
| -rw-r--r-- | Library/Formula/povray.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/rbenv-gem-rehash.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/wiggle.rb | 12 | ||||
| -rw-r--r-- | Library/Formula/x264.rb | 4 | 
17 files changed, 46 insertions, 46 deletions
| diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb index 1ac3cc545..01e58dbe9 100644 --- a/Library/Formula/boost.rb +++ b/Library/Formula/boost.rb @@ -62,13 +62,13 @@ class Boost < Formula      # https://github.com/Homebrew/homebrew/issues/27396      # https://github.com/Homebrew/homebrew/pull/27436      patch :p2 do -      url "https://github.com/boostorg/atomic/commit/6bb71fdd.patch" -      sha1 "8dfaf4d123f1161c83fff91d4ef70b8f95a4ef94" +      url "https://github.com/boostorg/atomic/commit/6bb71fdd.diff" +      sha1 "ca8679011d5293a7fd02cb3b97dde3515b8b2b03"      end      patch :p2 do -      url "https://github.com/boostorg/atomic/commit/e4bde20f.patch" -      sha1 "f206e7261d00503788ae8ec3a0635ced8a816293" +      url "https://github.com/boostorg/atomic/commit/e4bde20f.diff" +      sha1 "b68f5536474c9f543879698299bd4975538a89eb"      end    end diff --git a/Library/Formula/calcurse.rb b/Library/Formula/calcurse.rb index b0591cba2..ae1308e8f 100644 --- a/Library/Formula/calcurse.rb +++ b/Library/Formula/calcurse.rb @@ -9,8 +9,8 @@ class Calcurse < Formula    # Patch sent upstream: https://github.com/cryptocrack/calcurse/pull/1    patch do -    url "https://github.com/jacknagel/calcurse/commit/86dd23f87bcbb32a69f5f0391439238d4e389d77.patch" -    sha1 "5af66c819acf115e65e4d94ca903df6bbc5274d2" +    url "https://github.com/jacknagel/calcurse/commit/86dd23f87bcbb32a69f5f0391439238d4e389d77.diff" +    sha1 "d9a1036c230e6c8a4702c7a05da6277bac9c4a31"    end    def install diff --git a/Library/Formula/cfengine.rb b/Library/Formula/cfengine.rb index 4d957087b..1492ae73e 100644 --- a/Library/Formula/cfengine.rb +++ b/Library/Formula/cfengine.rb @@ -13,8 +13,8 @@ class Cfengine < Formula    # Upstream patches for OS X compilation    patch do -    url "https://github.com/cfengine/core/commit/d03fcc2d38a4db0c79386aaef30597102bf45853.patch" -    sha1 "99c043fc158f790fa8cc327ffa1ebcc36deb6470" +    url "https://github.com/cfengine/core/commit/d03fcc2d38a4db0c79386aaef30597102bf45853.diff" +    sha1 "1050a7f1719b8ad0e04868319324cc38637a3725"    end    def install diff --git a/Library/Formula/cherokee.rb b/Library/Formula/cherokee.rb index 7561aaf45..b7518bde0 100644 --- a/Library/Formula/cherokee.rb +++ b/Library/Formula/cherokee.rb @@ -9,8 +9,8 @@ class Cherokee < Formula      # OSX 10.9 patch      patch do -      url "https://github.com/cherokee/webserver/commit/d0213768fdc6cf3aee61fe0be398d7825c01198f.patch" -      sha1 "4befeead2466c6ade6f2de5c39653e251f7dc365" +      url "https://github.com/cherokee/webserver/commit/d0213768fdc6cf3aee61fe0be398d7825c01198f.diff" +      sha1 "6f6443e7b1fce20bf36660e6a75c889fd1121c16"      end    end diff --git a/Library/Formula/ettercap.rb b/Library/Formula/ettercap.rb index 74a83e38a..67e36acf8 100644 --- a/Library/Formula/ettercap.rb +++ b/Library/Formula/ettercap.rb @@ -11,15 +11,15 @@ class Ettercap < Formula        # Fixes issue #326: redefinition of 'bpf_program', 'bpf_version',        #  and 'bpf_insn' in ec_send.c on Mac OS X.        # url: https://github.com/Ettercap/ettercap/issues/326 -      url "https://github.com/Ettercap/ettercap/commit/4aaaa2.patch" -      sha1 "f76b6bea3972949697f2925194aec6a4faf4aa5e" +      url "https://github.com/Ettercap/ettercap/commit/4aaaa2.diff" +      sha1 "c1c78b38f3f1ffcdbb1d16a292c0fc6d96991ed0"      end      patch do        # Fixes issue #344: undefined symbol safe_free_mem caused by the previous fix.        # url: https://github.com/Ettercap/ettercap/issues/344 -      url "https://github.com/Ettercap/ettercap/commit/33ac95.patch" -      sha1 "17dbef4b16c1447f91e65a56d7398d176800beee" +      url "https://github.com/Ettercap/ettercap/commit/33ac95.diff" +      sha1 "cdaff33bec2a73e2c44230c28f3727b8f36e45e2"      end    end diff --git a/Library/Formula/geoipupdate.rb b/Library/Formula/geoipupdate.rb index a7258b813..57b8b9dbd 100644 --- a/Library/Formula/geoipupdate.rb +++ b/Library/Formula/geoipupdate.rb @@ -9,8 +9,8 @@ class Geoipupdate < Formula      # Fixes use of getline on pre-Lion; will be in next release      patch do -      url "https://github.com/maxmind/geoipupdate/commit/bdf11969f4c7c6b173466092287a2fdbd485b248.patch" -      sha1 "845aed21e187cd1fe1a60b029ff8ac13284c7cea" +      url "https://github.com/maxmind/geoipupdate/commit/bdf11969f4c7c6b173466092287a2fdbd485b248.diff" +      sha1 "80a8dd08ccbcd1c1d73c1bff6b5ce62adc254b96"      end    end diff --git a/Library/Formula/groovyserv.rb b/Library/Formula/groovyserv.rb index 7de399f34..adf72dee4 100644 --- a/Library/Formula/groovyserv.rb +++ b/Library/Formula/groovyserv.rb @@ -9,8 +9,8 @@ class Groovyserv < Formula    # This fix is upstream and can be removed in the next released version.    patch do -    url "https://github.com/kobo/groovyserv/commit/53b77ab2b4a7bcf6e232bc54f4e50e8b78d3006a.patch" -    sha1 "14ede107fe642e7a8c90ef789a235750821fbb77" +    url "https://github.com/kobo/groovyserv/commit/53b77ab2b4a7bcf6e232bc54f4e50e8b78d3006a.diff" +    sha1 "59bec0eb24c582670781af277cc64c6fe13b11db"    end    def install diff --git a/Library/Formula/iodine.rb b/Library/Formula/iodine.rb index 309474f28..6f92a2bc3 100644 --- a/Library/Formula/iodine.rb +++ b/Library/Formula/iodine.rb @@ -7,8 +7,8 @@ class Iodine < Formula    # 10.8 compatibility; see https://github.com/yarrick/iodine/pull/1    patch do -    url "https://github.com/zschoche/iodine/commit/e1e438497a83dbe6800212a0e5cb632907d1b3d9.patch" -    sha1 "207140143903db61c78ca1dcdc807ac2314b5aff" +    url "https://github.com/zschoche/iodine/commit/e1e438497a83dbe6800212a0e5cb632907d1b3d9.diff" +    sha1 "b3581c211b772a83dc051bac4b3513e0f286279b"    end    def install diff --git a/Library/Formula/libopkele.rb b/Library/Formula/libopkele.rb index 677dc7bb9..fc7062594 100644 --- a/Library/Formula/libopkele.rb +++ b/Library/Formula/libopkele.rb @@ -8,8 +8,8 @@ class Libopkele < Formula      sha1 "0c403d118efe6b4ee4830914448078c0ee967757"      patch do -      url "https://github.com/hacker/libopkele/commit/9ff6244998b0d41e71f7cc7351403ad590e990e4.patch" -      sha1 "f799213b0e65d42b96ff78eb3b5be4f0ec06afa5" +      url "https://github.com/hacker/libopkele/commit/9ff6244998b0d41e71f7cc7351403ad590e990e4.diff" +      sha1 "dd86d5a493a54f57ac3bc842878cba5c6608aa7e"      end    end diff --git a/Library/Formula/libplist.rb b/Library/Formula/libplist.rb index a0e663d08..611ac6c0e 100644 --- a/Library/Formula/libplist.rb +++ b/Library/Formula/libplist.rb @@ -23,8 +23,8 @@ class Libplist < Formula    # Upstream patch for compilation on 10.9    patch do -    url "https://github.com/libimobiledevice/libplist/commit/c56c8103f51c20c6fcf99e8bc9d83c380f503a1b.patch" -    sha1 "c81bac3eb80fa3fe789bd2453883757ea591c2fd" +    url "https://github.com/libimobiledevice/libplist/commit/c56c8103f51c20c6fcf99e8bc9d83c380f503a1b.diff" +    sha1 "fd9d0f4c15ee81ea589f826fd603281954f01df5"    end    def install diff --git a/Library/Formula/mtr.rb b/Library/Formula/mtr.rb index 78df96864..725286599 100644 --- a/Library/Formula/mtr.rb +++ b/Library/Formula/mtr.rb @@ -8,8 +8,8 @@ class Mtr < Formula      sha1 "6e79584265f733bea7f1b2cb13eeb48f10e96bba"      patch do -      url "https://github.com/traviscross/mtr/commit/edd425.patch" -      sha1 "43bacc9f68aba52f4d4fb5245e8a9b580368329d" +      url "https://github.com/traviscross/mtr/commit/edd425.diff" +      sha1 "c1ed669cdf65d607f75abc729a333b180ee42343"      end    end diff --git a/Library/Formula/opencolorio.rb b/Library/Formula/opencolorio.rb index 35ce51094..f287018f5 100644 --- a/Library/Formula/opencolorio.rb +++ b/Library/Formula/opencolorio.rb @@ -18,8 +18,8 @@ class Opencolorio < Formula    # Fix build with libc++    patch do -    url "https://github.com/imageworks/OpenColorIO/commit/ebd6efc036b6d0b17c869e3342f17f9c5ef8bbfc.patch" -    sha1 "89d2cb42e634faab5b83d16fdc48a048b2ddb6f5" +    url "https://github.com/imageworks/OpenColorIO/commit/ebd6efc036b6d0b17c869e3342f17f9c5ef8bbfc.diff" +    sha1 "f4acc4028090ea8d438c6e0093e931afd836314c"    end    def install diff --git a/Library/Formula/partio.rb b/Library/Formula/partio.rb index f6eb50b6f..527bfe384 100644 --- a/Library/Formula/partio.rb +++ b/Library/Formula/partio.rb @@ -11,18 +11,18 @@ class Partio < Formula    # These fixes are upstream and can be removed in the next released version.    patch do -    url "https://github.com/wdas/partio/commit/5b80b00ddedaef9ffed19ea4e6773ed1dc27394e.patch" -    sha1 "3b25c1eba327404ea49c3c6f0d3fe71eb114da7d" +    url "https://github.com/wdas/partio/commit/5b80b00ddedaef9ffed19ea4e6773ed1dc27394e.diff" +    sha1 "efec08e9b471b9502b1db4dbc4ef855409b24c1e"    end    patch do -    url "https://github.com/wdas/partio/commit/bdce60e316b699fb4fd813c6cad9d369205657c8.patch" -    sha1 "51e83e18323895fd5cf1e8725f67db082d8eaa33" +    url "https://github.com/wdas/partio/commit/bdce60e316b699fb4fd813c6cad9d369205657c8.diff" +    sha1 "030afc6a773d395f1d2168ed3871b9b931874da1"    end    patch do -    url "https://github.com/wdas/partio/commit/e557c212b0e8e0c4830e7991541686d568853afd.patch" -    sha1 "a7c7d6a2ab47db1961bdc522e62c99b54b547d02" +    url "https://github.com/wdas/partio/commit/e557c212b0e8e0c4830e7991541686d568853afd.diff" +    sha1 "7d319a880b8640d8f64afd74f3c2fe86eab1bb1f"    end    def install diff --git a/Library/Formula/povray.rb b/Library/Formula/povray.rb index 8ec25d0d3..7151da696 100644 --- a/Library/Formula/povray.rb +++ b/Library/Formula/povray.rb @@ -41,8 +41,8 @@ class Povray < Formula    # Fixes some compiler warnings; comes from the upstream repo, should be in next release.    patch do -    url "https://github.com/POV-Ray/povray/commit/b3846f5723745e6e7926883ec6bc404922a900e6.patch" -    sha1 "d974214af3c3c732247e0fcde182b6033aef584e" +    url "https://github.com/POV-Ray/povray/commit/b3846f5723745e6e7926883ec6bc404922a900e6.diff" +    sha1 "2266b17c984fe7cceee6c99f6bb9dd83bc179106"    end    # Replaces references to shared_ptr with boost::shared_ptr diff --git a/Library/Formula/rbenv-gem-rehash.rb b/Library/Formula/rbenv-gem-rehash.rb index d34b73ce6..249629624 100644 --- a/Library/Formula/rbenv-gem-rehash.rb +++ b/Library/Formula/rbenv-gem-rehash.rb @@ -9,8 +9,8 @@ class RbenvGemRehash < Formula    # Fixes issues with Homebrew-managed git-etc alpha.    patch do -    url "https://github.com/sstephenson/rbenv-gem-rehash/commit/0756890cfd9c7bbbdde38560fe81626a0c5769bd.patch" -    sha1 "8b3148da00ac9eb5802ef9fab5ec9d086f7c0946" +    url "https://github.com/sstephenson/rbenv-gem-rehash/commit/0756890cfd9c7bbbdde38560fe81626a0c5769bd.diff" +    sha1 "17877b728eda6eaddc199bcd5935fcea757a1c63"    end    def install diff --git a/Library/Formula/wiggle.rb b/Library/Formula/wiggle.rb index 2022bf603..47dcd122d 100644 --- a/Library/Formula/wiggle.rb +++ b/Library/Formula/wiggle.rb @@ -7,18 +7,18 @@ class Wiggle < Formula    # All three patches are upstream commits    patch do -    url "https://github.com/neilbrown/wiggle/commit/16bb4be1c93be24917669d63ab68dd7d77597b63.patch" -    sha1 "05c372272ed4817c92a17f2b46b5888189913259" +    url "https://github.com/neilbrown/wiggle/commit/16bb4be1c93be24917669d63ab68dd7d77597b63.diff" +    sha1 "9d3b4a0ebdb8e1fbd6f50c906255d72b78f957fd"    end    patch do -    url "https://github.com/neilbrown/wiggle/commit/e010f2ffa78b0e50eff5a9e664f9de27bb790035.patch" -    sha1 "d156b817582b36d9bc96a718b9e3eee5d82b8eb9" +    url "https://github.com/neilbrown/wiggle/commit/e010f2ffa78b0e50eff5a9e664f9de27bb790035.diff" +    sha1 "c0156c25768b8d9f5ffbfde47b066aecc579c0ec"    end    patch do -    url "https://github.com/neilbrown/wiggle/commit/351535d3489f4583a49891726616375e249ab1f3.patch" -    sha1 "32385bdf365440f115d8d830f7e4b5a4710d230f" +    url "https://github.com/neilbrown/wiggle/commit/351535d3489f4583a49891726616375e249ab1f3.diff" +    sha1 "cfb18a814285dc6705997846f51bdc1ace02015b"    end    def install diff --git a/Library/Formula/x264.rb b/Library/Formula/x264.rb index 8e1b92b5b..bedd31603 100644 --- a/Library/Formula/x264.rb +++ b/Library/Formula/x264.rb @@ -16,8 +16,8 @@ class X264 < Formula    # Support building with Clang 3.4    # The patch will be merged in the official repository soon.    patch do -    url "https://github.com/DarkShikari/x264-devel/commit/bc3b27.patch" -    sha1 "3a156908998c6c8588e4f50d125fa1cfe8a1eba7" +    url "https://github.com/DarkShikari/x264-devel/commit/bc3b27.diff" +    sha1 "85145f2123ef4a881749b8524583a56ead8494ef"    end    bottle do | 
