Use __END__ patch rather than github gist

Also there was seemingly some bug where if you didn't read the pipe for the
patch commmand the exit status was non-zero.
master
Max Howell 2009-09-15 19:05:24 +01:00
parent a3a51a4d02
commit 93b192046f
7 changed files with 108 additions and 11 deletions

View File

@ -6,7 +6,7 @@ class Atomicparsley <Formula
@md5='681e6ecec2921c98e07a9262bdcd6cf2' @md5='681e6ecec2921c98e07a9262bdcd6cf2'
def patches def patches
{ :p0 => "http://pastie.org/609011.txt" } { :p0 => DATA }
end end
def install def install
@ -15,3 +15,28 @@ class Atomicparsley <Formula
bin.install "AtomicParsley" bin.install "AtomicParsley"
end end
end end
__END__
diff -Naur AtomicParsley-source-0.9.0/AP_NSImage.mm AtomicParsley-source-0.9.0/AP_NSImage.mm
--- AtomicParsley-source-0.9.0/AP_NSImage.mm 2006-09-02 05:25:32.000000000 -0600
+++ AtomicParsley-source-0.9.0/AP_NSImage.mm 2009-09-07 16:44:05.000000000 -0600
@@ -26,8 +26,8 @@
#include <sys/time.h>
#include <string.h>
-#include "AP_NSImage.h"
#include "AtomicParsley.h"
+#include "AP_NSImage.h"
bool isJPEG=false;
bool isPNG=false;
@@ -201,7 +201,7 @@
NSBitmapImageRep* bitmap = [ [NSBitmapImageRep alloc]
initWithFocusedViewRect: destinationRect ];
- _NSBitmapImageFileType filetype;
+ NSBitmapImageFileType filetype;
NSDictionary *props;
if ( (isPNG && !myPicPrefs.allJPEG) || myPicPrefs.allPNG) {

View File

@ -7,7 +7,7 @@ class Icu4c <Formula
@version = "4.3.1" @version = "4.3.1"
def patches def patches
["http://pastie.org/603488.txt"] DATA
end end
def install def install
@ -24,3 +24,21 @@ class Icu4c <Formula
"ICU doesn't like to build on Snow Leopard with all the heavy CFLAG optimizations, primarily -O3. You may need to change your brewkit environment flags to get it to build on Snow Leopard." "ICU doesn't like to build on Snow Leopard with all the heavy CFLAG optimizations, primarily -O3. You may need to change your brewkit environment flags to get it to build on Snow Leopard."
end end
end end
__END__
--- ./source/configure 2009-07-02 03:51:26.000000000 +0900
+++ ./source/configure 2009-08-16 16:15:49.000000000 +0900
@@ -7058,11 +7058,8 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- # Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+ *-arch*ppc*) ac_cv_c_bigendian=yes;;
esac
else
$as_echo "$as_me: failed program was:" >&5

View File

@ -117,4 +117,4 @@ diff -Naur lua-5.1.4/src/Makefile lua-5.1.4-2/src/Makefile
+ $(CC) $(CFLAGS) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + $(CC) $(CFLAGS) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
clean: clean:
$(RM) $(ALL_T) $(ALL_O) $(RM) $(ALL_T) $(ALL_O)

View File

@ -7,9 +7,7 @@ class Mawk <Formula
@version='1.3.3' @version='1.3.3'
def patches def patches
{ { :p1 => DATA }
:p1 => ["http://bitbucket.org/0xffea/patches/raw/6402e50a132f/homebrew/mawk-001-shell.diff"]
}
end end
def install def install
@ -17,3 +15,18 @@ class Mawk <Formula
system "make install" system "make install"
end end
end end
__END__
diff -r 3358498a60ea Makefile.in
--- a/Makefile.in Mon Sep 14 19:17:51 2009 +0200
+++ b/Makefile.in Mon Sep 14 19:18:19 2009 +0200
@@ -118,7 +118,7 @@
$(BINDIR) \
$(MANDIR) :
- sh -c "mkdirs.sh $@"
+ sh -c "./mkdirs.sh $@"
# output from mawk -f deps.awk *.c
array.o : config.h field.h bi_vars.h mawk.h symtype.h nstd.h memory.h array.h zmalloc.h types.h sizes.h

View File

@ -19,7 +19,7 @@ class Mysql <Formula
end end
def patches def patches
{:p1 => "http://gist.github.com/raw/179616/bcbc9f185bbd353934c9379a253d23269c65170e/Diff"} {:p1 => DATA}
end end
def install def install
@ -87,3 +87,17 @@ class Mysql <Formula
EOPLIST EOPLIST
end end
end end
__END__
--- old/scripts/mysqld_safe.sh 2009-09-02 04:10:39.000000000 -0400
+++ new/scripts/mysqld_safe.sh 2009-09-02 04:52:55.000000000 -0400
@@ -383,7 +383,7 @@
fi
USER_OPTION=""
-if test -w / -o "$USER" = "root"
+if test -w /sbin -o "$USER" = "root"
then
if test "$user" != "root" -o $SET_USER = 1
then

View File

@ -12,7 +12,7 @@ class Spidermonkey <Formula
end end
def patches def patches
["http://gist.github.com/raw/179415/eed70f1b4bae73fb92995eaf07870d40c0ceb03e/gistfile1.diff"] DATA
end end
def install def install
@ -25,3 +25,16 @@ class Spidermonkey <Formula
end end
end end
__END__
--- src/jsprf.c 2009-07-26 12:32:01.000000000 -0700
+++ src/jsprf.c 2009-07-26 12:33:12.000000000 -0700
@@ -58,6 +58,8 @@
*/
#ifdef HAVE_VA_COPY
#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar)
+#elif defined(va_copy)
+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
#elif defined(HAVE_VA_LIST_AS_ARRAY)
#define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
#else

View File

@ -6,9 +6,7 @@ class Xar <Formula
@md5='8eabb055d3387b8edc30ecfb08d2e80d' @md5='8eabb055d3387b8edc30ecfb08d2e80d'
def patches def patches
{ { :p1 => DATA }
:p1 => ["http://gist.github.com/raw/178912/fe729be5b2572fd8f09eb6b60c9203a35ef1e8c3/gistfile1.diff"]
}
end end
def install def install
@ -17,3 +15,19 @@ class Xar <Formula
system "make install" system "make install"
end end
end end
__END__
diff -Naur old/lib/archive.c new/lib/archive.c
--- old/lib/archive.c
+++ new/lib/archive.c
@@ -79,6 +79,10 @@
#define LONG_MIN INT32_MIN
#endif
+#if LIBXML_VERSION < 20618
+#define xmlDictCleanup() /* function doesn't exist in older API */
+#endif
+
static int32_t xar_unserialize(xar_t x);
void xar_serialize(xar_t x, const char *file);