From 6adc3d91dad18d25451f7ca289efdc5f1192b21f Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Tue, 14 Jan 2014 23:53:29 +0000 Subject: Fix up patches to apply cleanly for RISC OS. --- sdk/recipes/patches/libjpeg/pixelformat.p | 2 +- sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p | 2 +- sdk/recipes/patches/openssl/Configure.p | 4 ++-- .../patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p | 2 +- sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sdk/recipes/patches') diff --git a/sdk/recipes/patches/libjpeg/pixelformat.p b/sdk/recipes/patches/libjpeg/pixelformat.p index 5427d86..518eb9f 100644 --- a/sdk/recipes/patches/libjpeg/pixelformat.p +++ b/sdk/recipes/patches/libjpeg/pixelformat.p @@ -1,6 +1,6 @@ --- jmorecfg.h.orig 2012-08-10 17:23:41.521295445 +0100 +++ jmorecfg.h 2012-08-10 17:22:25.105291584 +0100 -@@ -322,7 +322,7 @@ +@@ -320,7 +320,7 @@ #define RGB_RED 0 /* Offset of Red in an RGB scanline element */ #define RGB_GREEN 1 /* Offset of Green */ #define RGB_BLUE 2 /* Offset of Blue */ diff --git a/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p b/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p index 8eb6824..f3253ae 100644 --- a/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p +++ b/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p @@ -1,6 +1,6 @@ --- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig 2012-12-11 13:03:16.440827000 +0000 +++ mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-12-11 13:03:42.923932000 +0000 -@@ -1651,7 +1651,7 @@ +@@ -1653,7 +1653,7 @@ #endif *(void**)(&dynamic_pthread_setname_np) = diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index c669e0d..12f2979 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,6 +1,6 @@ --- Configure.old 2010-12-29 02:43:14.000000000 +0000 +++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -412,6 +412,13 @@ +@@ -440,6 +440,13 @@ "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", @@ -14,7 +14,7 @@ #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. -@@ -1039,6 +1043,7 @@ +@@ -1123,6 +1130,7 @@ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p index f26f671..9b13f6b 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p @@ -30,4 +30,4 @@ +if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi endef - all: $(LIBRARY) + all: $(LIBRARY) diff --git a/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p b/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p index 252d436..24d7a7e 100644 --- a/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p +++ b/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p @@ -1,6 +1,6 @@ --- configure.orig 2012-05-02 05:17:08.000000000 +0100 +++ configure 2012-07-17 17:57:01.000000000 +0100 -@@ -381,18 +381,18 @@ +@@ -423,18 +423,18 @@ echo >> configure.log # check for large file support, and if none, check for fseeko() @@ -31,7 +31,7 @@ echo "Checking for off64_t... No." | tee -a configure.log echo >> configure.log cat > $test.c <