summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-11-03 12:40:53 +0000
committerjmmv <jmmv@pkgsrc.org>2004-11-03 12:40:53 +0000
commitd966f22979ebe0d392e2cca2da48efacbe45feec (patch)
tree10d02987f2a558b328117b72a9a13c286c27a80a /sysutils
parenteb8514afe2a059ec1172a69486a2832fd351cd9c (diff)
downloadpkgsrc-d966f22979ebe0d392e2cca2da48efacbe45feec.tar.gz
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 (limited to 'sysutils')
-rw-r--r--sysutils/nautilus/distinfo4
-rw-r--r--sysutils/nautilus/patches/patch-aj17
2 files changed, 14 insertions, 7 deletions
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index bba246f0aa1..4caafb43cb5 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -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-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124
SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057
SHA1 (patch-ah) = 081da3e950f04573e136b6ed8c1ce0d057e803c5
SHA1 (patch-ai) = fe69717dce315877966e7c4d394ddfdcfd379bde
-SHA1 (patch-aj) = 325018516f0d4566af893d0d88f00e055348c0a5
+SHA1 (patch-aj) = 7e4ed40cb7acbf363a4722d2a033e92db93483ed
diff --git a/sysutils/nautilus/patches/patch-aj b/sysutils/nautilus/patches/patch-aj
index 9f4c0500e98..f07a4582b16 100644
--- a/sysutils/nautilus/patches/patch-aj
+++ b/sysutils/nautilus/patches/patch-aj
@@ -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;
}