diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2006-01-29 01:50:48 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2006-01-29 01:50:48 +0000 |
| commit | 6f67ee74bf09b9c9103b383a4ba5e635fdfab33f (patch) | |
| tree | 72a05435dc49e854e1a1323d80e4a3e20fbef356 /app-arch/rpm/files | |
| parent | version bump thanks to Thomas Meyer <thomas.mey@web.de> in bug 120736 (diff) | |
| download | gentoo-2-6f67ee74bf09b9c9103b383a4ba5e635fdfab33f.tar.gz gentoo-2-6f67ee74bf09b9c9103b383a4ba5e635fdfab33f.tar.bz2 gentoo-2-6f67ee74bf09b9c9103b383a4ba5e635fdfab33f.zip | |
Add patch to fix compilation with gcc-4; bug #118858
(Portage version: 2.1_pre4)
Diffstat (limited to 'app-arch/rpm/files')
| -rw-r--r-- | app-arch/rpm/files/digest-rpm-4.2-r1 | 2 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.2-gcc4.patch | 35 |
2 files changed, 37 insertions, 0 deletions
diff --git a/app-arch/rpm/files/digest-rpm-4.2-r1 b/app-arch/rpm/files/digest-rpm-4.2-r1 index 112ee0c363a5..2f801a10f074 100644 --- a/app-arch/rpm/files/digest-rpm-4.2-r1 +++ b/app-arch/rpm/files/digest-rpm-4.2-r1 @@ -1 +1,3 @@ MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106 +RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 rpm-4.2.tar.gz 9742106 +SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34 rpm-4.2.tar.gz 9742106 diff --git a/app-arch/rpm/files/rpm-4.2-gcc4.patch b/app-arch/rpm/files/rpm-4.2-gcc4.patch new file mode 100644 index 000000000000..e8b49994b2bc --- /dev/null +++ b/app-arch/rpm/files/rpm-4.2-gcc4.patch @@ -0,0 +1,35 @@ +--- rpm-4.2-orig/python/header-py.c 2006-01-15 22:12:45.000000000 -0600 ++++ rpm-4.2/python/header-py.c 2006-01-15 22:13:44.000000000 -0600 +@@ -434,7 +434,7 @@ + while (extensions->name) { + if (extensions->type == HEADER_EXT_TAG + && !xstrcasecmp(extensions->name + 7, str)) { +- (const struct headerSprintfExtension *) ext = extensions; ++ ext = extensions; + } + extensions++; + } +diff -Naur rpm-4.2-orig/python/rpmmodule.c rpm-4.2/python/rpmmodule.c +--- rpm-4.2-orig/python/rpmmodule.c 2006-01-15 22:12:45.000000000 -0600 ++++ rpm-4.2/python/rpmmodule.c 2006-01-15 22:15:03.000000000 -0600 +@@ -263,7 +263,7 @@ + + while (extensions->name) { + if (extensions->type == HEADER_EXT_TAG) { +- (const struct headerSprintfExtension *) ext = extensions; ++ ext = extensions; + PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL)); + Py_DECREF(o); + PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7)); +--- rpm-4.2-orig/python/rpmts-py.c 2006-01-15 22:39:42.000000000 -0600 ++++ rpm-4.2/python/rpmts-py.c 2006-01-15 22:46:02.000000000 -0600 +@@ -27,7 +27,7 @@ + + /*@unchecked@*/ + /*@-shadow@*/ +-static int _rpmts_debug = 0; ++extern int _rpmts_debug; + /*@=shadow@*/ + + /*@access alKey @*/ + |