diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-04-25 00:28:33 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-04-25 00:28:33 +0000 |
| commit | 7675291d65354a6a5bba8e62581c94b38c3ba469 (patch) | |
| tree | 259b866a3286751427b2fa7dbe719b60957a6226 /media-libs/libexif | |
| parent | fix whitespace/syntax (diff) | |
| download | historical-7675291d65354a6a5bba8e62581c94b38c3ba469.tar.gz historical-7675291d65354a6a5bba8e62581c94b38c3ba469.tar.bz2 historical-7675291d65354a6a5bba8e62581c94b38c3ba469.zip | |
Fix gcc4 build failure. Patch from halcy0n's overlay.
Package-Manager: portage-2.0.51.20-r4
Diffstat (limited to 'media-libs/libexif')
| -rw-r--r-- | media-libs/libexif/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libexif/Manifest | 15 | ||||
| -rw-r--r-- | media-libs/libexif/files/libexif-0.6.12-gcc4.patch | 12 | ||||
| -rw-r--r-- | media-libs/libexif/libexif-0.6.12-r3.ebuild | 8 |
4 files changed, 31 insertions, 10 deletions
diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog index 90a9abc3d35b..9763dde004b5 100644 --- a/media-libs/libexif/ChangeLog +++ b/media-libs/libexif/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libexif # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.34 2005/04/16 18:52:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.35 2005/04/25 00:28:33 azarah Exp $ + + 25 Apr 2005; Martin Schlemmer <azarah@gentoo.org> + +files/libexif-0.6.12-gcc4.patch, libexif-0.6.12-r3.ebuild: + Fix gcc4 build failure. Patch from halcy0n's overlay. *libexif-0.6.12-r3 (16 Apr 2005) diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest index 277c8e345b2c..a198a23b6445 100644 --- a/media-libs/libexif/Manifest +++ b/media-libs/libexif/Manifest @@ -1,19 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 b81c723b51acb62821e3959a6b401603 ChangeLog 4893 +MD5 d5325497b3555e5f782c1d1e3da80410 ChangeLog 5061 +MD5 fb3163ca6913859e23532a5e09cbaf5e libexif-0.6.12-r3.ebuild 1614 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259 MD5 a75e1a14e52213457be999a46c9392ed libexif-0.5.12-r2.ebuild 1125 -MD5 6bd478cbaa71caa506a919e7ac85f7fd libexif-0.6.12-r3.ebuild 1559 +MD5 0847d4ce556a73514f3fbbf303707e07 files/digest-libexif-0.6.12-r3 66 MD5 c6e7ee4006cd2b5bd7cb0367f816fc8a files/digest-libexif-0.5.12-r2 66 -MD5 656d5fb19cf1cdef7132ccb6fa72db2b files/libexif-0.6-CAN-2005-0664.patch 833 MD5 a8085215f21d54708b3bfca3e1aeb612 files/libexif-0.5-CAN-2005-0664.patch 860 -MD5 0847d4ce556a73514f3fbbf303707e07 files/digest-libexif-0.6.12-r3 66 +MD5 656d5fb19cf1cdef7132ccb6fa72db2b files/libexif-0.6-CAN-2005-0664.patch 833 MD5 a218f0d3896c793cf66fc505f743ef3b files/libexif-0.6.12-86740.patch 627 +MD5 1cf86cdf4e82ee2c2b92a57348d30ae1 files/libexif-0.6.12-gcc4.patch 391 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCYV9EArHZZzCEUG0RAoyJAJ99H+WIFIbT+/xz3PRRIy+NI5UrqgCfTQ0o -l4DKefxd68TQa129+7Yo1GI= -=pnhS +iD8DBQFCbDqz1ZcsMnZjRyIRAtwFAJ9ljAarYQumCt870cguICVqWNk4awCgpCri +YYg9e03WSOr6jGfmwBgnQAc= +=hUPH -----END PGP SIGNATURE----- diff --git a/media-libs/libexif/files/libexif-0.6.12-gcc4.patch b/media-libs/libexif/files/libexif-0.6.12-gcc4.patch new file mode 100644 index 000000000000..920a09c787b2 --- /dev/null +++ b/media-libs/libexif/files/libexif-0.6.12-gcc4.patch @@ -0,0 +1,12 @@ +diff -ur libexif-0.6.12-orig/libexif/exif-utils.c libexif-0.6.12/libexif/exif-utils.c +--- libexif-0.6.12-orig/libexif/exif-utils.c 2005-04-06 23:50:37.000000000 -0400 ++++ libexif-0.6.12/libexif/exif-utils.c 2005-04-06 23:51:09.000000000 -0400 +@@ -83,7 +83,7 @@ + } + } + +-static ExifSShort ++ExifSShort + exif_get_sshort (const unsigned char *buf, ExifByteOrder order) + { + if (!buf) return 0; diff --git a/media-libs/libexif/libexif-0.6.12-r3.ebuild b/media-libs/libexif/libexif-0.6.12-r3.ebuild index a353da20b9a8..5d8471987a45 100644 --- a/media-libs/libexif/libexif-0.6.12-r3.ebuild +++ b/media-libs/libexif/libexif-0.6.12-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.12-r3.ebuild,v 1.1 2005/04/16 18:52:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.12-r3.ebuild,v 1.2 2005/04/25 00:28:33 azarah Exp $ inherit eutils @@ -26,7 +26,11 @@ src_unpack() { # be fixed in 0.6.13 at which point LIBEXIF_AGE should be removed here. sed -i 's/^LIBEXIF_AGE=0$/LIBEXIF_AGE=2/' ${S}/configure sed -i 's/^LIBEXIF_REVISION=0$/LIBEXIF_REVISION=2/' ${S}/configure - sed -i 's/^LIBEXIF_VERSION_INFO=.*$/LIBEXIF_VERSION_INFO=$LIBEXIF_CURRENT:$LIBEXIF_AGE:$LIBEXIF_REVISION/' ${S}/configure + sed -i 's/^LIBEXIF_VERSION_INFO=.*$/LIBEXIF_VERSION_INFO=$LIBEXIF_CURRENT:$LIBEXIF_AGE:$LIBEXIF_REVISION/' \ + ${S}/configure + + # Fix gcc4 build + epatch ${FILESDIR}/${P}-gcc4.patch } src_compile() { |