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

[wbonnet at users.sourceforge.net]

Revision: 10415
          http://gar.svn.sourceforge.net/gar/?rev=10415&view=rev
Author:   wbonnet
Date:     2010-07-04 10:12:13 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Fix patch and XDG_DATA_DIRS

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

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2010-07-04 07:33:16 UTC (rev 10414)
+++ csw/mgar/pkg/dbus/trunk/checksums	2010-07-04 10:12:13 UTC (rev 10415)
@@ -1,5 +1,5 @@
 6e26e51243c4551ac222112edf67b5db  CSWdbus.preinstall
 9222a44088c837eba62822e330de713f  cswdbus
 1aab02bdcac4d662d3760896790f0ede  dbus-1.3.1.tar.gz
-02b4d3880e26c0c190ce4f2cca78fe36  dbus-sysdeps-unix.c.diff
+6856e34f9fb52f9fd569a80576556543  dbus-sysdeps-unix.c.diff
 5d584064f7e6a50bf54750ae56d7e29e  dbus-sysdeps.h.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-07-04 07:33:16 UTC (rev 10414)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-04 10:12:13 UTC (rev 10415)
@@ -10,21 +10,12 @@
 
  #ifdef HAVE_ERRNO_H
  #include <errno.h>
-@@ -3043,7 +3043,7 @@
-     return -1;
-   }
-
--#ifndef F_DUPFD_CLOEXEC
-+#ifdef F_DUPFD_CLOEXEC
-   if (!cloexec_done)
- #endif
-     {
 @@ -3268,7 +3271,7 @@
      }
    else
      {
 -      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:"))
          goto oom;
      }
 
@@ -33,7 +24,7 @@
    else
      {
 -      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:"))
          goto oom;
      }
 


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