diff options
author | Tony Vroon <chainsaw@gentoo.org> | 2005-03-10 20:25:05 +0000 |
---|---|---|
committer | Tony Vroon <chainsaw@gentoo.org> | 2005-03-10 20:25:05 +0000 |
commit | eaead2f2fad431a5a5ae518dcb92c2ac9b8c0b07 (patch) | |
tree | c79524f19fdaba38e7bbd7700118430323e90061 /sys-fs/reiser4progs | |
parent | Added pcmcia to IUSE and closing bug #78714. (diff) | |
download | historical-eaead2f2fad431a5a5ae518dcb92c2ac9b8c0b07.tar.gz historical-eaead2f2fad431a5a5ae518dcb92c2ac9b8c0b07.tar.bz2 historical-eaead2f2fad431a5a5ae518dcb92c2ac9b8c0b07.zip |
GCC 4 compat fix by Bret Towe <magnade@gmail.com>, closes bug #81054.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-fs/reiser4progs')
-rw-r--r-- | sys-fs/reiser4progs/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/reiser4progs/Manifest | 17 | ||||
-rw-r--r-- | sys-fs/reiser4progs/files/reiser4progs-1.0.3-gcc4.patch | 45 | ||||
-rw-r--r-- | sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild | 5 |
4 files changed, 63 insertions, 12 deletions
diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog index c0c166651de6..06d7ae0700be 100644 --- a/sys-fs/reiser4progs/ChangeLog +++ b/sys-fs/reiser4progs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/reiser4progs -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.17 2004/12/16 17:27:46 vapier Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.18 2005/03/10 20:25:05 chainsaw Exp $ + + 10 Mar 2005; Tony Vroon <chainsaw@gentoo.org> + +files/reiser4progs-1.0.3-gcc4.patch, reiser4progs-1.0.3.ebuild: + GCC 4 compat fix by Bret Towe <magnade@gmail.com>, closes bug #81054. *reiser4progs-1.0.3 (16 Dec 2004) diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest index af0f967dabbd..3d98c858b718 100644 --- a/sys-fs/reiser4progs/Manifest +++ b/sys-fs/reiser4progs/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 f56ecec74dd7a0a4f508b8c68243c9c5 reiser4progs-1.0.1.ebuild 1425 -MD5 bf498c870f7a4f943e209e9b12e8a5d0 ChangeLog 2365 MD5 564631952eab971c18ab4de2b5b721bd metadata.xml 267 +MD5 ad80b5655415dd18fbf33e4ac293589e ChangeLog 2555 +MD5 bb6867c28b848abb431b7500c4b4e0c2 reiser4progs-1.0.3.ebuild 1521 +MD5 f56ecec74dd7a0a4f508b8c68243c9c5 reiser4progs-1.0.1.ebuild 1425 MD5 bbd503ec1d2b0180ec17ac897d95d86e reiser4progs-1.0.2.ebuild 1486 -MD5 caac58c9d991e05cb9312c8ef1b8bca8 reiser4progs-1.0.3.ebuild 1483 +MD5 b3f5916be6210dc4da7fc0fdb1cd6fe5 files/reiser4progs-1.0.3-gcc4.patch 1632 +MD5 9f7f4fa128d3f50bb4b4918d05c62a60 files/digest-reiser4progs-1.0.3 70 MD5 990967545588c86e92fb0afbb2f77834 files/digest-reiser4progs-1.0.1 70 MD5 9bb40bf49c081afe6951054366ff7e20 files/digest-reiser4progs-1.0.2 70 -MD5 9f7f4fa128d3f50bb4b4918d05c62a60 files/digest-reiser4progs-1.0.3 70 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) +Version: GnuPG v1.4.0-ecc0.1.6 (GNU/Linux) -iD8DBQFBwcWaroRuSHgZdywRAnxqAJ9oLpAFTb1VOsnMoPFAjIYcfo+XSACfXe1k -dp9COR+L/wn5O0xlyGherLI= -=VpJl +iD8DBQFCMK3Dp5vW4rUFj5oRAthhAJ9wr3V6wzb6zBUzp/Hu6yrcKj6loACglF9i +ZtgKVhif5mMU2nb+PSICBB4= +=dr1A -----END PGP SIGNATURE----- diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.3-gcc4.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.3-gcc4.patch new file mode 100644 index 000000000000..e9d0b3d7259a --- /dev/null +++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.3-gcc4.patch @@ -0,0 +1,45 @@ +diff -urN ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_large/key_large.c \ + ./plugin/key/key_large/key_large.c +--- ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_large/key_large.c 2004-10-19 \ + 23:02:47.000000000 +0200 ++++ ./plugin/key/key_large/key_large.c 2005-01-03 17:13:29.425846752 +0100 +@@ -6,7 +6,7 @@ + #ifdef ENABLE_LARGE_KEYS + #include "key_large.h" + +-extern reiser4_plug_t key_large_plug; ++static reiser4_plug_t key_large_plug; + + /* Returns minimal key */ + static reiser4_key_t *key_large_minimal(void) { +diff -urN ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_short/key_short.c \ + ./plugin/key/key_short/key_short.c +--- ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_short/key_short.c 2004-10-19 \ + 23:02:27.000000000 +0200 ++++ ./plugin/key/key_short/key_short.c 2005-01-03 17:13:12.000000000 +0100 +@@ -6,7 +6,7 @@ + #ifdef ENABLE_SHORT_KEYS + #include "key_short.h" + +-extern reiser4_plug_t key_short_plug; ++static reiser4_plug_t key_short_plug; + + /* Returns minimal key */ + static reiser4_key_t *key_short_minimal(void) { +diff -urN ../tmp-orig/reiser4progs-1.0.3/plugin/oid/oid40/oid40.c \ + ./plugin/oid/oid40/oid40.c +--- ../tmp-orig/reiser4progs-1.0.3/plugin/oid/oid40/oid40.c 2004-12-02 \ + 17:13:27.000000000 +0100 ++++ ./plugin/oid/oid40/oid40.c 2005-01-03 17:09:38.000000000 +0100 +@@ -8,7 +8,7 @@ + #include "oid40.h" + #include "oid40_repair.h" + +-extern reiser4_plug_t oid40_plug; ++static reiser4_plug_t oid40_plug; + + static uint32_t oid40_get_state(generic_entity_t *entity) { + aal_assert("umka-2088", entity != NULL); + + + diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild index 7a29f822b198..6fbef4c6cb6c 100644 --- a/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild +++ b/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild,v 1.1 2004/12/16 17:27:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild,v 1.2 2005/03/10 20:25:05 chainsaw Exp $ inherit eutils @@ -19,6 +19,7 @@ DEPEND=">=sys-libs/libaal-${PV} src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/${P}-gcc4.patch cat << EOF > run-ldconfig #!/bin/sh true |