Mercurial > mxe-octave

changeset 3264:c2d8a4fbfb32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new version of dbus
author John W. Eaton <jwe@octave.org>
date Wed, 16 Oct 2013 22:49:13 -0400
parents d14aa99add06
children 4ffe93bd5b54
files index.html src/dbus-1-fixes.patch src/dbus.mk
diffstat 3 files changed, 5 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Wed Oct 16 22:45:24 2013 -0400
+++ b/index.html	Wed Oct 16 22:49:13 2013 -0400
@@ -1103,7 +1103,7 @@
     </tr>
     <tr>
         <td id="dbus-package">dbus</td>
-        <td id="dbus-version">1.6.8</td>
+        <td id="dbus-version">1.7.6</td>
         <td id="dbus-website"><a href="http://dbus.freedesktop.org/">dbus</a></td>
     </tr>
     <tr>
--- a/src/dbus-1-fixes.patch	Wed Oct 16 22:45:24 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Fri, 23 Sep 2011 16:24:46 +0200
-Subject: [PATCH 1/1] add missing MemoryBarrier (MXE specific)
-
-Windows API has this, but it's not in MinGW.
-See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html
-
-diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
-index b492b09..082225f 100644
---- a/dbus/dbus-sysdeps-win.c
-+++ b/dbus/dbus-sysdeps-win.c
-@@ -55,6 +55,15 @@
- #include <ws2tcpip.h>
- #include <wincrypt.h>
- 
-+#ifdef __GNUC__
-+__CRT_INLINE VOID MemoryBarrier(VOID)
-+{
-+  LONG Barrier = 0;
-+  __asm__ __volatile__("xchgl %%eax,%0 "
-+    :"=r" (Barrier));
-+}
-+#endif
-+
- /* Declarations missing in mingw's headers */
- extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR  StringSid, PSID *Sid);
- extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
--- 
-1.7.6.3
-
--- a/src/dbus.mk	Wed Oct 16 22:45:24 2013 -0400
+++ b/src/dbus.mk	Wed Oct 16 22:49:13 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := d9634807d1de9b64727ae2178e3af2227fca0fca
+$(PKG)_CHECKSUM := 3b2b5375251408c524519ef8a418ad5681832876
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE)
@@ -28,7 +28,10 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-maintainer-mode \
         --disable-silent-rules \
+        --disable-launchd \
         --disable-doxygen-docs \
+        --disable-xml-docs \
+        CFLAGS='-DPROCESS_QUERY_LIMITED_INFORMATION=0x1000' \
 	&& $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef