aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-16 12:03:53 -0700
committerSteffen Sledz <sledz@dresearch-fe.de>2011-04-29 14:08:39 +0200
commite9d796d3d91043e0a9386e0eba8a713bf5d0baf2 (patch)
tree07833dad79684ac17c0b784e15a95db4f2fbb9f7
parent2685ca76fd11c9bc2b1e96b1e4c40fc3b9763691 (diff)
downloadopenembedded-e9d796d3d91043e0a9386e0eba8a713bf5d0baf2.tar.gz
In a large number of patches, remove unneeded '..' in paths.
In most cases we had both ../foopkg/foopkg as the first path and this simply became foopkg (the second path was already correct for the default strip level which is why the patch applies normally). In a few cases the second path was '.' which is valid but not as clear as 'b' (which is what git shows for example) so update that while we're at it. Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch4
-rw-r--r--recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch4
-rw-r--r--recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch4
-rw-r--r--recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch4
-rw-r--r--recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch8
-rw-r--r--recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch4
-rw-r--r--recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch8
-rw-r--r--recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch4
-rw-r--r--recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch8
-rw-r--r--recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch2
-rw-r--r--recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch2
-rw-r--r--recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff8
-rw-r--r--recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff8
-rw-r--r--recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff8
-rw-r--r--recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff8
-rw-r--r--recipes/gpe-aerial/files/fix_makefile.patch4
-rw-r--r--recipes/gpe-appmgr/files/no-render-h.patch16
-rw-r--r--recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch4
-rw-r--r--recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch4
-rw-r--r--recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch4
-rw-r--r--recipes/gpe-go/gpe-go-0.05/fix-make.patch16
-rw-r--r--recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch12
-rw-r--r--recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch12
-rw-r--r--recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch8
-rw-r--r--recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch12
-rw-r--r--recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch12
-rw-r--r--recipes/gpe-todo/gpe-todo-0.51/remove-render.patch2
-rw-r--r--recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch4
-rw-r--r--recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch4
-rw-r--r--recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch4
-rw-r--r--recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch4
-rw-r--r--recipes/gtk+/gtk+-2.10.14/no-xwc.patch12
-rw-r--r--recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch4
-rw-r--r--recipes/gtk+/gtk+-2.6.10/no-xwc.patch12
-rw-r--r--recipes/gtk+/gtk+-2.6.10/single-click.patch8
-rw-r--r--recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch4
-rw-r--r--recipes/gweled/gweled-0.5/de-gnome.patch40
-rw-r--r--recipes/gxine/files/disable-browser-plugin.patch8
-rw-r--r--recipes/ipatience/files/fix-make.patch32
-rw-r--r--recipes/kf/files/fix-configure.patch4
-rw-r--r--recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch2
-rw-r--r--recipes/linux/linux-wrt-2.4.30/001-Makefile2
-rw-r--r--recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in2
-rw-r--r--recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile2
-rw-r--r--recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile2
-rw-r--r--recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in2
-rw-r--r--recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn2
-rw-r--r--recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch24
-rw-r--r--recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch18
-rw-r--r--recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch30
-rw-r--r--recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch4
-rw-r--r--recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch4
-rw-r--r--recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch4
-rw-r--r--recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch4
-rw-r--r--recipes/minipredict/minipredict/fix-include.patch2
-rw-r--r--recipes/minipredict/minipredict/fix-makefile.patch8
-rw-r--r--recipes/nvidia-drivers/files/nvidia-oe-conftest.patch4
-rw-r--r--recipes/rxvt-unicode/files/makefile.patch2
-rw-r--r--recipes/rxvt-unicode/files/signedchar.patch2
-rw-r--r--recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch4
-rw-r--r--recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch4
-rw-r--r--recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch4
-rw-r--r--recipes/twin/twin-0.4.6/cross_compile.patch20
-rw-r--r--recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch162
-rw-r--r--recipes/udf/udftools/patch-04-wrudf-gcc4.diff7
65 files changed, 325 insertions, 326 deletions
diff --git a/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch b/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch
index 7c8213da1f..6d8a918e2c 100644
--- a/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch
+++ b/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch
@@ -1,5 +1,5 @@
-diff -urNd ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c
---- ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100
+diff -urNd detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c
+--- detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100
+++ detect-stylus-0.13/detect-stylus.c 2004-09-13 21:36:03.000000000 +0100
@@ -132,9 +132,9 @@
diff --git a/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch b/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch
index 94542b11aa..06c0a1a5ee 100644
--- a/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch
+++ b/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch
@@ -1,5 +1,5 @@
-diff -urNd ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c
---- ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100
+diff -urNd detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c
+--- detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100
+++ detect-stylus-0.13/detect-stylus.c 2004-09-18 23:43:12.000000000 +0100
@@ -62,6 +62,9 @@
if (fd < 0)
diff --git a/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch b/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch
index 06b4d09614..adabc4afdf 100644
--- a/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch
+++ b/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch
@@ -1,5 +1,5 @@
-diff -urNd ../dillo2-0.6.6-r0/dillo2-0.6.6/src/IO/about.c dillo2-0.6.6/src/IO/about.c
---- ../dillo2-0.6.6-r0/dillo2-0.6.6/src/IO/about.c 2003-04-21 19:36:31.000000000 +0100
+diff -urNd dillo2-0.6.6/src/IO/about.c dillo2-0.6.6/src/IO/about.c
+--- dillo2-0.6.6/src/IO/about.c 2003-04-21 19:36:31.000000000 +0100
+++ dillo2-0.6.6/src/IO/about.c 2004-09-11 10:58:48.000000000 +0100
@@ -28,88 +28,88 @@
* HTML text for startup screen
diff --git a/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch b/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch
index e4929fa20e..07469e4725 100644
--- a/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch
+++ b/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch
@@ -1,4 +1,4 @@
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:15:49.000000000 +1000
@@ -42,8 +42,9 @@
@@ -54,7 +54,7 @@
RETLDM
#endif
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:21:43.000000000 +1000
@@ -302,8 +302,13 @@
diff --git a/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch b/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch
index 99e1e6c88c..c01fbd577a 100644
--- a/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch
+++ b/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch
@@ -1,5 +1,5 @@
-diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md
---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000
+diff -urN gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md
+--- gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:43:17.000000000 +1000
@@ -7488,6 +7488,22 @@
arm_compare_op1);"
@@ -99,8 +99,8 @@ diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/co
""
)
-diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md
---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000
+diff -urN gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md
+--- gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/predicates.md 2007-06-14 11:46:13.000000000 +1000
@@ -172,7 +172,11 @@
diff --git a/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch b/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch
index e4929fa20e..07469e4725 100644
--- a/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch
+++ b/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch
@@ -1,4 +1,4 @@
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:15:49.000000000 +1000
@@ -42,8 +42,9 @@
@@ -54,7 +54,7 @@
RETLDM
#endif
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:21:43.000000000 +1000
@@ -302,8 +302,13 @@
diff --git a/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch b/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch
index 99e1e6c88c..c01fbd577a 100644
--- a/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch
+++ b/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch
@@ -1,5 +1,5 @@
-diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md
---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000
+diff -urN gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md
+--- gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:43:17.000000000 +1000
@@ -7488,6 +7488,22 @@
arm_compare_op1);"
@@ -99,8 +99,8 @@ diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/co
""
)
-diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md
---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000
+diff -urN gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md
+--- gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/predicates.md 2007-06-14 11:46:13.000000000 +1000
@@ -172,7 +172,11 @@
diff --git a/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch b/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch
index e4929fa20e..07469e4725 100644
--- a/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch
+++ b/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch
@@ -1,4 +1,4 @@
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:15:49.000000000 +1000
@@ -42,8 +42,9 @@
@@ -54,7 +54,7 @@
RETLDM
#endif
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:21:43.000000000 +1000
@@ -302,8 +302,13 @@
diff --git a/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch b/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch
index 99e1e6c88c..c01fbd577a 100644
--- a/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch
+++ b/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch
@@ -1,5 +1,5 @@
-diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md
---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000
+diff -urN gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md
+--- gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:43:17.000000000 +1000
@@ -7488,6 +7488,22 @@
arm_compare_op1);"
@@ -99,8 +99,8 @@ diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/co
""
)
-diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md
---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000
+diff -urN gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md
+--- gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/predicates.md 2007-06-14 11:46:13.000000000 +1000
@@ -172,7 +172,11 @@
diff --git a/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch b/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch
index f16336d05d..7dee2f4176 100644
--- a/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch
+++ b/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch
@@ -1,6 +1,6 @@
Define Maverick floating point word order in libgcc's assemble support routines
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2008-04-07 13:15:49.000000000 +1000
@@ -42,8 +42,9 @@
diff --git a/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch b/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch
index f16336d05d..7dee2f4176 100644
--- a/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch
+++ b/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch
@@ -1,6 +1,6 @@
Define Maverick floating point word order in libgcc's assemble support routines
---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2008-04-07 13:15:49.000000000 +1000
@@ -42,8 +42,9 @@
diff --git a/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
index 1046efb2a1..b7e8948a62 100644
--- a/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
+++ b/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
@@ -1,5 +1,5 @@
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100
@@ -25,6 +25,9 @@
#include <sysdep.h>
@@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-
static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */
static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100
@@ -25,6 +25,8 @@
#include <sysdep.h>
diff --git a/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff
index 1046efb2a1..b7e8948a62 100644
--- a/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff
+++ b/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff
@@ -1,5 +1,5 @@
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100
@@ -25,6 +25,9 @@
#include <sysdep.h>
@@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-
static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */
static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100
@@ -25,6 +25,8 @@
#include <sysdep.h>
diff --git a/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff
index 1046efb2a1..b7e8948a62 100644
--- a/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff
+++ b/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff
@@ -1,5 +1,5 @@
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100
@@ -25,6 +25,9 @@
#include <sysdep.h>
@@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-
static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */
static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100
@@ -25,6 +25,8 @@
#include <sysdep.h>
diff --git a/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff
index 1046efb2a1..b7e8948a62 100644
--- a/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff
+++ b/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff
@@ -1,5 +1,5 @@
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100
@@ -25,6 +25,9 @@
#include <sysdep.h>
@@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-
static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */
static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
+--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100
@@ -25,6 +25,8 @@
#include <sysdep.h>
diff --git a/recipes/gpe-aerial/files/fix_makefile.patch b/recipes/gpe-aerial/files/fix_makefile.patch
index bbb08407e1..0224163257 100644
--- a/recipes/gpe-aerial/files/fix_makefile.patch
+++ b/recipes/gpe-aerial/files/fix_makefile.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-aerial-0.2.11-r0/gpe-aerial-0.2.11/Makefile gpe-aerial-0.2.11/Makefile
---- ../gpe-aerial-0.2.11-r0/gpe-aerial-0.2.11/Makefile 2004-08-03 15:36:47.000000000 +0100
+diff -urNd gpe-aerial-0.2.11/Makefile gpe-aerial-0.2.11/Makefile
+--- gpe-aerial-0.2.11/Makefile 2004-08-03 15:36:47.000000000 +0100
+++ gpe-aerial-0.2.11/Makefile 2004-08-03 15:49:42.000000000 +0100
@@ -3,7 +3,6 @@
CVSBUILD = no
diff --git a/recipes/gpe-appmgr/files/no-render-h.patch b/recipes/gpe-appmgr/files/no-render-h.patch
index 7bd08bb8c0..169d057437 100644
--- a/recipes/gpe-appmgr/files/no-render-h.patch
+++ b/recipes/gpe-appmgr/files/no-render-h.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c gpe-appmgr-2.8/main.c
---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c 2005-03-04 07:00:40 +00:00
+diff -urNd gpe-appmgr-2.8/main.c gpe-appmgr-2.8/main.c
+--- gpe-appmgr-2.8/main.c 2005-03-04 07:00:40 +00:00
+++ gpe-appmgr-2.8/main.c 2005-04-28 12:21:53 +01:00
@@ -50,7 +50,6 @@
/* GPE */
@@ -9,8 +9,8 @@ diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c gpe-appmgr-2.8/main.c
#include <gpe/spacing.h>
#include <gpe/gpeiconlistview.h>
#include <gpe/gpeiconlistitem.h>
-diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8/row_view.c
---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c 2005-01-05 21:14:47 +00:00
+diff -urNd gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8/row_view.c
+--- gpe-appmgr-2.8/row_view.c 2005-01-05 21:14:47 +00:00
+++ gpe-appmgr-2.8/row_view.c 2005-04-28 12:22:07 +01:00
@@ -43,7 +43,6 @@
/* GPE */
@@ -20,8 +20,8 @@ diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8/row_vie
#include <gpe/spacing.h>
#include <gpe/gpeiconlistview.h>
#include <gpe/launch.h>
-diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c gpe-appmgr-2.8/single_view.c
---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c 2004-11-19 00:22:09 +00:00
+diff -urNd gpe-appmgr-2.8/single_view.c gpe-appmgr-2.8/single_view.c
+--- gpe-appmgr-2.8/single_view.c 2004-11-19 00:22:09 +00:00
+++ gpe-appmgr-2.8/single_view.c 2005-04-28 12:22:15 +01:00
@@ -39,7 +39,6 @@
/* GPE */
@@ -31,8 +31,8 @@ diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c gpe-appmgr-2.8/sing
#include <gpe/spacing.h>
#include <gpe/gpeiconlistview.h>
#include <gpe/tray.h>
-diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/tab_view.c gpe-appmgr-2.8/tab_view.c
---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/tab_view.c 2005-03-04 07:14:43 +00:00
+diff -urNd gpe-appmgr-2.8/tab_view.c gpe-appmgr-2.8/tab_view.c
+--- gpe-appmgr-2.8/tab_view.c 2005-03-04 07:14:43 +00:00
+++ gpe-appmgr-2.8/tab_view.c 2005-04-28 12:22:22 +01:00
@@ -46,7 +46,6 @@
/* GPE */
diff --git a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch
index 8b4ebf7141..59a86365a6 100644
--- a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch
+++ b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile gpe-calculator-0.2/Makefile
---- ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile 2004-08-03 04:24:09.000000000 +0100
+diff -urNd gpe-calculator-0.2/Makefile gpe-calculator-0.2/Makefile
+--- gpe-calculator-0.2/Makefile 2004-08-03 04:24:09.000000000 +0100
+++ gpe-calculator-0.2/Makefile 2004-08-03 13:12:48.000000000 +0100
@@ -9,17 +9,17 @@
GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_ENABLE_BROKEN
diff --git a/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch b/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch
index 4583df8add..acb039967b 100644
--- a/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch
+++ b/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c
---- ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100
+diff -urNd gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c
+--- gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100
+++ gpe-clock-0.14/clock.c 2004-09-16 11:32:43.000000000 +0100
@@ -42,7 +42,7 @@
#define FORMAT_ANALOGUE 2
diff --git a/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch b/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch
index 4583df8add..acb039967b 100644
--- a/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch
+++ b/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c
---- ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100
+diff -urNd gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c
+--- gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100
+++ gpe-clock-0.14/clock.c 2004-09-16 11:32:43.000000000 +0100
@@ -42,7 +42,7 @@
#define FORMAT_ANALOGUE 2
diff --git a/recipes/gpe-go/gpe-go-0.05/fix-make.patch b/recipes/gpe-go/gpe-go-0.05/fix-make.patch
index 996c51e001..c3c558826d 100644
--- a/recipes/gpe-go/gpe-go-0.05/fix-make.patch
+++ b/recipes/gpe-go/gpe-go-0.05/fix-make.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg gpe-go-0.05/build/Makefile.dpkg_ipkg
---- ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg 2003-11-09 20:28:40.000000000 +0000
+diff -urNd gpe-go-0.05/build/Makefile.dpkg_ipkg gpe-go-0.05/build/Makefile.dpkg_ipkg
+--- gpe-go-0.05/build/Makefile.dpkg_ipkg 2003-11-09 20:28:40.000000000 +0000
+++ gpe-go-0.05/build/Makefile.dpkg_ipkg 2004-09-18 17:09:01.000000000 +0100
@@ -18,8 +18,10 @@
LIBGPEWIDGET_PC = libgpewidget
@@ -66,8 +66,8 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg gpe-go-0.05/bu
+
+.c.o:;
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
-diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation gpe-go-0.05/build/Makefile.translation
---- ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation 2003-11-09 20:28:40.000000000 +0000
+diff -urNd gpe-go-0.05/build/Makefile.translation gpe-go-0.05/build/Makefile.translation
+--- gpe-go-0.05/build/Makefile.translation 2003-11-09 20:28:40.000000000 +0000
+++ gpe-go-0.05/build/Makefile.translation 2004-09-18 17:09:01.000000000 +0100
@@ -5,7 +5,7 @@
# use ipkg-build or ipkg-deb-build
@@ -116,8 +116,8 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation gpe-go-0.05/
done
translation-ipkg:
-diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c gpe-go-0.05/gpe-go.c
---- ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c 2003-11-09 19:38:50.000000000 +0000
+diff -urNd gpe-go-0.05/gpe-go.c gpe-go-0.05/gpe-go.c
+--- gpe-go-0.05/gpe-go.c 2003-11-09 19:38:50.000000000 +0000
+++ gpe-go-0.05/gpe-go.c 2004-09-18 17:04:24.000000000 +0100
@@ -16,12 +16,12 @@
#include "sgf.h"
@@ -138,8 +138,8 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c gpe-go-0.05/gpe-go.c
//--i18n
#include <libintl.h>
-diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/Makefile gpe-go-0.05/Makefile
---- ../gpe-go-0.05-r0/gpe-go-0.05/Makefile 2003-11-09 20:28:40.000000000 +0000
+diff -urNd gpe-go-0.05/Makefile gpe-go-0.05/Makefile
+--- gpe-go-0.05/Makefile 2003-11-09 20:28:40.000000000 +0000
+++ gpe-go-0.05/Makefile 2004-09-18 17:11:06.000000000 +0100
@@ -1,19 +1,8 @@
VERSION = 0.05
diff --git a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch
index 4ec5b3a682..72e471366a 100644
--- a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch
+++ b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg
---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg
+--- gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+++ gpe-lights-0.12/build/Makefile.dpkg_ipkg 2004-09-18 20:09:37.000000000 +0100
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
@@ -116,8 +116,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-li
+
+.c.o:;
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
-diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation
---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation
+--- gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+++ gpe-lights-0.12/build/Makefile.translation 2004-09-18 20:09:37.000000000 +0100
@@ -0,0 +1,103 @@
+.SUFFIXES: .mo .po .pot .po8
@@ -223,8 +223,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe-
+
+translation-ipkg:
+ make PREFIX=/usr real-translation-package
-diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile
---- ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100
+diff -urNd gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile
+--- gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100
+++ gpe-lights-0.12/Makefile 2004-09-18 20:10:46.000000000 +0100
@@ -1,41 +1,37 @@
PACKAGE = gpe-lights
diff --git a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch
index 3c4581eded..5d99b91dab 100644
--- a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch
+++ b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg
---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg
+--- gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+++ gpe-lights-0.12/build/Makefile.dpkg_ipkg 2004-09-18 20:09:37.000000000 +0100
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
@@ -116,8 +116,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-li
+
+.c.o:;
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
-diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation
---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation
+--- gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+++ gpe-lights-0.12/build/Makefile.translation 2004-09-18 20:09:37.000000000 +0100
@@ -0,0 +1,103 @@
+.SUFFIXES: .mo .po .pot .po8
@@ -223,8 +223,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe-
+
+translation-ipkg:
+ make PREFIX=/usr real-translation-package
-diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile
---- ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100
+diff -urNd gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile
+--- gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100
+++ gpe-lights-0.12/Makefile 2004-09-18 20:10:46.000000000 +0100
@@ -1,41 +1,37 @@
PACKAGE = gpe-lights
diff --git a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch
index b6dc568151..5965f031d3 100644
--- a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch
+++ b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend/Makefile
---- ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile 2004-07-06 22:02:57.000000000 +0100
+diff -urNd gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend/Makefile
+--- gpe-nmf-0.17/backend/Makefile 2004-07-06 22:02:57.000000000 +0100
+++ gpe-nmf-0.17/backend/Makefile 2004-08-03 12:42:34.000000000 +0100
@@ -48,7 +48,7 @@
clean:
@@ -10,8 +10,8 @@ diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend
mkdir -p $(DESTDIR)$(PREFIX)/lib
install $(BACKEND) $(DESTDIR)$(PREFIX)/lib/$(BACKEND)
for i in $(CODECS); do install $$i $(DESTDIR)$(PREFIX)/lib/gpe-nmf/decoders/$$i; done
-diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile gpe-nmf-0.17/Makefile
---- ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile 2004-08-03 03:31:46.000000000 +0100
+diff -urNd gpe-nmf-0.17/Makefile gpe-nmf-0.17/Makefile
+--- gpe-nmf-0.17/Makefile 2004-08-03 03:31:46.000000000 +0100
+++ gpe-nmf-0.17/Makefile 2004-08-03 12:37:33.000000000 +0100
@@ -43,7 +43,7 @@
make -C backend PREFIX=$(PREFIX) GST=$(GST) GST_VERSION=$(GST_VERSION) CVSBUILD=$(CVSBUILD)
diff --git a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch
index def1915f2b..d17c826bb8 100644
--- a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch
+++ b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.dpkg_ipkg gpe-othello-0.2-1/build/Makefile.dpkg_ipkg
---- ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-othello-0.2-1/build/Makefile.dpkg_ipkg gpe-othello-0.2-1/build/Makefile.dpkg_ipkg
+--- gpe-othello-0.2-1/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+++ gpe-othello-0.2-1/build/Makefile.dpkg_ipkg 2004-09-18 20:23:29.000000000 +0100
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
@@ -116,8 +116,8 @@ diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.dpkg_ipkg gp
+
+.c.o:;
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
-diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.translation gpe-othello-0.2-1/build/Makefile.translation
---- ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-othello-0.2-1/build/Makefile.translation gpe-othello-0.2-1/build/Makefile.translation
+--- gpe-othello-0.2-1/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+++ gpe-othello-0.2-1/build/Makefile.translation 2004-09-18 20:23:29.000000000 +0100
@@ -0,0 +1,103 @@
+.SUFFIXES: .mo .po .pot .po8
@@ -223,8 +223,8 @@ diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.translation
+
+translation-ipkg:
+ make PREFIX=/usr real-translation-package
-diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/Makefile gpe-othello-0.2-1/Makefile
---- ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/Makefile 2004-09-18 00:16:02.000000000 +0100
+diff -urNd gpe-othello-0.2-1/Makefile gpe-othello-0.2-1/Makefile
+--- gpe-othello-0.2-1/Makefile 2004-09-18 00:16:02.000000000 +0100
+++ gpe-othello-0.2-1/Makefile 2004-09-18 20:25:16.000000000 +0100
@@ -3,41 +3,37 @@
DEBUG = no
diff --git a/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch b/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch
index b1297732ff..d3a108dc2a 100644
--- a/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch
+++ b/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg
---- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg
+--- gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100
+++ gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg 2004-09-18 21:04:03.000000000 +0100
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
@@ -116,8 +116,8 @@ diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg gpe-
+
+.c.o:;
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
-diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation gpe-tetris-0.6-2/build/Makefile.translation
---- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+diff -urNd gpe-tetris-0.6-2/build/Makefile.translation gpe-tetris-0.6-2/build/Makefile.translation
+--- gpe-tetris-0.6-2/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
+++ gpe-tetris-0.6-2/build/Makefile.translation 2004-09-18 21:04:03.000000000 +0100
@@ -0,0 +1,103 @@
+.SUFFIXES: .mo .po .pot .po8
@@ -223,8 +223,8 @@ diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation gp
+
+translation-ipkg:
+ make PREFIX=/usr real-translation-package
-diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/Makefile gpe-tetris-0.6-2/Makefile
---- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/Makefile 2004-09-17 23:48:05.000000000 +0100
+diff -urNd gpe-tetris-0.6-2/Makefile gpe-tetris-0.6-2/Makefile
+--- gpe-tetris-0.6-2/Makefile 2004-09-17 23:48:05.000000000 +0100
+++ gpe-tetris-0.6-2/Makefile 2004-09-18 21:09:31.000000000 +0100
@@ -9,30 +9,29 @@
CVSBUILD = no
diff --git a/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch b/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch
index 9369ce9f31..55325ad075 100644
--- a/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch
+++ b/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch
@@ -1,4 +1,4 @@
---- ../gpe-todo-0.51-r1/gpe-todo-0.51/list-ui.c 2005-01-01 03:40:30.000000000 +0100
+--- gpe-todo-0.51/list-ui.c 2005-01-01 03:40:30.000000000 +0100
+++ gpe-todo-0.51/list-ui.c 2005-04-20 21:13:40.191069800 +0200
@@ -17,7 +17,6 @@
diff --git a/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch b/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch
index ebea8d66e9..c5cf83ca1e 100644
--- a/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch
+++ b/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile gpe-watch-0.10/Makefile
---- ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile 2004-08-03 15:43:54.000000000 +0100
+diff -urNd gpe-watch-0.10/Makefile gpe-watch-0.10/Makefile
+--- gpe-watch-0.10/Makefile 2004-08-03 15:43:54.000000000 +0100
+++ gpe-watch-0.10/Makefile 2004-08-03 16:08:52.000000000 +0100
@@ -8,26 +8,26 @@
MEMBERS = gpe-watch
diff --git a/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch b/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch
index b2fc236e7a..1b0b36a380 100644
--- a/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch
+++ b/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/gpe-watch.c gpe-watch-0.10/gpe-watch.c
---- ../gpe-watch-0.10-r0/gpe-watch-0.10/gpe-watch.c 2004-06-30 12:12:20 +01:00
+diff -urNd gpe-watch-0.10/gpe-watch.c gpe-watch-0.10/gpe-watch.c
+--- gpe-watch-0.10/gpe-watch.c 2004-06-30 12:12:20 +01:00
+++ gpe-watch-0.10/gpe-watch.c 2005-04-28 12:41:33 +01:00
@@ -24,7 +24,6 @@
#ifdef USE_GPE
diff --git a/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch b/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch
index 8c6ba2aad6..534103e232 100644
--- a/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch
+++ b/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile
---- ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100
+diff -urNd gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile
+--- gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100
+++ gsoko-0.4.2-gpe5/Makefile 2004-09-20 20:14:46.000000000 +0100
@@ -1,16 +1,21 @@
diff --git a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch
index f734be4961..28b65e0970 100644
--- a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch
+++ b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile
---- ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100
+diff -urNd gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile
+--- gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100
+++ gsoko-0.4.2-gpe5/Makefile 2004-09-20 20:14:46.000000000 +0100
@@ -1,16 +1,21 @@
diff --git a/recipes/gtk+/gtk+-2.10.14/no-xwc.patch b/recipes/gtk+/gtk+-2.10.14/no-xwc.patch
index affb4a303e..8de54de9d8 100644
--- a/recipes/gtk+/gtk+-2.10.14/no-xwc.patch
+++ b/recipes/gtk+/gtk+-2.10.14/no-xwc.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
+diff -urNd gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
+--- gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00
@@ -576,12 +576,14 @@
GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
@@ -32,8 +32,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/
else
g_error("undefined font type\n");
}
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
+diff -urNd gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
+--- gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00
@@ -525,10 +525,12 @@
width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
@@ -96,8 +96,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/
}
}
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
+diff -urNd gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
+--- gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00
@@ -48,6 +48,7 @@
void
diff --git a/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch b/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch
index 20bf4cf366..d6efa1e612 100644
--- a/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch
+++ b/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
+diff -urNd gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
+--- gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100
@@ -68,6 +68,7 @@
#include "gtkprivate.h"
diff --git a/recipes/gtk+/gtk+-2.6.10/no-xwc.patch b/recipes/gtk+/gtk+-2.6.10/no-xwc.patch
index affb4a303e..8de54de9d8 100644
--- a/recipes/gtk+/gtk+-2.6.10/no-xwc.patch
+++ b/recipes/gtk+/gtk+-2.6.10/no-xwc.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
+diff -urNd gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
+--- gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00
@@ -576,12 +576,14 @@
GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
@@ -32,8 +32,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/
else
g_error("undefined font type\n");
}
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
+diff -urNd gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
+--- gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00
@@ -525,10 +525,12 @@
width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
@@ -96,8 +96,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/
}
}
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
+diff -urNd gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
+--- gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00
@@ -48,6 +48,7 @@
void
diff --git a/recipes/gtk+/gtk+-2.6.10/single-click.patch b/recipes/gtk+/gtk+-2.6.10/single-click.patch
index 3bb208d4d6..41e70c8487 100644
--- a/recipes/gtk+/gtk+-2.6.10/single-click.patch
+++ b/recipes/gtk+/gtk+-2.6.10/single-click.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00
+diff -urNd gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
+--- gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00
+++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00
@@ -1023,9 +1023,11 @@
}
@@ -15,8 +15,8 @@ diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkc
private_data->in_drag = 0;
if (day_month == MONTH_CURRENT)
g_signal_emit (calendar,
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00
+diff -urNd gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c
+--- gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00
+++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00
@@ -2468,6 +2468,33 @@
if (fs->last_selected != NULL)
diff --git a/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch b/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch
index 20bf4cf366..d6efa1e612 100644
--- a/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch
+++ b/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
+diff -urNd gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
+--- gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100
@@ -68,6 +68,7 @@
#include "gtkprivate.h"
diff --git a/recipes/gweled/gweled-0.5/de-gnome.patch b/recipes/gweled/gweled-0.5/de-gnome.patch
index 5117633031..a268e755c4 100644
--- a/recipes/gweled/gweled-0.5/de-gnome.patch
+++ b/recipes/gweled/gweled-0.5/de-gnome.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gweled-0.5-r0/gweled-0.5/configure.in gweled-0.5/configure.in
---- ../gweled-0.5-r0/gweled-0.5/configure.in 2004-01-22 20:14:23.000000000 +0000
+diff -urNd gweled-0.5/configure.in gweled-0.5/configure.in
+--- gweled-0.5/configure.in 2004-01-22 20:14:23.000000000 +0000
+++ gweled-0.5/configure.in 2004-09-28 12:32:39.000000000 +0100
@@ -10,7 +10,7 @@
AM_PROG_CC_STDC
@@ -10,8 +10,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/configure.in gweled-0.5/configure.in
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/board_engine.c gweled-0.5/src/board_engine.c
---- ../gweled-0.5-r0/gweled-0.5/src/board_engine.c 2004-01-25 08:23:54.000000000 +0000
+diff -urNd gweled-0.5/src/board_engine.c gweled-0.5/src/board_engine.c
+--- gweled-0.5/src/board_engine.c 2004-01-25 08:23:54.000000000 +0000
+++ gweled-0.5/src/board_engine.c 2004-09-28 15:56:32.000000000 +0100
@@ -1,4 +1,4 @@
-#include <gnome.h>
@@ -37,8 +37,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/board_engine.c gweled-0.5/src/board_e
g_do_not_score = FALSE;
gi_state = _IDLE;
}
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.c gweled-0.5/src/callbacks.c
---- ../gweled-0.5-r0/gweled-0.5/src/callbacks.c 2004-01-21 17:25:34.000000000 +0000
+diff -urNd gweled-0.5/src/callbacks.c gweled-0.5/src/callbacks.c
+--- gweled-0.5/src/callbacks.c 2004-01-21 17:25:34.000000000 +0000
+++ gweled-0.5/src/callbacks.c 2004-09-28 13:20:55.000000000 +0100
@@ -2,8 +2,7 @@
# include <config.h>
@@ -152,8 +152,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.c gweled-0.5/src/callbacks.
}
}
break;
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.h gweled-0.5/src/callbacks.h
---- ../gweled-0.5-r0/gweled-0.5/src/callbacks.h 2003-11-05 21:01:08.000000000 +0000
+diff -urNd gweled-0.5/src/callbacks.h gweled-0.5/src/callbacks.h
+--- gweled-0.5/src/callbacks.h 2003-11-05 21:01:08.000000000 +0000
+++ gweled-0.5/src/callbacks.h 2004-09-28 11:26:44.000000000 +0100
@@ -1,8 +1,8 @@
-#include <gnome.h>
@@ -175,8 +175,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.h gweled-0.5/src/callbacks.
GdkEventButton *event,
gpointer user_data);
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c gweled-0.5/src/graphic_engine.c
---- ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c 2004-01-22 22:09:05.000000000 +0000
+diff -urNd gweled-0.5/src/graphic_engine.c gweled-0.5/src/graphic_engine.c
+--- gweled-0.5/src/graphic_engine.c 2004-01-22 22:09:05.000000000 +0000
+++ gweled-0.5/src/graphic_engine.c 2004-09-28 15:56:00.000000000 +0100
@@ -1,9 +1,13 @@
-#include <gnome.h>
@@ -300,8 +300,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c gweled-0.5/src/graph
}
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/main.c gweled-0.5/src/main.c
---- ../gweled-0.5-r0/gweled-0.5/src/main.c 2004-01-22 20:16:10.000000000 +0000
+diff -urNd gweled-0.5/src/main.c gweled-0.5/src/main.c
+--- gweled-0.5/src/main.c 2004-01-22 20:16:10.000000000 +0000
+++ gweled-0.5/src/main.c 2004-10-13 10:17:43.000000000 +0100
@@ -25,19 +25,22 @@
# include <config.h>
@@ -541,8 +541,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/main.c gweled-0.5/src/main.c
return 0;
}
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/Makefile.am gweled-0.5/src/Makefile.am
---- ../gweled-0.5-r0/gweled-0.5/src/Makefile.am 2003-12-11 21:34:19.000000000 +0000
+diff -urNd gweled-0.5/src/Makefile.am gweled-0.5/src/Makefile.am
+--- gweled-0.5/src/Makefile.am 2003-12-11 21:34:19.000000000 +0000
+++ gweled-0.5/src/Makefile.am 2004-09-28 12:30:51.000000000 +0100
@@ -3,6 +3,7 @@
INCLUDES = \
@@ -552,8 +552,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/Makefile.am gweled-0.5/src/Makefile.a
@PACKAGE_CFLAGS@
bin_PROGRAMS = gweled
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_core.c gweled-0.5/src/sge_core.c
---- ../gweled-0.5-r0/gweled-0.5/src/sge_core.c 2004-01-22 22:10:40.000000000 +0000
+diff -urNd gweled-0.5/src/sge_core.c gweled-0.5/src/sge_core.c
+--- gweled-0.5/src/sge_core.c 2004-01-22 22:10:40.000000000 +0000
+++ gweled-0.5/src/sge_core.c 2004-10-13 10:20:45.000000000 +0100
@@ -18,11 +18,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -587,8 +587,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_core.c gweled-0.5/src/sge_core.c
g_rand_free (g_rand_generator);
for (i = 0; i < gi_nb_pixbufs; i++)
gdk_pixbuf_unref (g_pixbufs[i]);
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c gweled-0.5/src/sge_utils.c
---- ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c 2003-12-07 19:28:57.000000000 +0000
+diff -urNd gweled-0.5/src/sge_utils.c gweled-0.5/src/sge_utils.c
+--- gweled-0.5/src/sge_utils.c 2003-12-07 19:28:57.000000000 +0000
+++ gweled-0.5/src/sge_utils.c 2004-09-28 11:20:54.000000000 +0100
@@ -1,47 +1,30 @@
-#include <gnome.h>
@@ -648,8 +648,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c gweled-0.5/src/sge_utils.
return pixbuf;
}
-diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.h gweled-0.5/src/sge_utils.h
---- ../gweled-0.5-r0/gweled-0.5/src/sge_utils.h 2003-11-05 20:31:27.000000000 +0000
+diff -urNd gweled-0.5/src/sge_utils.h gweled-0.5/src/sge_utils.h
+--- gweled-0.5/src/sge_utils.h 2003-11-05 20:31:27.000000000 +0000
+++ gweled-0.5/src/sge_utils.h 2004-09-28 11:14:27.000000000 +0100
@@ -1,3 +1,3 @@
diff --git a/recipes/gxine/files/disable-browser-plugin.patch b/recipes/gxine/files/disable-browser-plugin.patch
index 3be381fabf..41015096a7 100644
--- a/recipes/gxine/files/disable-browser-plugin.patch
+++ b/recipes/gxine/files/disable-browser-plugin.patch
@@ -1,5 +1,5 @@
-diff -urNd ../gxine-0.4.1-r0.old/gxine-0.4.1/Makefile.am gxine-0.4.1/Makefile.am
---- ../gxine-0.4.1-r0.old/gxine-0.4.1/Makefile.am 2004-12-14 21:48:24 +00:00
+diff -urNd gxine-0.4.1/Makefile.am gxine-0.4.1/Makefile.am
+--- gxine-0.4.1/Makefile.am 2004-12-14 21:48:24 +00:00
+++ gxine-0.4.1/Makefile.am 2005-04-08 03:40:48 +01:00
@@ -1,4 +1,4 @@
-SUBDIRS = m4 pixmaps include src doc browser-plugin misc po
@@ -7,8 +7,8 @@ diff -urNd ../gxine-0.4.1-r0.old/gxine-0.4.1/Makefile.am gxine-0.4.1/Makefile.am
#DEB_FILES = debian/rules debian/changelog debian/control debian/copyright debian/README.Debian debian/menu
EXTRA_DIST = config.rpath gxine.desktop autogen.sh @DEPCOMP@
-diff -urNd ../gxine-0.4.1-r0.old/gxine-0.4.1/configure.ac gxine-0.4.1/configure.ac
---- ../gxine-0.4.1-r0.old/gxine-0.4.1/configure.ac 2005-04-08 04:00:05 +01:00
+diff -urNd gxine-0.4.1/configure.ac gxine-0.4.1/configure.ac
+--- gxine-0.4.1/configure.ac 2005-04-08 04:00:05 +01:00
+++ gxine-0.4.1/configure.ac 2005-04-08 03:47:22 +01:00
@@ -42,12 +42,6 @@
AC_PATH_XTRA
diff --git a/recipes/ipatience/files/fix-make.patch b/recipes/ipatience/files/fix-make.patch
index 3e3ad80eef..42b028b003 100644
--- a/recipes/ipatience/files/fix-make.patch
+++ b/recipes/ipatience/files/fix-make.patch
@@ -1,5 +1,5 @@
-diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg ipatience/build/Makefile.dpkg_ipkg
---- ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg 1970-01-01 00:00:00.000000000 +0000
+diff -urNd ipatience/build/Makefile.dpkg_ipkg ipatience/build/Makefile.dpkg_ipkg
+--- ipatience/build/Makefile.dpkg_ipkg 1970-01-01 00:00:00.000000000 +0000
+++ ipatience/build/Makefile.dpkg_ipkg 2006-11-08 16:41:55.000000000 +0000
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
@@ -116,8 +116,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg ipatience/buil
+
+.c.o:;
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
-diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.translation ipatience/build/Makefile.translation
---- ../ipatience-0.1-r2/ipatience/build/Makefile.translation 1970-01-01 00:00:00.000000000 +0000
+diff -urNd ipatience/build/Makefile.translation ipatience/build/Makefile.translation
+--- ipatience/build/Makefile.translation 1970-01-01 00:00:00.000000000 +0000
+++ ipatience/build/Makefile.translation 2006-11-08 16:41:55.000000000 +0000
@@ -0,0 +1,107 @@
+.SUFFIXES: .mo .po .pot .po8
@@ -227,8 +227,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.translation ipatience/bu
+
+translation-ipkg:
+ make PREFIX=/usr real-translation-package
-diff -urNd ../ipatience-0.1-r2/ipatience/Imakefile ipatience/Imakefile
---- ../ipatience-0.1-r2/ipatience/Imakefile 2001-01-31 05:25:03.000000000 +0000
+diff -urNd ipatience/Imakefile ipatience/Imakefile
+--- ipatience/Imakefile 2001-01-31 05:25:03.000000000 +0000
+++ ipatience/Imakefile 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-LOCAL_LIBRARIES=-lfltk $(XFTLIB) $(XLIB) -lm
@@ -242,8 +242,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/Imakefile ipatience/Imakefile
- tabby.o towers.o vegas.o wish.o yukon.o
-
-ComplexProgramTarget(ipatience)
-diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.desktop ipatience/ipatience.desktop
---- ../ipatience-0.1-r2/ipatience/ipatience.desktop 1970-01-01 00:00:00.000000000 +0000
+diff -urNd ipatience/ipatience.desktop ipatience/ipatience.desktop
+--- ipatience/ipatience.desktop 1970-01-01 00:00:00.000000000 +0000
+++ ipatience/ipatience.desktop 2006-11-11 15:59:25.000000000 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
@@ -255,8 +255,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.desktop ipatience/ipatience.d
+Icon=ipatience.xpm
+Categories=Games
+StartupNotify=True
-diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.xpm ipatience/ipatience.xpm
---- ../ipatience-0.1-r2/ipatience/ipatience.xpm 1970-01-01 00:00:00.000000000 +0000
+diff -urNd ipatience/ipatience.xpm ipatience/ipatience.xpm
+--- ipatience/ipatience.xpm 1970-01-01 00:00:00.000000000 +0000
+++ ipatience/ipatience.xpm 2006-11-11 15:58:52.000000000 +0000
@@ -0,0 +1,194 @@
+/* XPM */
@@ -453,8 +453,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.xpm ipatience/ipatience.xpm
+" . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . ",
+" "};
-diff -urNd ../ipatience-0.1-r2/ipatience/main.cc ipatience/main.cc
---- ../ipatience-0.1-r2/ipatience/main.cc 2001-02-09 08:15:27.000000000 +0000
+diff -urNd ipatience/main.cc ipatience/main.cc
+--- ipatience/main.cc 2001-02-09 08:15:27.000000000 +0000
+++ ipatience/main.cc 2006-11-02 16:37:55.000000000 +0000
@@ -549,7 +549,7 @@
@@ -465,8 +465,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/main.cc ipatience/main.cc
Fl::args(argc,argv,i,arg_cb);
fl_open_display ();
if (small == -1)
-diff -urNd ../ipatience-0.1-r2/ipatience/Makefile ipatience/Makefile
---- ../ipatience-0.1-r2/ipatience/Makefile 1970-01-01 00:00:00.000000000 +0000
+diff -urNd ipatience/Makefile ipatience/Makefile
+--- ipatience/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ ipatience/Makefile 2006-11-10 18:03:49.000000000 +0000
@@ -0,0 +1,39 @@
+PREFIX = /usr
@@ -508,8 +508,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/Makefile ipatience/Makefile
+
+include $(BUILD)/Makefile.dpkg_ipkg
+-include $(DEPS)
-diff -urNd ../ipatience-0.1-r2/ipatience/table.cc ipatience/table.cc
---- ../ipatience-0.1-r2/ipatience/table.cc 2001-06-22 00:32:12.000000000 +0000
+diff -urNd ipatience/table.cc ipatience/table.cc
+--- ipatience/table.cc 2001-06-22 00:32:12.000000000 +0000
+++ ipatience/table.cc 2006-11-10 17:06:56.000000000 +0000
@@ -231,9 +231,9 @@
suit_bitmap = suit[Suit(card) >> 4];
diff --git a/recipes/kf/files/fix-configure.patch b/recipes/kf/files/fix-configure.patch
index fc1ad9a418..dbd02925a5 100644
--- a/recipes/kf/files/fix-configure.patch
+++ b/recipes/kf/files/fix-configure.patch
@@ -1,5 +1,5 @@
-diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in
---- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100
+diff -urNd kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in
+--- kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100
+++ kf-0.5.4.1/configure.in 2005-09-29 14:12:32.000000000 +0100
@@ -27,7 +27,7 @@
dnl AC_ARG_ENABLE(debug,)
diff --git a/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch b/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch
index 4c22fb7960..c95b353e05 100644
--- a/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch
+++ b/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch
@@ -1,4 +1,4 @@
---- ../ref/linux-2.6.21.6/arch/arm/mach-pxa/poodle.c 2007-07-06 23:47:55.000000000 -0500
+--- linux-2.6.21.6/arch/arm/mach-pxa/poodle.c 2007-07-06 23:47:55.000000000 -0500
+++ linux-2.6.21.6-armeb/arch/arm/mach-pxa/poodle.c 2007-08-06 23:02:50.000000000 -0500
@@ -409,6 +409,7 @@
diff --git a/recipes/linux/linux-wrt-2.4.30/001-Makefile b/recipes/linux/linux-wrt-2.4.30/001-Makefile
index d01051f844..b117e7f8eb 100644
--- a/recipes/linux/linux-wrt-2.4.30/001-Makefile
+++ b/recipes/linux/linux-wrt-2.4.30/001-Makefile
@@ -1,4 +1,4 @@
---- ../../../kernel/linux-mips-cvs/Makefile 2005-01-20 03:19:21.000000000 +0100
+--- linux-mips-cvs/Makefile 2005-01-20 03:19:21.000000000 +0100
+++ linux-2.4.29.new/Makefile 2005-03-15 01:15:27.441095231 +0100
@@ -17,9 +17,9 @@
FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
diff --git a/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in b/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in
index 16c6766eec..87c8d3abe8 100644
--- a/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in
+++ b/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in
@@ -1,4 +1,4 @@
---- ../../../kernel/linux-mips-cvs/arch/mips/config-shared.in 2005-01-31 12:59:28.000000000 +0100
+--- linux-mips-cvs/arch/mips/config-shared.in 2005-01-31 12:59:28.000000000 +0100
+++ linux-2.4.29/arch/mips/config-shared.in 2005-03-12 19:51:22.474214917 +0100
@@ -208,6 +208,14 @@
fi
diff --git a/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile b/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile
index 8340c9565b..f2fba96bae 100644
--- a/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile
+++ b/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile
@@ -1,4 +1,4 @@
---- ../../../kernel/linux-mips-cvs/drivers/net/Makefile 2004-08-14 20:38:51.000000000 +0200
+--- linux-mips-cvs/drivers/net/Makefile 2004-08-14 20:38:51.000000000 +0200
+++ linux/drivers/net/Makefile 2005-03-16 12:45:24.523263597 +0100
@@ -21,6 +21,16 @@
list-multi := rcpci.o
diff --git a/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile b/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile
index 996e30a9b1..d45b88951a 100644
--- a/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile
+++ b/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile
@@ -1,4 +1,4 @@
---- ../../../kernel/linux-mips-cvs/drivers/parport/Makefile 2004-08-14 20:38:53.000000000 +0200
+--- linux-mips-cvs/drivers/parport/Makefile 2004-08-14 20:38:53.000000000 +0200
+++ linux-2.4.29/drivers/parport/Makefile 2005-03-21 13:57:53.338746517 +0100
@@ -22,6 +22,7 @@
diff --git a/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in b/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in
index 1b43798558..a8602a242e 100644
--- a/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in
+++ b/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in
@@ -1,4 +1,4 @@
---- ../../../kernel/linux-mips-cvs/drivers/parport/Config.in 2004-02-20 02:22:18.000000000 +0100
+--- linux-mips-cvs/drivers/parport/Config.in 2004-02-20 02:22:18.000000000 +0100
+++ linux-2.4.29/drivers/parport/Config.in 2005-03-21 13:59:33.958193664 +0100
@@ -11,6 +11,7 @@
tristate 'Parallel port support' CONFIG_PARPORT
diff --git a/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn b/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn
index 87be89d72f..4438974218 100644
--- a/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn
+++ b/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn
@@ -1,4 +1,4 @@
---- ../../buildroot-unpacked/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-28 22:59:36.000000000 -0500
+--- linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-28 22:59:36.000000000 -0500
+++ linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-30 05:05:32.000000000 -0500
@@ -1386,7 +1386,7 @@
nf_unregister_sockopt(&so_getorigdst);
diff --git a/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch b/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch
index 7b5f408c37..76eaf3fcba 100644
--- a/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch
+++ b/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch
@@ -1,6 +1,6 @@
-diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/arm/boot/compressed/head-at91rm9200.S
---- ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200
-+++ ./arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200
+diff -Nurp linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S
+--- linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200
++++ b/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200
@@ -73,6 +73,12 @@
cmp r7, r3
beq 99f
@@ -14,9 +14,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/a
@ Unknown board, use the AT91RM9200DK board
@ mov r7, #MACH_TYPE_AT91RM9200
mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff)
-diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at91/board-sarge.c
---- ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200
+diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c b/arch/arm/mach-at91/board-sarge.c
+--- linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100
++++ b/arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200
@@ -0,0 +1,190 @@
+/*
+ * linux/arch/arm/mach-at91/board-sarge.c
@@ -208,9 +208,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at
+ .init_irq = sarge_init_irq,
+ .init_machine = sarge_board_init,
+MACHINE_END
-diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig ./arch/arm/mach-at91/Kconfig
---- ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig 2007-06-12 22:29:12.000000000 +0200
-+++ ./arch/arm/mach-at91/Kconfig 2007-06-12 03:00:28.000000000 +0200
+diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
+--- linux-2.6.21.4/arch/arm/mach-at91/Kconfig 2007-06-12 22:29:12.000000000 +0200
++++ b/arch/arm/mach-at91/Kconfig 2007-06-12 03:00:28.000000000 +0200
@@ -90,6 +90,13 @@ config MACH_KAFA
help
Select this if you are using Sperry-Sun's KAFA board.
@@ -225,9 +225,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig ./arch/arm/mach-at91/Kco
config MACH_CHUB
bool "Promwad Chub board"
depends on ARCH_AT91RM9200
-diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Makefile ./arch/arm/mach-at91/Makefile
---- ../linux-2.6.21.4/arch/arm/mach-at91/Makefile 2007-06-12 22:29:12.000000000 +0200
-+++ ./arch/arm/mach-at91/Makefile 2007-06-12 03:00:47.000000000 +0200
+diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
+--- linux-2.6.21.4/arch/arm/mach-at91/Makefile 2007-06-12 22:29:12.000000000 +0200
++++ b/arch/arm/mach-at91/Makefile 2007-06-12 03:00:47.000000000 +0200
@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200) += board-kb920
obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o
obj-$(CONFIG_MACH_KAFA) += board-kafa.o
diff --git a/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch b/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch
index 01bbaeb73e..08c3e735ff 100644
--- a/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch
+++ b/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch
@@ -1,6 +1,6 @@
-diff -Nurp ../linux-2.6.21.4/drivers/mmc/at91_mci.c ./drivers/mmc/at91_mci.c
---- ../linux-2.6.21.4/drivers/mmc/at91_mci.c 2007-06-12 22:29:12.000000000 +0200
-+++ ./drivers/mmc/at91_mci.c 2007-06-12 03:52:55.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
+--- linux-2.6.21.4/drivers/mmc/at91_mci.c 2007-06-12 22:29:12.000000000 +0200
++++ b/drivers/mmc/at91_mci.c 2007-06-12 03:52:55.000000000 +0200
@@ -421,8 +421,11 @@ static unsigned int at91_mci_send_comman
if (cmd->opcode == MMC_STOP_TRANSMISSION)
cmdr |= AT91_MCI_TRCMD_STOP;
@@ -29,9 +29,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/mmc/at91_mci.c ./drivers/mmc/at91_mci.c
return IRQ_HANDLED;
}
-diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc_block.c ./drivers/mmc/mmc_block.c
---- ../linux-2.6.21.4/drivers/mmc/mmc_block.c 2007-06-07 23:27:31.000000000 +0200
-+++ ./drivers/mmc/mmc_block.c 2007-06-12 04:19:36.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
+--- linux-2.6.21.4/drivers/mmc/mmc_block.c 2007-06-07 23:27:31.000000000 +0200
++++ b/drivers/mmc/mmc_block.c 2007-06-12 04:19:36.000000000 +0200
@@ -256,10 +256,24 @@ static int mmc_blk_issue_rq(struct mmc_q
* this rule as they support querying the number of
* successfully written sectors.
@@ -58,9 +58,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc_block.c ./drivers/mmc/mmc_block.c
if (brq.data.blocks > 1) {
brq.data.flags |= MMC_DATA_MULTI;
-diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc.c ./drivers/mmc/mmc.c
---- ../linux-2.6.21.4/drivers/mmc/mmc.c 2007-06-07 23:27:31.000000000 +0200
-+++ ./drivers/mmc/mmc.c 2007-06-12 04:10:05.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
+--- linux-2.6.21.4/drivers/mmc/mmc.c 2007-06-07 23:27:31.000000000 +0200
++++ b/drivers/mmc/mmc.c 2007-06-12 04:10:05.000000000 +0200
@@ -1500,12 +1500,22 @@ static void mmc_setup(struct mmc_host *h
mmc_set_ios(host);
diff --git a/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch b/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch
index 25ce15eb94..5cdc73b4dd 100644
--- a/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch
+++ b/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch
@@ -1,6 +1,6 @@
-diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.c ./drivers/net/arm/at91_ether.c
---- ../linux-2.6.21.4/drivers/net/arm/at91_ether.c 2007-06-12 22:29:12.000000000 +0200
-+++ ./drivers/net/arm/at91_ether.c 2007-06-12 03:11:16.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
+--- linux-2.6.21.4/drivers/net/arm/at91_ether.c 2007-06-12 22:29:12.000000000 +0200
++++ b/drivers/net/arm/at91_ether.c 2007-06-12 03:11:16.000000000 +0200
@@ -235,6 +235,11 @@ static irqreturn_t at91ether_phy_interru
if (!(phy & (1 << 7)))
goto done;
@@ -54,9 +54,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.c ./drivers/net/arm/at91
detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
break;
}
-diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.h ./drivers/net/arm/at91_ether.h
---- ../linux-2.6.21.4/drivers/net/arm/at91_ether.h 2007-06-12 22:29:12.000000000 +0200
-+++ ./drivers/net/arm/at91_ether.h 2007-06-12 03:07:54.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h
+--- linux-2.6.21.4/drivers/net/arm/at91_ether.h 2007-06-12 22:29:12.000000000 +0200
++++ b/drivers/net/arm/at91_ether.h 2007-06-12 03:07:54.000000000 +0200
@@ -29,6 +29,15 @@
#define MII_ISINTS_REG 19
#define MII_LEDCTRL_REG 20
@@ -73,9 +73,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.h ./drivers/net/arm/at91
/* Realtek RTL8201 PHY */
#define MII_RTL8201_ID 0x00008200
-diff -Nurp ../linux-2.6.21.4/drivers/net/phy/Kconfig ./drivers/net/phy/Kconfig
---- ../linux-2.6.21.4/drivers/net/phy/Kconfig 2007-06-07 23:27:31.000000000 +0200
-+++ ./drivers/net/phy/Kconfig 2007-06-12 03:12:16.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
+--- linux-2.6.21.4/drivers/net/phy/Kconfig 2007-06-07 23:27:31.000000000 +0200
++++ b/drivers/net/phy/Kconfig 2007-06-12 03:12:16.000000000 +0200
@@ -62,6 +62,12 @@ config BROADCOM_PHY
---help---
Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
@@ -89,17 +89,17 @@ diff -Nurp ../linux-2.6.21.4/drivers/net/phy/Kconfig ./drivers/net/phy/Kconfig
config FIXED_PHY
tristate "Drivers for PHY emulation on fixed speed/link"
depends on PHYLIB
-diff -Nurp ../linux-2.6.21.4/drivers/net/phy/Makefile ./drivers/net/phy/Makefile
---- ../linux-2.6.21.4/drivers/net/phy/Makefile 2007-06-07 23:27:31.000000000 +0200
-+++ ./drivers/net/phy/Makefile 2007-06-12 03:12:29.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
+--- linux-2.6.21.4/drivers/net/phy/Makefile 2007-06-07 23:27:31.000000000 +0200
++++ b/drivers/net/phy/Makefile 2007-06-12 03:12:29.000000000 +0200
@@ -12,3 +12,4 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
+obj-$(CONFIG_STE100P_PHY) += ste100p.o
-diff -Nurp ../linux-2.6.21.4/drivers/net/phy/ste100p.c ./drivers/net/phy/ste100p.c
---- ../linux-2.6.21.4/drivers/net/phy/ste100p.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./drivers/net/phy/ste100p.c 2007-06-12 02:52:31.000000000 +0200
+diff -Nurp linux-2.6.21.4/drivers/net/phy/ste100p.c b/drivers/net/phy/ste100p.c
+--- linux-2.6.21.4/drivers/net/phy/ste100p.c 1970-01-01 01:00:00.000000000 +0100
++++ b/drivers/net/phy/ste100p.c 2007-06-12 02:52:31.000000000 +0200
@@ -0,0 +1,297 @@
+/*
+ * drivers/net/phy/ste100p.c
diff --git a/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch b/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch
index 01c1a0e277..ba98e3afbe 100644
--- a/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch
+++ b/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch
@@ -1,5 +1,5 @@
-diff -urNd ../matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in matchbox-desktop-0.8.1/data/mbdesktop_modules.in
---- ../matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in 2004-07-22 12:51:25.000000000 +0100
+diff -urNd matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in matchbox-desktop-0.8.1/data/mbdesktop_modules.in
+--- matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in 2004-07-22 12:51:25.000000000 +0100
+++ matchbox-desktop-0.8.1/data/mbdesktop_modules.in 2004-09-18 15:54:52.000000000 +0100
@@ -6,4 +6,4 @@
diff --git a/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch b/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
index 45bff32b9a..b60e263445 100644
--- a/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
+++ b/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
@@ -1,5 +1,5 @@
-diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c
---- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000
+diff -urNd matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c
+--- matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000
+++ matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-09-16 12:17:58.000000000 +0100
@@ -385,8 +385,7 @@
sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
diff --git a/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch b/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
index 45bff32b9a..b60e263445 100644
--- a/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
+++ b/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
@@ -1,5 +1,5 @@
-diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c
---- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000
+diff -urNd matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c
+--- matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000
+++ matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-09-16 12:17:58.000000000 +0100
@@ -385,8 +385,7 @@
sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
diff --git a/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch b/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
index 0f2dabd8a3..561b221441 100644
--- a/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
+++ b/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
@@ -1,5 +1,5 @@
-diff -urNd ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile mbmerlin/Makefile
---- ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile 2004-07-29 21:17:13.000000000 +0100
+diff -urNd mbmerlin/Makefile mbmerlin/Makefile
+--- mbmerlin/Makefile 2004-07-29 21:17:13.000000000 +0100
+++ mbmerlin/Makefile 2004-08-01 11:32:09.000000000 +0100
@@ -106,6 +106,7 @@
install mbmerlin.desktop $(DESTDIR)/usr/share/applications/inputmethods
diff --git a/recipes/minipredict/minipredict/fix-include.patch b/recipes/minipredict/minipredict/fix-include.patch
index ac544704d4..97a4f046f7 100644
--- a/recipes/minipredict/minipredict/fix-include.patch
+++ b/recipes/minipredict/minipredict/fix-include.patch
@@ -1,4 +1,4 @@
---- ../minipredict-1.0-r0/minipredict/minipredict.c 2003-02-16 00:18:02 +00:00
+--- minipredict/minipredict.c 2003-02-16 00:18:02 +00:00
+++ minipredict/minipredict.c 2005-03-04 04:54:13 +00:00
@@ -16,7 +16,7 @@
#include <locale.h>
diff --git a/recipes/minipredict/minipredict/fix-makefile.patch b/recipes/minipredict/minipredict/fix-makefile.patch
index b46d816f46..638a15cfa8 100644
--- a/recipes/minipredict/minipredict/fix-makefile.patch
+++ b/recipes/minipredict/minipredict/fix-makefile.patch
@@ -1,5 +1,5 @@
-diff -urNd ../minipredict-1.0-r0/minipredict/Makefile minipredict/Makefile
---- ../minipredict-1.0-r0/minipredict/Makefile 2003-02-15 23:14:40 +00:00
+diff -urNd minipredict/Makefile minipredict/Makefile
+--- minipredict/Makefile 2003-02-15 23:14:40 +00:00
+++ minipredict/Makefile 2005-03-04 05:23:24 +00:00
@@ -1,18 +1,16 @@
@@ -30,8 +30,8 @@ diff -urNd ../minipredict-1.0-r0/minipredict/Makefile minipredict/Makefile
+ rm -f *.o minipredict
+
+include Makefile.dpkg_ipkg
-diff -urNd ../minipredict-1.0-r0/minipredict/Makefile.dpkg_ipkg minipredict/Makefile.dpkg_ipkg
---- ../minipredict-1.0-r0/minipredict/Makefile.dpkg_ipkg 1970-01-01 01:00:00 +01:00
+diff -urNd minipredict/Makefile.dpkg_ipkg minipredict/Makefile.dpkg_ipkg
+--- minipredict/Makefile.dpkg_ipkg 1970-01-01 01:00:00 +01:00
+++ minipredict/Makefile.dpkg_ipkg 2005-03-04 04:24:46 +00:00
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
diff --git a/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch b/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch
index 6eae764d1c..aac4344709 100644
--- a/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch
+++ b/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch
@@ -1,4 +1,4 @@
---- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.kbuild 2006-03-29 16:02:20.000000000 -0700
+--- nv/Makefile.kbuild 2006-03-29 16:02:20.000000000 -0700
+++ nv/Makefile.kbuild 2006-04-26 13:50:47.249353208 -0600
@@ -28,7 +28,7 @@
# Christian Zander (zander@mail.minion.de) (enhancements)
@@ -33,7 +33,7 @@
#
# Build an object file suitable for further processing by the installer and
---- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.nvidia 2006-03-29 16:02:20.000000000 -0700
+--- nv/Makefile.nvidia 2006-03-29 16:02:20.000000000 -0700
+++ nv/Makefile.nvidia 2006-04-26 13:52:19.573317832 -0600
@@ -102,7 +102,7 @@
diff --git a/recipes/rxvt-unicode/files/makefile.patch b/recipes/rxvt-unicode/files/makefile.patch
index 86f82eeb4c..787e563ce1 100644
--- a/recipes/rxvt-unicode/files/makefile.patch
+++ b/recipes/rxvt-unicode/files/makefile.patch
@@ -1,4 +1,4 @@
---- ../rxvt-unicode-cvs-r0/rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00
+--- rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00
+++ rxvt-unicode/Makefile.in 2004-12-24 03:09:00 +00:00
@@ -9,7 +9,7 @@
first_rule: all
diff --git a/recipes/rxvt-unicode/files/signedchar.patch b/recipes/rxvt-unicode/files/signedchar.patch
index 6faa175143..3adcf728e9 100644
--- a/recipes/rxvt-unicode/files/signedchar.patch
+++ b/recipes/rxvt-unicode/files/signedchar.patch
@@ -1,4 +1,4 @@
---- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00
+--- rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00
+++ rxvt-unicode/src/command.C 2004-12-24 02:31:36 +00:00
@@ -1862,7 +1862,7 @@
#endif /* NO_SCROLLBAR_REPORT */
diff --git a/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch b/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch
index eb87b84b25..b1182a14cc 100644
--- a/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch
+++ b/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch
@@ -1,5 +1,5 @@
-diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
---- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
+diff -urNd rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
+--- rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
+++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00
@@ -3064,7 +3064,7 @@
else
diff --git a/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch b/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch
index eb87b84b25..b1182a14cc 100644
--- a/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch
+++ b/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch
@@ -1,5 +1,5 @@
-diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
---- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
+diff -urNd rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
+--- rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
+++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00
@@ -3064,7 +3064,7 @@
else
diff --git a/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch b/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
index eb87b84b25..b1182a14cc 100644
--- a/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
+++ b/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
@@ -1,5 +1,5 @@
-diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
---- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
+diff -urNd rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
+--- rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
+++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00
@@ -3064,7 +3064,7 @@
else
diff --git a/recipes/twin/twin-0.4.6/cross_compile.patch b/recipes/twin/twin-0.4.6/cross_compile.patch
index 7f8163a78a..83b3bf7e42 100644
--- a/recipes/twin/twin-0.4.6/cross_compile.patch
+++ b/recipes/twin/twin-0.4.6/cross_compile.patch
@@ -1,5 +1,5 @@
-diff -urNd ../twin-0.4.6-r0/twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in
---- ../twin-0.4.6-r0/twin-0.4.6/Makefile.in 2003-03-27 08:29:47 +00:00
+diff -urNd twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in
+--- twin-0.4.6/Makefile.in 2003-03-27 08:29:47 +00:00
+++ twin-0.4.6/Makefile.in 2004-07-27 13:04:46 +01:00
@@ -71,33 +71,33 @@
# to correctly generate include/autoconf.h
@@ -55,8 +55,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in
#
# was:
-diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure twin-0.4.6/configure
---- ../twin-0.4.6-r0/twin-0.4.6/configure 2003-03-27 08:29:47 +00:00
+diff -urNd twin-0.4.6/configure twin-0.4.6/configure
+--- twin-0.4.6/configure 2003-03-27 08:29:47 +00:00
+++ twin-0.4.6/configure 2004-07-27 13:11:21 +01:00
@@ -1235,7 +1235,7 @@
@@ -85,8 +85,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure twin-0.4.6/configure
cp $export_symbols $output_objdir/$soname-def;
else
echo EXPORTS > $output_objdir/$soname-def;
-diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure.in twin-0.4.6/configure.in
---- ../twin-0.4.6-r0/twin-0.4.6/configure.in 2003-03-27 08:29:47 +00:00
+diff -urNd twin-0.4.6/configure.in twin-0.4.6/configure.in
+--- twin-0.4.6/configure.in 2003-03-27 08:29:47 +00:00
+++ twin-0.4.6/configure.in 2004-07-27 13:18:07 +01:00
@@ -188,7 +188,7 @@
@@ -115,8 +115,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure.in twin-0.4.6/configure.in
AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt,crypt))
AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen))
AC_CHECK_LIB(ltdl,lt_dlopen)
-diff -urNd ../twin-0.4.6-r0/twin-0.4.6/makerules twin-0.4.6/makerules
---- ../twin-0.4.6-r0/twin-0.4.6/makerules 2003-03-27 08:29:48 +00:00
+diff -urNd twin-0.4.6/makerules twin-0.4.6/makerules
+--- twin-0.4.6/makerules 2003-03-27 08:29:48 +00:00
+++ twin-0.4.6/makerules 2004-07-27 13:04:46 +01:00
@@ -794,7 +794,7 @@
endif
@@ -140,8 +140,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/makerules twin-0.4.6/makerules
#
-diff -urNd ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c twin-0.4.6/scripts/mkdep.c
---- ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c 2003-03-27 08:29:48 +00:00
+diff -urNd twin-0.4.6/scripts/mkdep.c twin-0.4.6/scripts/mkdep.c
+--- twin-0.4.6/scripts/mkdep.c 2003-03-27 08:29:48 +00:00
+++ twin-0.4.6/scripts/mkdep.c 2004-07-27 13:04:46 +01:00
@@ -172,8 +172,8 @@
putchar('\n');
diff --git a/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch b/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch
index 0c0d56f4d1..fadf9e2423 100644
--- a/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch
+++ b/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch
@@ -1,6 +1,6 @@
-diff -Nurp ../u-boot-1.1.6/arm_config.mk ./arm_config.mk
---- ../u-boot-1.1.6/arm_config.mk 2006-11-02 15:15:01.000000000 +0100
-+++ ./arm_config.mk 2007-04-23 18:07:47.000000000 +0200
+diff -Nurp u-boot-1.1.6/arm_config.mk b/arm_config.mk
+--- u-boot-1.1.6/arm_config.mk 2006-11-02 15:15:01.000000000 +0100
++++ b/arm_config.mk 2007-04-23 18:07:47.000000000 +0200
@@ -21,4 +21,6 @@
# MA 02111-1307 USA
#
@@ -8,14 +8,14 @@ diff -Nurp ../u-boot-1.1.6/arm_config.mk ./arm_config.mk
+#PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 -msoft-float
+PLATFORM_CPPFLAGS += -march=armv4t -mtune=arm920t
PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__
-diff -Nurp ../u-boot-1.1.6/board/sarge/config.mk ./board/sarge/config.mk
---- ../u-boot-1.1.6/board/sarge/config.mk 1970-01-01 01:00:00.000000000 +0100
-+++ ./board/sarge/config.mk 2007-03-21 00:31:33.000000000 +0100
+diff -Nurp u-boot-1.1.6/board/sarge/config.mk b/board/sarge/config.mk
+--- u-boot-1.1.6/board/sarge/config.mk 1970-01-01 01:00:00.000000000 +0100
++++ b/board/sarge/config.mk 2007-03-21 00:31:33.000000000 +0100
@@ -0,0 +1 @@
+TEXT_BASE = 0x21F00000
-diff -Nurp ../u-boot-1.1.6/board/sarge/flash.c ./board/sarge/flash.c
---- ../u-boot-1.1.6/board/sarge/flash.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./board/sarge/flash.c 2007-03-09 01:25:41.000000000 +0100
+diff -Nurp u-boot-1.1.6/board/sarge/flash.c b/board/sarge/flash.c
+--- u-boot-1.1.6/board/sarge/flash.c 1970-01-01 01:00:00.000000000 +0100
++++ b/board/sarge/flash.c 2007-03-09 01:25:41.000000000 +0100
@@ -0,0 +1,504 @@
+/*
+ * (C) Copyright 2002
@@ -521,9 +521,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/flash.c ./board/sarge/flash.c
+
+ return ERR_OK;
+}
-diff -Nurp ../u-boot-1.1.6/board/sarge/Makefile ./board/sarge/Makefile
---- ../u-boot-1.1.6/board/sarge/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ ./board/sarge/Makefile 2007-03-14 01:05:48.000000000 +0100
+diff -Nurp u-boot-1.1.6/board/sarge/Makefile b/board/sarge/Makefile
+--- u-boot-1.1.6/board/sarge/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ b/board/sarge/Makefile 2007-03-14 01:05:48.000000000 +0100
@@ -0,0 +1,46 @@
+#
+# (C) Copyright 2007
@@ -571,9 +571,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/Makefile ./board/sarge/Makefile
+-include .depend
+
+#########################################################################
-diff -Nurp ../u-boot-1.1.6/board/sarge/sarge_board.c ./board/sarge/sarge_board.c
---- ../u-boot-1.1.6/board/sarge/sarge_board.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./board/sarge/sarge_board.c 2007-05-11 23:45:25.000000000 +0200
+diff -Nurp u-boot-1.1.6/board/sarge/sarge_board.c b/board/sarge/sarge_board.c
+--- u-boot-1.1.6/board/sarge/sarge_board.c 1970-01-01 01:00:00.000000000 +0100
++++ b/board/sarge/sarge_board.c 2007-05-11 23:45:25.000000000 +0200
@@ -0,0 +1,363 @@
+/*
+ * (C) Copyright 2007
@@ -938,9 +938,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/sarge_board.c ./board/sarge/sarge_board.c
+ printf ("%4lu MB\n", nand_probe(AT91_SMARTMEDIA_BASE) >> 20);
+}
+#endif
-diff -Nurp ../u-boot-1.1.6/board/sarge/u-boot.lds ./board/sarge/u-boot.lds
---- ../u-boot-1.1.6/board/sarge/u-boot.lds 1970-01-01 01:00:00.000000000 +0100
-+++ ./board/sarge/u-boot.lds 2007-03-09 01:25:41.000000000 +0100
+diff -Nurp u-boot-1.1.6/board/sarge/u-boot.lds b/board/sarge/u-boot.lds
+--- u-boot-1.1.6/board/sarge/u-boot.lds 1970-01-01 01:00:00.000000000 +0100
++++ b/board/sarge/u-boot.lds 2007-03-09 01:25:41.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2002
@@ -999,9 +999,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/u-boot.lds ./board/sarge/u-boot.lds
+ .bss : { *(.bss) }
+ _end = .;
+}
-diff -Nurp ../u-boot-1.1.6/common/cmd_bootm.c ./common/cmd_bootm.c
---- ../u-boot-1.1.6/common/cmd_bootm.c 2006-11-02 15:15:01.000000000 +0100
-+++ ./common/cmd_bootm.c 2007-03-27 02:55:11.000000000 +0200
+diff -Nurp u-boot-1.1.6/common/cmd_bootm.c b/common/cmd_bootm.c
+--- u-boot-1.1.6/common/cmd_bootm.c 2006-11-02 15:15:01.000000000 +0100
++++ b/common/cmd_bootm.c 2007-03-27 02:55:11.000000000 +0200
@@ -79,7 +79,10 @@ DECLARE_GLOBAL_DATA_PTR;
# define CHUNKSZ (64 * 1024)
#endif
@@ -1149,9 +1149,9 @@ diff -Nurp ../u-boot-1.1.6/common/cmd_bootm.c ./common/cmd_bootm.c
#ifdef CONFIG_BZIP2
void bz_internal_error(int errcode)
-diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile ./cpu/arm920t/at91rm9200/Makefile
---- ../u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile 2006-11-02 15:15:01.000000000 +0100
-+++ ./cpu/arm920t/at91rm9200/Makefile 2007-05-13 20:19:07.000000000 +0200
+diff -Nurp u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile b/cpu/arm920t/at91rm9200/Makefile
+--- u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile 2006-11-02 15:15:01.000000000 +0100
++++ b/cpu/arm920t/at91rm9200/Makefile 2007-05-13 20:19:07.000000000 +0200
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).a
@@ -1161,9 +1161,9 @@ diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile ./cpu/arm920t/at91rm9
SOBJS = lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c ./cpu/arm920t/at91rm9200/ste100p.c
---- ../u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./cpu/arm920t/at91rm9200/ste100p.c 2007-05-10 02:02:34.000000000 +0200
+diff -Nurp u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c b/cpu/arm920t/at91rm9200/ste100p.c
+--- u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c 1970-01-01 01:00:00.000000000 +0100
++++ b/cpu/arm920t/at91rm9200/ste100p.c 2007-05-10 02:02:34.000000000 +0200
@@ -0,0 +1,517 @@
+/*
+ * (C) Copyright 2007
@@ -1682,9 +1682,9 @@ diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c ./cpu/arm920t/at91rm
+#endif /* CONFIG_COMMANDS & CFG_CMD_NET */
+
+#endif /* CONFIG_DRIVER_ETHER */
-diff -Nurp ../u-boot-1.1.6/drivers/dataflash.c ./drivers/dataflash.c
---- ../u-boot-1.1.6/drivers/dataflash.c 2006-11-02 15:15:01.000000000 +0100
-+++ ./drivers/dataflash.c 2007-03-19 23:43:20.000000000 +0100
+diff -Nurp u-boot-1.1.6/drivers/dataflash.c b/drivers/dataflash.c
+--- u-boot-1.1.6/drivers/dataflash.c 2006-11-02 15:15:01.000000000 +0100
++++ b/drivers/dataflash.c 2007-03-19 23:43:20.000000000 +0100
@@ -46,8 +46,8 @@ extern int AT91F_DataFlashRead (AT91PS_D
unsigned long size, char *buffer);
extern int AT91F_DataFlashWrite( AT91PS_DataFlash pDataFlash,
@@ -1750,9 +1750,9 @@ diff -Nurp ../u-boot-1.1.6/drivers/dataflash.c ./drivers/dataflash.c
return 1;
}
-diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h ./include/asm-arm/arch-at91rm9200/AT91RM9200.h
---- ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h 2006-11-02 15:15:01.000000000 +0100
-+++ ./include/asm-arm/arch-at91rm9200/AT91RM9200.h 2007-03-11 16:21:22.000000000 +0100
+diff -Nurp u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/include/asm-arm/arch-at91rm9200/AT91RM9200.h
+--- u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h 2006-11-02 15:15:01.000000000 +0100
++++ b/include/asm-arm/arch-at91rm9200/AT91RM9200.h 2007-03-11 16:21:22.000000000 +0100
@@ -625,14 +625,40 @@ typedef struct _AT91S_PDC
#define AT91C_PA26_TWCK ((unsigned int) 1 << 26)
#define AT91C_PA31_DTXD ((unsigned int) AT91C_PIO_PA31) /* DBGU Debug Transmit Data */
@@ -1811,9 +1811,9 @@ diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h ./includ
#define AT91C_PIO_PB25 ((unsigned int) 1 << 25) /* Pin Controlled by PB25 */
#define AT91C_PB25_DSR1 ((unsigned int) AT91C_PIO_PB25) /* USART 1 Data Set ready */
#define AT91C_PB25_EF100 ((unsigned int) AT91C_PIO_PB25) /* Ethernet MAC Force 100 Mbits */
-diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h ./include/asm-arm/arch-at91rm9200/mmc.h
---- ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h 1970-01-01 01:00:00.000000000 +0100
-+++ ./include/asm-arm/arch-at91rm9200/mmc.h 2006-10-13 20:55:04.000000000 +0200
+diff -Nurp u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h b/include/asm-arm/arch-at91rm9200/mmc.h
+--- u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h 1970-01-01 01:00:00.000000000 +0100
++++ b/include/asm-arm/arch-at91rm9200/mmc.h 2006-10-13 20:55:04.000000000 +0200
@@ -0,0 +1,117 @@
+/*
+ * linux/include/linux/mmc/mmc.h
@@ -1932,9 +1932,9 @@ diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h ./include/asm-a
+extern void mmc_release_host(struct mmc_host *host);
+
+#endif
-diff -Nurp ../u-boot-1.1.6/include/at91rm9200_net.h ./include/at91rm9200_net.h
---- ../u-boot-1.1.6/include/at91rm9200_net.h 2006-11-02 15:15:01.000000000 +0100
-+++ ./include/at91rm9200_net.h 2007-05-04 22:14:56.000000000 +0200
+diff -Nurp u-boot-1.1.6/include/at91rm9200_net.h b/include/at91rm9200_net.h
+--- u-boot-1.1.6/include/at91rm9200_net.h 2006-11-02 15:15:01.000000000 +0100
++++ b/include/at91rm9200_net.h 2007-05-04 22:14:56.000000000 +0200
@@ -38,6 +38,7 @@ typedef struct _AT91S_PhyOps
unsigned int (*IsPhyConnected)(AT91S_EMAC *pmac);
unsigned char (*GetLinkSpeed)(AT91S_EMAC *pmac);
@@ -1943,9 +1943,9 @@ diff -Nurp ../u-boot-1.1.6/include/at91rm9200_net.h ./include/at91rm9200_net.h
} AT91S_PhyOps,*AT91PS_PhyOps;
-diff -Nurp ../u-boot-1.1.6/include/configs/sarge.h ./include/configs/sarge.h
---- ../u-boot-1.1.6/include/configs/sarge.h 1970-01-01 01:00:00.000000000 +0100
-+++ ./include/configs/sarge.h 2007-05-10 00:02:56.000000000 +0200
+diff -Nurp u-boot-1.1.6/include/configs/sarge.h b/include/configs/sarge.h
+--- u-boot-1.1.6/include/configs/sarge.h 1970-01-01 01:00:00.000000000 +0100
++++ b/include/configs/sarge.h 2007-05-10 00:02:56.000000000 +0200
@@ -0,0 +1,281 @@
+/*
+ * Grzegorz Rajtar <mcgregor@blackmesaeast.com.pl>
@@ -2228,9 +2228,9 @@ diff -Nurp ../u-boot-1.1.6/include/configs/sarge.h ./include/configs/sarge.h
+#define CONFIG_LOADADDR 0x21000000
+#define CONFIG_NFSARGS "mem=32M console=ttyS0,115200n8 root=/dev/nfs nfsroot=192.168.0.200:/tftp/at91/rootfs,timeo=200,retrans=500 ip=:::::eth0:on"
+#endif
-diff -Nurp ../u-boot-1.1.6/include/dataflash.h ./include/dataflash.h
---- ../u-boot-1.1.6/include/dataflash.h 2006-11-02 15:15:01.000000000 +0100
-+++ ./include/dataflash.h 2007-03-19 23:29:49.000000000 +0100
+diff -Nurp u-boot-1.1.6/include/dataflash.h b/include/dataflash.h
+--- u-boot-1.1.6/include/dataflash.h 2006-11-02 15:15:01.000000000 +0100
++++ b/include/dataflash.h 2007-03-19 23:29:49.000000000 +0100
@@ -79,6 +79,7 @@ typedef struct _AT91S_Dataflash {
int page_offset; /* page offset in command */
int byte_mask; /* byte mask in command */
@@ -2248,9 +2248,9 @@ diff -Nurp ../u-boot-1.1.6/include/dataflash.h ./include/dataflash.h
/* DataFlash return value */
#define DATAFLASH_BUSY 0x00
-diff -Nurp ../u-boot-1.1.6/include/_exports.h ./include/_exports.h
---- ../u-boot-1.1.6/include/_exports.h 2006-11-02 15:15:01.000000000 +0100
-+++ ./include/_exports.h 2007-03-15 23:41:08.000000000 +0100
+diff -Nurp u-boot-1.1.6/include/_exports.h b/include/_exports.h
+--- u-boot-1.1.6/include/_exports.h 2006-11-02 15:15:01.000000000 +0100
++++ b/include/_exports.h 2007-03-15 23:41:08.000000000 +0100
@@ -18,4 +18,4 @@ EXPORT_FUNC(simple_strtoul)
#if (CONFIG_COMMANDS & CFG_CMD_I2C)
EXPORT_FUNC(i2c_write)
@@ -2258,9 +2258,9 @@ diff -Nurp ../u-boot-1.1.6/include/_exports.h ./include/_exports.h
-#endif /* CFG_CMD_I2C */
+#endif /* CFG_CMD_I2C */
\ Brak znaku nowej linii na końcu pliku
-diff -Nurp ../u-boot-1.1.6/include/gunzip.h ./include/gunzip.h
---- ../u-boot-1.1.6/include/gunzip.h 1970-01-01 01:00:00.000000000 +0100
-+++ ./include/gunzip.h 2007-03-21 23:23:36.000000000 +0100
+diff -Nurp u-boot-1.1.6/include/gunzip.h b/include/gunzip.h
+--- u-boot-1.1.6/include/gunzip.h 1970-01-01 01:00:00.000000000 +0100
++++ b/include/gunzip.h 2007-03-21 23:23:36.000000000 +0100
@@ -0,0 +1,73 @@
+#ifndef _GUNZIP_H
+#define _GUNZIP_H
@@ -2335,9 +2335,9 @@ diff -Nurp ../u-boot-1.1.6/include/gunzip.h ./include/gunzip.h
+ unsigned char *outbuf, unsigned long *outsize);
+
+#endif /* _GUNZIP_H */
-diff -Nurp ../u-boot-1.1.6/include/ste100p.h ./include/ste100p.h
---- ../u-boot-1.1.6/include/ste100p.h 1970-01-01 01:00:00.000000000 +0100
-+++ ./include/ste100p.h 2007-05-05 01:38:11.000000000 +0200
+diff -Nurp u-boot-1.1.6/include/ste100p.h b/include/ste100p.h
+--- u-boot-1.1.6/include/ste100p.h 1970-01-01 01:00:00.000000000 +0100
++++ b/include/ste100p.h 2007-05-05 01:38:11.000000000 +0200
@@ -0,0 +1,163 @@
+#ifndef _ste100p_h_
+#define _ste100p_h_
@@ -2502,9 +2502,9 @@ diff -Nurp ../u-boot-1.1.6/include/ste100p.h ./include/ste100p.h
+UCHAR ste100p_AutoNegotiate (AT91PS_EMAC p_mac, int *status);
+
+#endif // _ste100p_h_
-diff -Nurp ../u-boot-1.1.6/lib_arm/armlinux.c ./lib_arm/armlinux.c
---- ../u-boot-1.1.6/lib_arm/armlinux.c 2006-11-02 15:15:01.000000000 +0100
-+++ ./lib_arm/armlinux.c 2007-05-05 01:28:02.000000000 +0200
+diff -Nurp u-boot-1.1.6/lib_arm/armlinux.c b/lib_arm/armlinux.c
+--- u-boot-1.1.6/lib_arm/armlinux.c 2006-11-02 15:15:01.000000000 +0100
++++ b/lib_arm/armlinux.c 2007-05-05 01:28:02.000000000 +0200
@@ -62,6 +62,10 @@ static void setup_end_tag (bd_t *bd);
static void setup_videolfb_tag (gd_t *gd);
# endif
@@ -2564,9 +2564,9 @@ diff -Nurp ../u-boot-1.1.6/lib_arm/armlinux.c ./lib_arm/armlinux.c
params = tag_next (params);
}
#endif /* CONFIG_INITRD_TAG */
-diff -Nurp ../u-boot-1.1.6/lib_arm/board.c ./lib_arm/board.c
---- ../u-boot-1.1.6/lib_arm/board.c 2006-11-02 15:15:01.000000000 +0100
-+++ ./lib_arm/board.c 2007-05-04 23:21:40.000000000 +0200
+diff -Nurp u-boot-1.1.6/lib_arm/board.c b/lib_arm/board.c
+--- u-boot-1.1.6/lib_arm/board.c 2006-11-02 15:15:01.000000000 +0100
++++ b/lib_arm/board.c 2007-05-04 23:21:40.000000000 +0200
@@ -94,6 +94,8 @@ void mem_malloc_init (ulong dest_addr)
mem_malloc_end = dest_addr + CFG_MALLOC_LEN;
mem_malloc_brk = mem_malloc_start;
@@ -2604,9 +2604,9 @@ diff -Nurp ../u-boot-1.1.6/lib_arm/board.c ./lib_arm/board.c
/* main_loop() can return to retry autoboot, if so just run it again. */
for (;;) {
main_loop ();
-diff -Nurp ../u-boot-1.1.6/lib_generic/gunzip.c ./lib_generic/gunzip.c
---- ../u-boot-1.1.6/lib_generic/gunzip.c 1970-01-01 01:00:00.000000000 +0100
-+++ ./lib_generic/gunzip.c 2007-03-22 00:44:21.000000000 +0100
+diff -Nurp u-boot-1.1.6/lib_generic/gunzip.c b/lib_generic/gunzip.c
+--- u-boot-1.1.6/lib_generic/gunzip.c 1970-01-01 01:00:00.000000000 +0100
++++ b/lib_generic/gunzip.c 2007-03-22 00:44:21.000000000 +0100
@@ -0,0 +1,613 @@
+#include "gunzip.h"
+
@@ -3221,9 +3221,9 @@ diff -Nurp ../u-boot-1.1.6/lib_generic/gunzip.c ./lib_generic/gunzip.c
+
+ return 0;
+}
-diff -Nurp ../u-boot-1.1.6/lib_generic/Makefile ./lib_generic/Makefile
---- ../u-boot-1.1.6/lib_generic/Makefile 2006-11-02 15:15:01.000000000 +0100
-+++ ./lib_generic/Makefile 2007-03-25 17:49:13.000000000 +0200
+diff -Nurp u-boot-1.1.6/lib_generic/Makefile b/lib_generic/Makefile
+--- u-boot-1.1.6/lib_generic/Makefile 2006-11-02 15:15:01.000000000 +0100
++++ b/lib_generic/Makefile 2007-03-25 17:49:13.000000000 +0200
@@ -28,7 +28,8 @@ LIB = $(obj)libgeneric.a
COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \
bzlib_randtable.o bzlib_huffman.o \
@@ -3235,9 +3235,9 @@ diff -Nurp ../u-boot-1.1.6/lib_generic/Makefile ./lib_generic/Makefile
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
Pliki ../u-boot-1.1.6/loader-sarge i ./loader-sarge różnią się
-diff -Nurp ../u-boot-1.1.6/Makefile ./Makefile
---- ../u-boot-1.1.6/Makefile 2006-11-02 15:15:01.000000000 +0100
-+++ ./Makefile 2007-03-29 20:07:54.000000000 +0200
+diff -Nurp u-boot-1.1.6/Makefile b/Makefile
+--- u-boot-1.1.6/Makefile 2006-11-02 15:15:01.000000000 +0100
++++ b/Makefile 2007-03-29 20:07:54.000000000 +0200
@@ -1882,6 +1882,9 @@ smdk2410_config : unconfig
SX1_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm925t sx1
@@ -3248,9 +3248,9 @@ diff -Nurp ../u-boot-1.1.6/Makefile ./Makefile
# TRAB default configuration: 8 MB Flash, 32 MB RAM
trab_config \
trab_bigram_config \
-diff -Nurp ../u-boot-1.1.6/net/bootp.c ./net/bootp.c
---- ../u-boot-1.1.6/net/bootp.c 2006-11-02 15:15:01.000000000 +0100
-+++ ./net/bootp.c 2007-05-09 23:46:31.000000000 +0200
+diff -Nurp u-boot-1.1.6/net/bootp.c b/net/bootp.c
+--- u-boot-1.1.6/net/bootp.c 2006-11-02 15:15:01.000000000 +0100
++++ b/net/bootp.c 2007-05-09 23:46:31.000000000 +0200
@@ -35,7 +35,7 @@
#define TIMEOUT 5 /* Seconds before trying BOOTP again */
@@ -3260,9 +3260,9 @@ diff -Nurp ../u-boot-1.1.6/net/bootp.c ./net/bootp.c
#else
# define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)
#endif
-diff -Nurp ../u-boot-1.1.6/net/eth.c ./net/eth.c
---- ../u-boot-1.1.6/net/eth.c 2006-11-02 15:15:01.000000000 +0100
-+++ ./net/eth.c 2007-05-09 23:47:19.000000000 +0200
+diff -Nurp u-boot-1.1.6/net/eth.c b/net/eth.c
+--- u-boot-1.1.6/net/eth.c 2006-11-02 15:15:01.000000000 +0100
++++ b/net/eth.c 2007-05-09 23:47:19.000000000 +0200
@@ -397,10 +397,10 @@ int eth_send(volatile void *packet, int
}
@@ -3276,9 +3276,9 @@ diff -Nurp ../u-boot-1.1.6/net/eth.c ./net/eth.c
return eth_current->recv(eth_current);
}
-diff -Nurp ../u-boot-1.1.6/net/Makefile ./net/Makefile
---- ../u-boot-1.1.6/net/Makefile 2006-11-02 15:15:01.000000000 +0100
-+++ ./net/Makefile 2007-05-09 23:52:55.000000000 +0200
+diff -Nurp u-boot-1.1.6/net/Makefile b/net/Makefile
+--- u-boot-1.1.6/net/Makefile 2006-11-02 15:15:01.000000000 +0100
++++ b/net/Makefile 2007-05-09 23:52:55.000000000 +0200
@@ -23,7 +23,7 @@
include $(TOPDIR)/config.mk
@@ -3288,9 +3288,9 @@ diff -Nurp ../u-boot-1.1.6/net/Makefile ./net/Makefile
LIB = $(obj)libnet.a
-diff -Nurp ../u-boot-1.1.6/net/net.c ./net/net.c
---- ../u-boot-1.1.6/net/net.c 2006-11-02 15:15:01.000000000 +0100
-+++ ./net/net.c 2007-05-09 23:47:40.000000000 +0200
+diff -Nurp u-boot-1.1.6/net/net.c b/net/net.c
+--- u-boot-1.1.6/net/net.c 2006-11-02 15:15:01.000000000 +0100
++++ b/net/net.c 2007-05-09 23:47:40.000000000 +0200
@@ -78,6 +78,7 @@
#include <watchdog.h>
#include <command.h>
diff --git a/recipes/udf/udftools/patch-04-wrudf-gcc4.diff b/recipes/udf/udftools/patch-04-wrudf-gcc4.diff
index 13690123a5..c1234afad7 100644
--- a/recipes/udf/udftools/patch-04-wrudf-gcc4.diff
+++ b/recipes/udf/udftools/patch-04-wrudf-gcc4.diff
@@ -38,9 +38,9 @@ to 'libreadline5-dev'.
Regards
Andreas Jochens
-diff -urN ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c ./wrudf/wrudf.c
---- ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c 2002-11-26 08:18:51.000000000 +0100
-+++ ./wrudf/wrudf.c 2005-01-04 16:56:49.394078200 +0100
+diff -urN udftools-1.0.0b3/wrudf/wrudf.c b/wrudf/wrudf.c
+--- udftools-1.0.0b3/wrudf/wrudf.c 2002-11-26 08:18:51.000000000 +0100
++++ b/wrudf/wrudf.c 2005-01-04 16:56:49.394078200 +0100
@@ -245,7 +245,7 @@
} else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
virtualPartitionNum = i;
@@ -50,4 +50,3 @@ diff -urN ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c ./wrudf/wrudf.c
}
if( medium == CDR ) {
-diff -urN ../tmp-orig/udftools-1.0.0b3/debian/control ./debian/control