garnome-2.9.91 fails on nautilus



I'm building garnome-2.9.91 on FC3 (2.9.90 has built correctly) and I
fail in the nautilus build.

Here's the output I'm seeing:

file gar-base.diff passes checksum test!
        [checksum] complete for nautilus.
install -d work/main.d  
 ==> Extracting download/nautilus-2.9.91.tar.bz2
        [extract] complete for nautilus.
 ==> Applying patch download/gar-base.diff
patching file configure 
Hunk #2 FAILED at 25119.
Hunk #3 FAILED at 25269.
2 out of 3 hunks FAILED -- saving rejects to file configure.rej
patching file configure.in
Hunk #1 succeeded at 18 with fuzz 2.
Hunk #2 FAILED at 209.  
1 out of 2 hunks FAILED -- saving rejects to file configure.in.rej
patching file src/nautilus-image-properties-page.c
Hunk #1 FAILED at 144.  
1 out of 1 hunk FAILED -- saving rejects to file
src/nautilus-image-properties-page.c.rej
make: *** [normal-patch-gar-base.diff] Error 1


the .rej file contains the following:

***************
*** 144,156 ****
  exif_content_callback (ExifContent *content, gpointer data)
  {
        struct ExifAttribute *attribute;

        attribute = (struct ExifAttribute *)data;
        if (attribute->found) {
                return;
        }
- 
          attribute->value = g_strdup (exif_content_get_value
(content, attribute->tag));
        if (attribute->value != NULL) {
                attribute->found = TRUE;
        }
--- 144,163 ----
  exif_content_callback (ExifContent *content, gpointer data)
  {
        struct ExifAttribute *attribute;
+ #ifndef HAVE_FIVE_EXIF
+       char val[4096];
+ #endif /* HAVE_FIVE_EXIF */

        attribute = (struct ExifAttribute *)data;
        if (attribute->found) {
                return;
        }
+ #ifndef HAVE_FIVE_EXIF
+         attribute->value = g_strdup (exif_content_get_value
(content, attribute->tag, val, 4096));
+ #else   
          attribute->value = g_strdup (exif_content_get_value
(content, attribute->tag));
+ #endif /* HAVE_FIVE_EXIF */
+ 
        if (attribute->value != NULL) {
                attribute->found = TRUE;
        }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]