Thu Aug 9 10:21:19 2012 UTC ()
Fix a couple of compile problems on Solaris.


(jperkin)
diff -r1.39 -r1.40 pkgsrc/sysutils/dbus/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/dbus/patches/patch-configure
diff -r0 -r1.1 pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c
cvs diff -r1.39 -r1.40 pkgsrc/sysutils/dbus/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/distinfo 2012/08/01 17:52:21 1.39
+++ pkgsrc/sysutils/dbus/distinfo 2012/08/09 10:21:19 1.40
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1$NetBSD: distinfo,v 1.39 2012/08/01 17:52:21 drochner Exp $ 1$NetBSD: distinfo,v 1.40 2012/08/09 10:21:19 jperkin Exp $
2 2
3SHA1 (dbus-1.6.4.tar.gz) = 17e619f008301592b7f01a60e7cf18e2752b5270 3SHA1 (dbus-1.6.4.tar.gz) = 17e619f008301592b7f01a60e7cf18e2752b5270
4RMD160 (dbus-1.6.4.tar.gz) = 041ad41c26f38647f3da8d7f0cb548c979521def 4RMD160 (dbus-1.6.4.tar.gz) = 041ad41c26f38647f3da8d7f0cb548c979521def
5Size (dbus-1.6.4.tar.gz) = 1927446 bytes 5Size (dbus-1.6.4.tar.gz) = 1927446 bytes
6SHA1 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4 6SHA1 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4
7SHA1 (patch-ab) = 1edd2dfd566b96a8908af2efa37d905919f07713 7SHA1 (patch-ab) = 1edd2dfd566b96a8908af2efa37d905919f07713
8SHA1 (patch-ak) = fcb0cad1b6e306db03d538d4ca65f4a18d4726ab 8SHA1 (patch-ak) = fcb0cad1b6e306db03d538d4ca65f4a18d4726ab
9SHA1 (patch-al) = 3f9f793b0c1455bf2bf079cc27b841c22f42c276 9SHA1 (patch-al) = 3f9f793b0c1455bf2bf079cc27b841c22f42c276
10SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8 10SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
11SHA1 (patch-ba) = ceb8e0c424c57410f8c3775087e4cae1b44da4c5 11SHA1 (patch-ba) = ceb8e0c424c57410f8c3775087e4cae1b44da4c5
 12SHA1 (patch-configure) = 829024482acb89fa12fa47fd42b171cc02efbb89
 13SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 79ff84b20dff597001e4e150c9ab27b05d6ff2a1
File Added: pkgsrc/sysutils/dbus/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2012/08/09 10:21:19 jperkin Exp $

Require _XOPEN_SOURCE=600 on Solaris for sockaddr_in6 and sockaddr_storage.

--- configure.orig	Thu Aug  9 09:32:17 2012
+++ configure	Thu Aug  9 09:36:08 2012
@@ -21706,7 +21706,7 @@
         # Solaris' C library apparently needs these runes to be threadsafe...
         CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
         # ... and this opt-in to get file descriptor passing support
-        CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
+        CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
         ;;
 esac
File Added: pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c
$NetBSD: patch-dbus_dbus-sysdeps-util-unix.c,v 1.1 2012/08/09 10:21:19 jperkin Exp $

HAVE_DECL_LOG_PERROR is always defined, we care more whether it is 0 or 1.

--- dbus/dbus-sysdeps-util-unix.c.orig	Thu Aug  9 10:07:27 2012
+++ dbus/dbus-sysdeps-util-unix.c	Thu Aug  9 10:07:33 2012
@@ -424,7 +424,7 @@
 void
 _dbus_init_system_log (void)
 {
-#ifdef HAVE_DECL_LOG_PERROR
+#if HAVE_DECL_LOG_PERROR
   openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
 #else
   openlog ("dbus", LOG_PID, LOG_DAEMON);