[145397] users/devans/GNOME-3/stable/dports/devel/dbus

[devans at macports.org]

Revision: 145397
          https://trac.macports.org/changeset/145397
Author:   devans at macports.org
Date:     2016-02-03 19:38:41 -0800 (Wed, 03 Feb 2016)
Log Message:
-----------
GNOME-3/stable: dbus, sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/devel/dbus/Portfile

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/devel/dbus/


Property changes on: users/devans/GNOME-3/stable/dports/devel/dbus
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel/dbus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/dbus:134468-145295
/users/cal/ports/devel/dbus:96570-97031
   + /branches/mld-qt-481/dports/devel/dbus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/dbus:134468-145396
/users/cal/ports/devel/dbus:96570-97031

Modified: users/devans/GNOME-3/stable/dports/devel/dbus/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/dbus/Portfile	2016-02-04 03:10:19 UTC (rev 145396)
+++ users/devans/GNOME-3/stable/dports/devel/dbus/Portfile	2016-02-04 03:38:41 UTC (rev 145397)
@@ -7,9 +7,6 @@
 name            dbus
 conflicts       dbus-devel
 version         1.10.6
-# version 1.8.18 introduces security hardening of the session bus
-# this currently breaks many GNOME 3 apps
-# hold off on updating until this is resolved (#47741)
 maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
@@ -22,21 +19,18 @@
 homepage        http://www.freedesktop.org/Software/dbus
 master_sites    http://dbus.freedesktop.org/releases/dbus
 
-checksums           rmd160  afaac55b06050bd4b80f7557fe69029dc3a820b0 \
-                    sha256  b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f
+checksums       rmd160  afaac55b06050bd4b80f7557fe69029dc3a820b0 \
+                sha256  b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f
 
 # See r59386
 # See r68276
-# poll is always broken
+# For configure
+#    poll is always broken
+#    see https://trac.macports.org/ticket/47741#comment:12 for EXTERNAL authentication
 patchfiles      patch-bus-system.conf.in.diff \
                 patch-dbus-dbus-sysdeps-unix.c.diff \
                 patch-configure.diff
 
-# See #43203
-if { ${os.major} < 11 } {
-    patchfiles-append patch-bus-dir-watch-kqueue.c.diff
-}
-
 depends_build       \
     port:pkgconfig
 
@@ -85,6 +79,7 @@
 
 configure.args  --disable-doxygen-docs \
                 --disable-xml-docs \
+                --disable-ducktype-docs \
                 --without-x \
                 --enable-launchd \
                 --with-launchd-agent-dir=${prefix}/Library/LaunchAgents \

Deleted: users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff	2016-02-04 03:10:19 UTC (rev 145396)
+++ users/devans/GNOME-3/stable/dports/devel/dbus/files/patch-bus-dir-watch-kqueue.c.diff	2016-02-04 03:38:41 UTC (rev 145397)
@@ -1,19 +0,0 @@
---- bus/dir-watch-kqueue.c.orig	2014-01-06 09:02:19.000000000 -0700
-+++ bus/dir-watch-kqueue.c	2014-04-05 06:07:05.000000000 -0700
-@@ -259,7 +259,7 @@
-           /* FIXME - less lame error handling for failing to add a watch;
-            * we may need to sleep.
-            */
--          fd = open (new_dirs[i], O_RDONLY | O_CLOEXEC);
-+          fd = open (new_dirs[i], O_RDONLY);
-           if (fd < 0)
-             {
-               if (errno != ENOENT)
-@@ -274,6 +274,7 @@
-                   continue;
-                 }
-             }
-+          _dbus_fd_set_close_on_exec(fd);
- 
-           EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
-                   NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160203/b1984f3e/attachment-0001.html>