From 7c525045d49bb62e605975b5f26fdae9ddbbff14 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 25 Apr 2013 22:35:53 +0200 Subject: [PATCH] update package dbus --- index.html | 2 +- src/dbus-1-fixes.patch | 34 ---------------------------------- src/dbus.mk | 5 +++-- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 src/dbus-1-fixes.patch diff --git a/index.html b/index.html index ed74e813..6e504ce3 100644 --- a/index.html +++ b/index.html @@ -1051,7 +1051,7 @@ aptitude -t squeeze-backports install cmake yasm dbus - 1.7.0 + 1.7.2 dbus diff --git a/src/dbus-1-fixes.patch b/src/dbus-1-fixes.patch deleted file mode 100644 index 602f1695..00000000 --- a/src/dbus-1-fixes.patch +++ /dev/null @@ -1,34 +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,13 @@ - #include - #include - -+__CRT_INLINE VOID MemoryBarrier(VOID) -+{ -+ LONG Barrier = 0; -+ __asm__ __volatile__("xchgl %%eax,%0 " -+ :"=r" (Barrier)); -+} -+ - /* 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 - diff --git a/src/dbus.mk b/src/dbus.mk index cd8fa826..3ae28248 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,7 +3,7 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 676ba5211d85f5273ff5748e72e3b48b5104e7ea +$(PKG)_CHECKSUM := 6e1828dded661183cd5e852d2f50d1e45c23dcff $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) @@ -28,6 +28,7 @@ define $(PKG)_BUILD --disable-shared \ --disable-maintainer-mode \ --enable-static \ - --disable-silent-rules + --disable-silent-rules \ + CFLAGS='-DPROCESS_QUERY_LIMITED_INFORMATION=0x1000' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef