[csw-devel] SF.net SVN: gar:[8897] csw/mgar/pkg/dbus/trunk

[wbonnet at users.sourceforge.net]

Revision: 8897
          http://gar.svn.sourceforge.net/gar/?rev=8897&view=rev
Author:   wbonnet
Date:     2010-02-28 20:44:45 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Fix patchfile

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/checksums
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2010-02-28 19:56:50 UTC (rev 8896)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2010-02-28 20:44:45 UTC (rev 8897)
@@ -34,7 +34,6 @@
 
 # Dependencies tracking
 RUNTIME_DEP_PKGS_CSWdbus	    = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11
-RUNTIME_DEP_PKGS_CSWlibdbus	    = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11
 RUNTIME_DEP_PKGS_CSWlibdbusdev  = CSWlibdbus
 
 # SMF support

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2010-02-28 19:56:50 UTC (rev 8896)
+++ csw/mgar/pkg/dbus/trunk/checksums	2010-02-28 20:44:45 UTC (rev 8897)
@@ -1,4 +1,4 @@
 6e26e51243c4551ac222112edf67b5db  CSWdbus.preinstall
 9222a44088c837eba62822e330de713f  cswdbus
 b3298d5ce0e4ad4731b1e4e1787d56bb  dbus-1.3.0.tar.gz
-93b5c6010c99156785f4cbffbd116827  dbus-sysdeps-unix.c.diff
+3b5c099d55cca083d873ccf29adac63f  dbus-sysdeps-unix.c.diff

Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-02-28 19:56:50 UTC (rev 8896)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-02-28 20:44:45 UTC (rev 8897)
@@ -1,10 +1,18 @@
 --- dbus-1.3.0.orig/dbus/dbus-sysdeps-unix.c    2009-07-16 16:04:55.000000000 +0200
 +++ dbus-1.3.0/dbus/dbus-sysdeps-unix.c         2010-02-28 16:49:51.561773000 +0100
-@@ -54,6 +54,7 @@
+@@ -54,6 +54,15 @@
  #include <netinet/in.h>
  #include <netdb.h>
  #include <grp.h>
++#ifndef sun
 +#include <alloca.h>
++#ifndef CMSG_SPACE
++#define CMSG_SPACE(l) ((size_t)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l)))
++#endif
++#ifndef CMSG_LEN
++#define CMSG_LEN(l) ((size_t)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l))
++#endif
++#endif
 
  #ifdef HAVE_ERRNO_H
  #include <errno.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.