From f9a4a343078f54e542fc1469b99cf691ac5ffccf Mon Sep 17 00:00:00 2001 From: nibbles 2bits Date: Tue, 20 Nov 2012 16:12:06 -0800 Subject: [PATCH] muscle: recreate broken patch The muscle patch fails due to line ending issues. So recreate it. Fixes Homebrew/homebrew#16159 Closes Homebrew/homebrew#16171 Signed-off-by: Adam Vandenberg --- Formula/muscle.rb | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Formula/muscle.rb b/Formula/muscle.rb index cf304d589d..c66d8306e5 100644 --- a/Formula/muscle.rb +++ b/Formula/muscle.rb @@ -6,7 +6,7 @@ class Muscle < Formula version '3.8.31' sha1 '2fe55db73ff4e7ac6d4ca692f8f213d1c5071dac' - # This patch makes 3.8.31 build on Lion. + # This patch makes 3.8.31 build on OSX >= Lion. # It has been reported upstream but not fixed yet. def patches DATA @@ -21,18 +21,17 @@ class Muscle < Formula end __END__ -diff -Naur muscle3.8.31/src/globalsosx.cpp muscle3.8.31-patch/src/globalsosx.cpp ---- muscle3.8.31/src/globalsosx.cpp 2010-04-29 01:43:42.000000000 +0200 -+++ muscle3.8.31-patch/src/globalsosx.cpp 2012-05-07 21:17:57.000000000 +0200 +--- a/src/globalsosx.cpp 2010-04-28 16:43:42.000000000 -0700 ++++ b/src/globalsosx.cpp 2012-11-20 15:53:14.000000000 -0800 @@ -13,10 +13,10 @@ - #include - #include - #include + #include + #include + #include +#include - #include - #include - #include --#include - - const double DEFAULT_RAM = 1e9; - const double DEFAULT_MEM_USE = 1e6; + #include + #include + #include +-#include + + const double DEFAULT_RAM = 1e9; + const double DEFAULT_MEM_USE = 1e6;