diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-07-29 17:03:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-07-29 17:03:32 +0000 |
| commit | 6fdfe74d7b31c24e17c685386e70bf17c1dbd041 (patch) | |
| tree | 03adda3305a457e3c6dbdfb6022f6b750c30c22d /media-libs/liblrdf | |
| parent | Cleanup (diff) | |
| download | gentoo-2-6fdfe74d7b31c24e17c685386e70bf17c1dbd041.tar.gz gentoo-2-6fdfe74d7b31c24e17c685386e70bf17c1dbd041.tar.bz2 gentoo-2-6fdfe74d7b31c24e17c685386e70bf17c1dbd041.zip | |
Fix clashing MD5 symbols (reported at upstream sf.net project page)
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/liblrdf')
| -rw-r--r-- | media-libs/liblrdf/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/liblrdf/files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch | 20 | ||||
| -rw-r--r-- | media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild | 8 |
3 files changed, 31 insertions, 3 deletions
diff --git a/media-libs/liblrdf/ChangeLog b/media-libs/liblrdf/ChangeLog index d35caaec8dce..b5b9537f8c49 100644 --- a/media-libs/liblrdf/ChangeLog +++ b/media-libs/liblrdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/liblrdf # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.40 2011/07/29 07:48:54 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.41 2011/07/29 17:03:32 ssuominen Exp $ + + 29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> liblrdf-0.4.0-r20.ebuild, + +files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch: + Fix clashing MD5 symbols (reported at upstream sf.net project page) 29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> liblrdf-0.4.0-r20.ebuild, +files/liblrdf-0.4.0-raptor2-pkgconfig.patch: diff --git a/media-libs/liblrdf/files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch b/media-libs/liblrdf/files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch new file mode 100644 index 000000000000..7d4c6def70f5 --- /dev/null +++ b/media-libs/liblrdf/files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch @@ -0,0 +1,20 @@ +From Debian patchset of liblrdf0 package; also reported at sf.net lrdf project page + +--- src/lrdf_md5.h ++++ src/lrdf_md5.h +@@ -32,6 +32,15 @@ + #ifndef __MD5_H__ + #define __MD5_H__ + ++/* Change function names to prevent symbol conflicts */ ++#define md5_init _lrdf_md5_init ++#define md5_buffer _lrdf_md5_buffer ++#define md5_sig_from_string _lrdf_md5_sig_from_string ++#define md5_finish _lrdf_md5_finish ++#define md5_process _lrdf_md5_process ++#define md5_sig_to_string _lrdf_md5_sig_to_string ++#define md5_get_result _lrdf_md5_get_result ++ + /* + * Size of a standard MD5 signature in bytes. This definition is for + * external programs only. The MD5 routines themselves reference the diff --git a/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild b/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild index 027d5db20a87..1807caf0624b 100644 --- a/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild +++ b/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild,v 1.2 2011/07/29 07:48:54 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild,v 1.3 2011/07/29 17:03:32 ssuominen Exp $ EAPI=4 inherit autotools eutils @@ -22,7 +22,11 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog README ) src_prepare() { - epatch "${FILESDIR}"/${P}-{dontbuild-tests,raptor2{,-pkgconfig}}.patch + epatch \ + "${FILESDIR}"/${P}-dontbuild-tests.patch \ + "${FILESDIR}"/${P}-raptor2{,-pkgconfig}.patch \ + "${FILESDIR}"/${P}-rename_clashing_md5_symbols.patch + eautoreconf } |