pcmcia-cs 3.2.8: gcc4 fixes

diff --git a/packages/pcmcia-cs/files/gcc4_fixes.patch b/packages/pcmcia-cs/files/gcc4_fixes.patch
new file mode 100644 (file)
index 0000000..c68ba7a
--- /dev/null
+++ b/packages/pcmcia-cs/files/gcc4_fixes.patch
@@ -0,0 +1,26 @@
+Index: pcmcia-cs-3.2.8/debug-tools/lspnp.c
+===================================================================
+--- pcmcia-cs-3.2.8.orig/debug-tools/lspnp.c   2002-02-13 05:45:01.000000000 +0000
++++ pcmcia-cs-3.2.8/debug-tools/lspnp.c        2005-11-11 23:43:33.000000000 +0000
+@@ -496,7 +496,7 @@
+               dump_io_fixed(r); break;
+           }
+       }
+-      (u_char *)p += sz + 1;
++      p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }
+Index: pcmcia-cs-3.2.8/debug-tools/setpnp.c
+===================================================================
+--- pcmcia-cs-3.2.8.orig/debug-tools/setpnp.c  2001-10-10 02:58:12.000000000 +0000
++++ pcmcia-cs-3.2.8/debug-tools/setpnp.c       2005-11-11 23:44:32.000000000 +0000
+@@ -163,7 +163,7 @@
+               break;
+           }
+       }
+-      (u_char *)p += sz + 1;
++      p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }

diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index fa685f8..e0ebf70 100644 (file)
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r22"
+PR = "r23"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
           file://busybox.patch;patch=1 \
@@ -12,6 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
           file://automount.patch;patch=1 \
           file://ratoc-cfu1u.patch;patch=1 \
           file://no-hostap-cards.patch;patch=1 \
+          file://gcc4_fixes.patch;patch=1 \
           file://pcmcia \
           file://ide.opts \
           file://wireless.opts \