diff options
| author |   Scott W Taylor <swtaylor@gentoo.org> | 2004-09-28 21:43:53 +0000 |
|---|---|---|
| committer | Scott W Taylor <swtaylor@gentoo.org> | 2004-09-28 21:43:53 +0000 |
| commit | 79ae5d69439d7189364b18d06d440f618c4d72c9 (patch) | |
| tree | 09c4c75d6f527d6db06cb46c8b525e6749e1d961 /media-gfx | |
| parent | Bump revision to carry out mozilla.eclass change: don't use typeaheadfind on ... (diff) | |
| download | historical-79ae5d69439d7189364b18d06d440f618c4d72c9.tar.gz historical-79ae5d69439d7189364b18d06d440f618c4d72c9.tar.bz2 historical-79ae5d69439d7189364b18d06d440f618c4d72c9.zip | |
plays nicely with libexif-0.6
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/eog/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/eog/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/eog/eog-2.6.1.ebuild | 10 | ||||
| -rw-r--r-- | media-gfx/eog/files/eog-2.6.1-libexif-0.6.patch | 24 |
4 files changed, 40 insertions, 5 deletions
diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog index a895a37f81b1..11d60f228cb4 100644 --- a/media-gfx/eog/ChangeLog +++ b/media-gfx/eog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/eog # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.71 2004/09/17 11:52:11 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.72 2004/09/28 21:43:53 swtaylor Exp $ + + 28 Sep 2004; Scott W Taylor <swtaylor@gentoo.org> + +files/eog-2.6.1-libexif-0.6.patch, eog-2.6.1.ebuild: + now happy with libexif-0.6, same type fix as in 13463 *eog-2.8.0 (17 Sep 2004) diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index 5b840cdf10f1..2029350c7d0f 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,10 +1,10 @@ MD5 2bbe9d809b424a3886fa6b915e4feab6 eog-2.8.0.ebuild 960 MD5 47edb7933c5e46f8b4ce1378d59962f5 eog-2.4.0.ebuild 994 -MD5 152b28c6bf59aa64f6bcfadc1f91fe75 eog-2.6.1.ebuild 1049 +MD5 aeaaf7e775344cd63677eeaf111d2867 eog-2.6.1.ebuild 1183 MD5 bc036c5a072ba31b5bb6ead1d4e81b88 eog-0.6-r4.ebuild 1195 MD5 086d3091d5e47bcde23c25307682a8b5 eog-2.6.0.ebuild 1059 MD5 f3fceea8d58c7d4ee9aaa14255a11039 eog-2.4.1.ebuild 995 -MD5 f8bad34a39b0642153fc8ccb75a041c3 ChangeLog 7710 +MD5 3b77b373826b69a73fbdf31ca8b345ff ChangeLog 7878 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 f4785b67530bea551199881bc37d55d5 files/eog-0.6-version_locale_dirs.patch 828 MD5 41a7979701c834c2af2d1c29e7a8a05d files/digest-eog-2.4.0 62 @@ -13,3 +13,4 @@ MD5 e4ce8f392d4068d662dccbe689f0a15b files/digest-eog-2.6.0 62 MD5 33ac43d9bde575c401a8e0d7b5c262f1 files/digest-eog-2.6.1 62 MD5 180f0c1f7a0fe0c11a69f72afff884ee files/digest-eog-2.8.0 62 MD5 5f786f0751774fc1e127d27e4f0c31e9 files/digest-eog-0.6-r4 59 +MD5 41e5e4c0309cd1ceec58bee66659ffbb files/eog-2.6.1-libexif-0.6.patch 912 diff --git a/media-gfx/eog/eog-2.6.1.ebuild b/media-gfx/eog/eog-2.6.1.ebuild index 80777f2c723a..2d1f17463795 100644 --- a/media-gfx/eog/eog-2.6.1.ebuild +++ b/media-gfx/eog/eog-2.6.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.6.1.ebuild,v 1.8 2004/08/22 19:03:58 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.6.1.ebuild,v 1.9 2004/09/28 21:43:53 swtaylor Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="Eye Of Gnome, an image viewer" HOMEPAGE="http://www.gnome.org/" @@ -35,3 +35,9 @@ DEPEND="${RDEPEND} G2CONF="${G2CONF} $(use_with jpeg libjpeg) $(use_with jpeg libexif)" DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS TODO" + +src_unpack() { + unpack ${A} + cd ${S} + has_version '>=media-libs/libexif-0.6' && epatch ${FILESDIR}/${P}-libexif-0.6.patch +} diff --git a/media-gfx/eog/files/eog-2.6.1-libexif-0.6.patch b/media-gfx/eog/files/eog-2.6.1-libexif-0.6.patch new file mode 100644 index 000000000000..d8ce462efdca --- /dev/null +++ b/media-gfx/eog/files/eog-2.6.1-libexif-0.6.patch @@ -0,0 +1,24 @@ +--- libeog/eog-info-view.c.orig 2004-09-28 13:41:23.987814033 -0600 ++++ libeog/eog-info-view.c 2004-09-28 13:43:09.522474289 -0600 +@@ -246,6 +246,7 @@ + EogInfoView *view; + EogInfoViewPrivate *priv; + char *path; ++ char b[1024]; + + view = EOG_INFO_VIEW (data); + priv = view->priv; +@@ -255,11 +256,11 @@ + path = g_hash_table_lookup (priv->id_path_hash, GINT_TO_POINTER (entry->tag)); + + if (path != NULL) { +- set_row_data (store, path, exif_tag_get_name (entry->tag), exif_entry_get_value (entry)); ++ set_row_data (store, path, exif_tag_get_name (entry->tag), exif_entry_get_value (entry, b, sizeof(b))); + } + else { + path = set_row_data (store, NULL, +- exif_tag_get_name (entry->tag), exif_entry_get_value (entry)); ++ exif_tag_get_name (entry->tag), exif_entry_get_value (entry, b, sizeof(b))); + + g_hash_table_insert (priv->id_path_hash, + GINT_TO_POINTER (entry->tag), |