reiser4progs: added patches to let it compile with gcc 4.1.1

diff --git a/packages/reiser4progs/files/key_large.c.patch b/packages/reiser4progs/files/key_large.c.patch
new file mode 100644 (file)
index 0000000..11fc694
--- /dev/null
+++ b/packages/reiser4progs/files/key_large.c.patch
@@ -0,0 +1,20 @@
+--- ./plugin/key/key_large/key_large.c.orig    2006-07-01 16:22:38.000000000 +0200
++++ ./plugin/key/key_large/key_large.c 2006-07-01 16:23:06.000000000 +0200
+@@ -266,7 +266,7 @@
+               ordering |= HASHED_NAME_MASK;
+ 
+               offset = plug_call(hash->o.hash_ops, build,
+-                                 name + INLINE_CHARS,
++                                 (unsigned char *)name + INLINE_CHARS,
+                                  len - INLINE_CHARS);
+       }
+ 
+@@ -382,7 +382,7 @@
+       .get_name       = key_large_get_name
+ };
+ 
+-static reiser4_plug_t key_large_plug = {
++reiser4_plug_t key_large_plug = {
+       .cl    = class_init,
+       .id    = {KEY_LARGE_ID, 0, KEY_PLUG_TYPE},
+ #ifndef ENABLE_MINIMAL

diff --git a/packages/reiser4progs/files/key_short.c.patch b/packages/reiser4progs/files/key_short.c.patch
new file mode 100644 (file)
index 0000000..0c5bea9
--- /dev/null
+++ b/packages/reiser4progs/files/key_short.c.patch
@@ -0,0 +1,20 @@
+--- x/plugin/key/key_short/key_short.c.orig    2006-07-01 16:14:46.000000000 +0200
++++ x/plugin/key/key_short/key_short.c 2006-07-01 16:16:50.000000000 +0200
+@@ -248,7 +248,7 @@
+               objectid |= HASHED_NAME_MASK;
+               
+               offset = plug_call(hash->o.hash_ops, build,
+-                                 name + OBJECTID_CHARS,
++                                 (unsigned char*)name + OBJECTID_CHARS,
+                                  len - OBJECTID_CHARS);
+       }
+       
+@@ -367,7 +367,7 @@
+       .get_name       = key_short_get_name
+ };
+ 
+-static reiser4_plug_t key_short_plug = {
++reiser4_plug_t key_short_plug = {
+       .cl    = class_init,
+       .id    = {KEY_SHORT_ID, 0, KEY_PLUG_TYPE},
+ #ifndef ENABLE_MINIMAL

diff --git a/packages/reiser4progs/files/oid40.c.patch b/packages/reiser4progs/files/oid40.c.patch
new file mode 100644 (file)
index 0000000..9e3cf89
--- /dev/null
+++ b/packages/reiser4progs/files/oid40.c.patch
@@ -0,0 +1,11 @@
+--- x/plugin/oid/oid40/oid40.c.orig    2006-07-01 16:07:13.000000000 +0200
++++ x/plugin/oid/oid40/oid40.c 2006-07-01 16:07:33.000000000 +0200
+@@ -201,7 +201,7 @@
+       .slink_locality = oid40_slink_locality
+ };
+ 
+-static reiser4_plug_t oid40_plug = {
++reiser4_plug_t oid40_plug = {
+       .cl    = class_init,
+       .id    = {OID_REISER40_ID, 0, OID_PLUG_TYPE},
+       .label = "oid40",

diff --git a/packages/reiser4progs/reiser4progs_1.0.4.bb b/packages/reiser4progs/reiser4progs_1.0.4.bb
index 61630b6..07f5e68 100644 (file)
--- a/packages/reiser4progs/reiser4progs_1.0.4.bb
+++ b/packages/reiser4progs/reiser4progs_1.0.4.bb
@@ -1,7 +1,7 @@
 # This package builds tools to manipulate Reiser4 file systems,
 # the libaal package must be built and installed as well to
 # run these tools.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "User-level tools for Reiser4 filesystems"
 HOMEPAGE = "http://www.namesys.com"
 MAINTAINER = "John Bowler <jbowler@acm.org>"
@@ -9,6 +9,9 @@ SECTION = "base"
 LICENSE = "GPL-2"
 
 SRC_URI = "ftp://ftp.namesys.com/pub/${PN}/old-versions/${P}.tar.gz \
+               file://oid40.c.patch;patch=1 \
+               file://key_short.c.patch;patch=1 \
+               file://key_large.c.patch;patch=1 \
                file://align.patch;patch=1"
 
 LIBAAL = "libaal"