dbus/dbus.patch

Thu, 08 Jan 2009 18:28:40 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 08 Jan 2009 18:28:40 +0100
changeset 45
d2954f86e9e6
child 76
11e79e472059
permissions
-rw-r--r--

Depend on sed, grep, and binutils, because libtool hard codes values.
This unfortunate dependency change is necessary because the main
program script calls helper tools from hard coded paths. Please
see /pfx/bin/libtool:77 for the example SED="/pfx/bin/sed".

     1 Index: dbus/dbus-internals.c
     2 --- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
     3 +++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
     4 @@ -512,6 +512,14 @@
     5    uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
     7    _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
     8 +
     9 +  /* brand UUID as variant DCE 1.1 */
    10 +  uuid->as_bytes[8] &= ~0xc0;
    11 +  uuid->as_bytes[8] |= (0x02 << 6);
    12 +
    13 +  /* brand UUID as version 4 */
    14 +  uuid->as_bytes[6] &= ~0xf0;
    15 +  uuid->as_bytes[6] |= (0x04 << 4);
    16  }
    18  /**
    19 Index: dbus/dbus-sysdeps-util-unix.c
    20 --- dbus/dbus-sysdeps-util-unix.c.orig	2006-11-02 20:19:08 +0100
    21 +++ dbus/dbus-sysdeps-util-unix.c	2006-11-18 12:33:22 +0100
    22 @@ -31,6 +31,7 @@
    23  #include "dbus-test.h"
    25  #include <sys/types.h>
    26 +#include <sys/param.h>
    27  #include <stdlib.h>
    28  #include <string.h>
    29  #include <signal.h>
    30 @@ -526,6 +527,8 @@
    31  #   else
    32  #       if defined(NAME_MAX)
    33  	 name_max = NAME_MAX;
    34 +#       elif defined(MAXPATHLEN)
    35 +	 name_max = MAXPATHLEN;
    36  #       else
    37  #           error "buffer size for readdir_r cannot be determined"
    38  #       endif

mercurial