[pkgsrc/trunk]: pkgsrc/sysutils/nautilus Remove a C99ism introduced by a loca...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1a8ea01b512
branches:  trunk
changeset: 482802:e1a8ea01b512
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Nov 03 12:40:53 2004 +0000

description:
Remove a C99ism introduced by a local patch (hi drochner@!).  Should fix
the build with GCC 2.95.  While here, fix indentation of the lines modified
by the patch.

diffstat:

 sysutils/nautilus/distinfo         |   4 ++--
 sysutils/nautilus/patches/patch-aj |  17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r d44a0920786a -r e1a8ea01b512 sysutils/nautilus/distinfo
--- a/sysutils/nautilus/distinfo        Wed Nov 03 11:36:23 2004 +0000
+++ b/sysutils/nautilus/distinfo        Wed Nov 03 12:40:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2004/10/27 19:33:37 drochner Exp $
+$NetBSD: distinfo,v 1.16 2004/11/03 12:40:53 jmmv Exp $
 
 SHA1 (nautilus-2.8.1.tar.bz2) = 76ef92ee99365c56528b16ba5edf1f652edcc97f
 Size (nautilus-2.8.1.tar.bz2) = 5767420 bytes
@@ -7,4 +7,4 @@
 SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057
 SHA1 (patch-ah) = 081da3e950f04573e136b6ed8c1ce0d057e803c5
 SHA1 (patch-ai) = fe69717dce315877966e7c4d394ddfdcfd379bde
-SHA1 (patch-aj) = 325018516f0d4566af893d0d88f00e055348c0a5
+SHA1 (patch-aj) = 7e4ed40cb7acbf363a4722d2a033e92db93483ed
diff -r d44a0920786a -r e1a8ea01b512 sysutils/nautilus/patches/patch-aj
--- a/sysutils/nautilus/patches/patch-aj        Wed Nov 03 11:36:23 2004 +0000
+++ b/sysutils/nautilus/patches/patch-aj        Wed Nov 03 12:40:53 2004 +0000
@@ -1,14 +1,21 @@
-$NetBSD: patch-aj,v 1.1 2004/10/27 19:33:37 drochner Exp $
+$NetBSD: patch-aj,v 1.2 2004/11/03 12:40:53 jmmv Exp $
 
---- components/image_properties/nautilus-image-properties-view.c.orig  2004-10-11 20:22:21.000000000 +0200
+--- components/image_properties/nautilus-image-properties-view.c.orig  2004-03-09 12:23:37.000000000 +0100
 +++ components/image_properties/nautilus-image-properties-view.c
-@@ -130,7 +130,8 @@ exif_content_callback (ExifContent *cont
+@@ -123,6 +123,7 @@ exif_string_to_utf8 (const char *exif_st
+ static void
+ exif_content_callback (ExifContent *content, gpointer data)
+ {
++      char value[1024];
+       struct ExifAttribute *attribute;
+ 
+       attribute = (struct ExifAttribute *)data;
+@@ -130,7 +131,7 @@ exif_content_callback (ExifContent *cont
                return;
        }
  
 -        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag));
-+      char value[1024];
-+        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value)));
++      attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value)));
        if (attribute->value != NULL) {
                attribute->found = TRUE;
        }