ports/72643: [patch] graphics/eog2 - fix build with libexif 0.6.10

[Christian Hiris]

>Number:         72643
>Category:       ports
>Synopsis:       [patch] graphics/eog2 - fix build with libexif 0.6.10
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 13 14:30:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Christian Hiris
>Release:        FreeBSD 5.3-BETA7 i386
>Organization:
>Environment:


System: FreeBSD 5.3-BETA7 #0: Mon Oct 11 04:16:32 CEST 2004
    pfnu at matrix010.matrix.net:/usr/obj/usr/src/sys/MATRIX010



>Description:


eog-2.6.1 build target fails.


>How-To-Repeat:



jail003# cd /usr/ports/graphics/eog2
cc -DHAVE_CONFIG_H -I. -I. -I.. -DGNOMELOCALEDIR=\""/usr/X11R6/share/locale"\" -DG_LOG_DOMAIN=\"Eog\"                                           -DHAVE_COLLECTION                                               -DDATADIR=\""/usr/X11R6/share/gnome"\"                                  -I. -I..                               -I../src                                         -I../jpegutils                 -I..                                             -D_REENTRANT -DORBIT2=1 -DXTHREADS -DXUSE_MTSAFE_API -I/usr/local/include/atk-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/bonobo-activation-2.0 -I/usr/local/include/orbit-2.0 -I/usr/local/include/libart-2.0 -I/usr/local/include/libbonobo-2.0 -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/local/include/libexif -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/X11R6/include/pango-1.0 -I/usr/local/include/freetype2 -I/usr/X11R6/include/gnome-vfs-
 2.0 -I/usr/X11R6/lib/gnome-vfs-2.0/include -I/usr/X11R6/include/libgnomeui-2.0 -I/usr/X11R6/include/libgnome-2.0 -I/usr/X11R6/include/libgnomecanvas-2.0 -I/usr/X11R6/include/gconf/2 -I/usr/X11R6/include/libbonoboui-2.0 -I/usr/X11R6/include/libglade-2.0 -I/usr/X11R6/include/eel-2 -I/usr/X11R6/include/gail-1.0 -I/usr/X11R6/include/libgnomeprintui-2.2 -I/usr/X11R6/include/libgnomeprint-2.2                                                     -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations   -I/usr/local/include -I/usr/X11R6/include  -O -pipe  -c eog-info-view.c
eog-info-view.c: In function `exif_entry_cb':
eog-info-view.c:258: error: too few arguments to function `exif_entry_get_value'
eog-info-view.c:262: error: too few arguments to function `exif_entry_get_value'
gmake[3]: *** [eog-info-view.o] Error 1
gmake[3]: Leaving directory `/usr/wrkdir/usr/ports/graphics/eog2/work/eog-2.6.1/libeog'
gmake[2]: *** [all-recursive] Error 1
gmake[2]: Leaving directory `/usr/wrkdir/usr/ports/graphics/eog2/work/eog-2.6.1/libeog'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/usr/wrkdir/usr/ports/graphics/eog2/work/eog-2.6.1
gmake: *** [all-recursive-am] Error 2
*** Error code 2

Stop in /usr/ports/graphics/eog2.
*** Error code 1


>Fix:


--- patch-eog-info-view.c begins here ---
--- libeog/eog-info-view.c.orig	Sun Feb 15 16:33:11 2004
+++ libeog/eog-info-view.c	Wed Oct 13 15:59:50 2004
@@ -246,6 +246,7 @@
 	EogInfoView *view;
 	EogInfoViewPrivate *priv;
 	char *path;
+	char *entryvalue;
 
 	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, entryvalue, entry->size));	
 	}
 	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, entryvalue, entry->size));	
 
 		g_hash_table_insert (priv->id_path_hash,
 				     GINT_TO_POINTER (entry->tag),
--- patch-eog-info-view.c ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: