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

[wbonnet at users.sourceforge.net]

Revision: 10412
          http://gar.svn.sourceforge.net/gar/?rev=10412&view=rev
Author:   wbonnet
Date:     2010-07-03 22:37:54 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
Upgrade to 1.3.1 and add /opt/csw/share to XDG_DATA_DIRS

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

Added Paths:
-----------
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2010-07-03 20:40:52 UTC (rev 10411)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2010-07-03 22:37:54 UTC (rev 10412)
@@ -1,5 +1,5 @@
 GARNAME      = dbus
-GARVERSION   = 1.3.0
+GARVERSION   = 1.3.1
 CATEGORIES   = lib
 
 DESCRIPTION  = DBus Message Bus System
@@ -48,6 +48,7 @@
 BUILD64 = 1
 
 PATCHFILES += dbus-sysdeps-unix.c.diff
+PATCHFILES += dbus-sysdeps.h.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2010-07-03 20:40:52 UTC (rev 10411)
+++ csw/mgar/pkg/dbus/trunk/checksums	2010-07-03 22:37:54 UTC (rev 10412)
@@ -1,4 +1,5 @@
 6e26e51243c4551ac222112edf67b5db  CSWdbus.preinstall
 9222a44088c837eba62822e330de713f  cswdbus
-b3298d5ce0e4ad4731b1e4e1787d56bb  dbus-1.3.0.tar.gz
-be9b69b240bb99b4d71d643a77ad10e6  dbus-sysdeps-unix.c.diff
+1aab02bdcac4d662d3760896790f0ede  dbus-1.3.1.tar.gz
+02b4d3880e26c0c190ce4f2cca78fe36  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-03 20:40:52 UTC (rev 10411)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-03 22:37:54 UTC (rev 10412)
@@ -1,5 +1,5 @@
---- 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
+--- dbus-1.3.1.orig/dbus/dbus-sysdeps-unix.c    2009-07-16 16:04:55.000000000 +0200
++++ dbus-1.3.1/dbus/dbus-sysdeps-unix.c         2010-02-28 16:49:51.561773000 +0100
 @@ -54,6 +54,9 @@
  #include <netinet/in.h>
  #include <netdb.h>
@@ -19,3 +19,21 @@
    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:"))
+         goto oom;
+     }
+
+@@ -3355,7 +3358,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:"))
+         goto oom;
+     }
+

Added: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff	                        (rev 0)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff	2010-07-03 22:37:54 UTC (rev 10412)
@@ -0,0 +1,13 @@
+diff --speed-large-files --minimal -Nru  dbus-sysdeps.h.orig dbus-sysdeps.h
+--- dbus-1.3.1.orig/dbus/dbus-sysdeps.h 2010-07-03 23:01:04.802652103 +0200
++++ dbus-1.3.1/dbus/dbus-sysdeps.h      2010-07-03 23:01:16.801332639 +0200
+@@ -27,6 +27,8 @@
+
+ #include "config.h"
+
++#include <link.h>
++
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+


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