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

[wbonnet at users.sourceforge.net]

Revision: 8891
          http://gar.svn.sourceforge.net/gar/?rev=8891&view=rev
Author:   wbonnet
Date:     2010-02-28 16:35:23 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Fix 1.3.0 compilation

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/checksums

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

Removed Paths:
-------------
    csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2010-02-28 14:56:34 UTC (rev 8890)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2010-02-28 16:35:23 UTC (rev 8891)
@@ -22,9 +22,6 @@
 CATALOGNAME_CSWdbus = dbus
 CATALOGNAME_CSWlibdbus = libdbus
 CATALOGNAME_CSWlibdbusdev = libdbusdev
-#DISTFILES    += $(call admfiles,CSWdbus, preinstall, )
-#DISTFILES    += $(call admfiles,CSWlibdbusdev, )
-#DISTFILES    += $(call admfiles,CSWlibdbus, )
 DISTFILES    += CSWdbus.preinstall
 DISTFILES    += cswdbus
 
@@ -36,7 +33,8 @@
 PKGFILES_CSWlibdbus     = $(PKGFILES_RT)
 
 # Dependencies tracking
-RUNTIME_DEP_PKGS_CSWdbus	= CSWexpat CSWlibdbus CSWcswclassutils
+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
@@ -46,8 +44,12 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-tests --with-xml=expat 
 
+EXTRA_CPPFLAGS = -D_XPG4_2
+
 BUILD64 = 1
 
+PATCHFILES += dbus-sysdeps-unix.c.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-02-28 14:56:34 UTC (rev 8890)
+++ csw/mgar/pkg/dbus/trunk/checksums	2010-02-28 16:35:23 UTC (rev 8891)
@@ -1,3 +1,4 @@
 6e26e51243c4551ac222112edf67b5db  CSWdbus.preinstall
 9222a44088c837eba62822e330de713f  cswdbus
 b3298d5ce0e4ad4731b1e4e1787d56bb  dbus-1.3.0.tar.gz
+dafb8ca4f0001dbed5334a9913781942  dbus-sysdeps-unix.c.diff

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec	2010-02-28 14:56:34 UTC (rev 8890)
+++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec	2010-02-28 16:35:23 UTC (rev 8891)
@@ -1,6 +0,0 @@
-%var            bitname dbus
-%var            pkgname CSWdbus
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      
-
-Please see /opt/csw/share/doc/%{GARNAME}/license for license information

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec	2010-02-28 14:56:34 UTC (rev 8890)
+++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec	2010-02-28 16:35:23 UTC (rev 8891)
@@ -1,6 +0,0 @@
-%var            bitname libdbus
-%var            pkgname CSWlibdbus
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      
-
-Please see /opt/csw/share/doc/lib%{GARNAME}/license for license information

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec	2010-02-28 14:56:34 UTC (rev 8890)
+++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec	2010-02-28 16:35:23 UTC (rev 8891)
@@ -1,6 +0,0 @@
-%var            bitname libdbusdev
-%var            pkgname CSWlibdbusdev
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      
-
-Please see /opt/csw/share/doc/lib%{GARNAME}dev/license for license information

Added: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	                        (rev 0)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-02-28 16:35:23 UTC (rev 8891)
@@ -0,0 +1,11 @@
+--- 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
+@@ -3043,7 +3043,7 @@
+     return -1;
+   }
+
+-#ifndef F_DUPFD_CLOEXEC
++#ifdef F_DUPFD_CLOEXEC
+   if (!cloexec_done)
+ #endif
+     {


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