[csw-devel] SF.net SVN: gar:[21227] csw/mgar/pkg/dbus/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu May 30 20:39:36 CEST 2013
Revision: 21227
http://gar.svn.sourceforge.net/gar/?rev=21227&view=rev
Author: dmichelsen
Date: 2013-05-30 18:39:35 +0000 (Thu, 30 May 2013)
Log Message:
-----------
dbus/trunk: Update to 1.7.2
Modified Paths:
--------------
csw/mgar/pkg/dbus/trunk/Makefile
csw/mgar/pkg/dbus/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch
csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff
Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile 2013-05-30 18:31:21 UTC (rev 21226)
+++ csw/mgar/pkg/dbus/trunk/Makefile 2013-05-30 18:39:35 UTC (rev 21227)
@@ -5,7 +5,7 @@
# ! cleanup of /usr/share, /usr/local occurrences
NAME = dbus
-VERSION = 1.7.0
+VERSION = 1.7.2
GARTYPE = v2
DESCRIPTION = DBus Message Bus System
@@ -30,10 +30,6 @@
DISTFILES += cswusergroup
DISTFILES += cswdbus
-# Use patch until this is fixed:
-# https://bugs.freedesktop.org/show_bug.cgi?id=63071
-PATCHFILES += 0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch
-
PACKAGES += CSWdbus
CATALOGNAME_CSWdbus = dbus
SPKG_DESC_CSWdbus = $(DESCRIPTION)
@@ -56,12 +52,12 @@
OBSOLETED_BY_CSWlibdbus1-3 += CSWlibdbus
# These are search pathes:
# /opt/csw/share:/usr/local/share:/usr/share:
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/libdbus-1.so.3.8.0
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.8.0
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.0
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.0
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libdbus-1.so.3.8.0
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libdbus-1.so.3.8.0
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/libdbus-1.so.3.8.1
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.8.1
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.1
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.1
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libdbus-1.so.3.8.1
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libdbus-1.so.3.8.1
PACKAGES += CSWlibdbus-dev
SPKG_DESC_CSWlibdbus-dev = Development files for libdbus
@@ -100,10 +96,6 @@
include gar/category.mk
-post-patch:
- cd $(WORKSRC) && PATH=$(prefix)/gnu:$(PATH) ./autogen.sh
- @$(MAKECOOKIE)
-
post-merge-all:
ginstall -d $(PKGROOT)/etc/opt/csw/init.d
ginstall $(WORKDIR)/cswdbus $(PKGROOT)/etc/opt/csw/init.d/cswdbus
Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums 2013-05-30 18:31:21 UTC (rev 21226)
+++ csw/mgar/pkg/dbus/trunk/checksums 2013-05-30 18:39:35 UTC (rev 21227)
@@ -1 +1 @@
-a23c223efd7003b88bef6a4d32d82a99 dbus-1.7.0.tar.gz
+72b38f1ee0b60d45fbb4d43a96ee3262 dbus-1.7.2.tar.gz
Deleted: csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch 2013-05-30 18:31:21 UTC (rev 21226)
+++ csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch 2013-05-30 18:39:35 UTC (rev 21227)
@@ -1,40 +0,0 @@
-From 713c89789b8e5f7e4a0cbe69d11d07829141201f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 3 Apr 2013 10:38:51 +0200
-Subject: [PATCH] If alloca.h is available it is required (e.g. on Solaris 10)
-
----
- configure.ac | 2 ++
- dbus/dbus-sysdeps-unix.c | 3 +++
- 2 files changed, 5 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index ee89dcb..3bd2405 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -688,6 +688,8 @@ AC_CHECK_HEADERS(ws2tcpip.h)
-
- AC_CHECK_HEADERS(wspiapi.h)
-
-+AC_CHECK_HEADERS(alloca.h)
-+
- # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris
- #
- case $host_os in
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index 30606ff..88db415 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -72,6 +72,9 @@
- #ifdef HAVE_GETPEERUCRED
- #include <ucred.h>
- #endif
-+#ifdef HAVE_ALLOCA_H
-+#include <alloca.h>
-+#endif
-
- #ifdef HAVE_ADT
- #include <bsm/adt.h>
---
-1.8.1.4
-
Deleted: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff 2013-05-30 18:31:21 UTC (rev 21226)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff 2013-05-30 18:39:35 UTC (rev 21227)
@@ -1,13 +0,0 @@
-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.
More information about the devel
mailing list