Mercurial > mxe-octave

changeset 5000:4c5a70572b2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dbus: update to v1.13.8 * src/dbus-1-fixes.patch: new file * dist-files.mk: add ref to patch file * src/dbus.mk: update version, checksum
author John Donoghue
date Tue, 05 Mar 2019 16:59:45 -0500
parents e844d1fea130
children f3b328797f5b
files dist-files.mk src/dbus-1-fixes.patch src/dbus.mk
diffstat 3 files changed, 40 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Mar 05 12:33:01 2019 -0500
+++ b/dist-files.mk	Tue Mar 05 16:59:45 2019 -0500
@@ -65,6 +65,7 @@
   curl-test.c \
   curl.mk \
   damageproto.mk \
+  dbus-1-fixes.patch \
   dbus.mk \
   dcmtk-1-fixes.patch \
   dcmtk-2-ming64.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dbus-1-fixes.patch	Tue Mar 05 16:59:45 2019 -0500
@@ -0,0 +1,32 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: darealshinji <djcj@gmx.de>
+Date: Mon, 3 Jul 2017 01:55:45 +0200
+Subject: [PATCH 1/1] Avoid multiple definitions of DllMain in static builds
+
+
+diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c
+index 1111111..2222222 100644
+--- a/dbus/dbus-sysdeps-thread-win.c
++++ b/dbus/dbus-sysdeps-thread-win.c
+@@ -69,6 +69,8 @@ _dbus_win_get_dll_hmodule (void)
+ #define hinst_t HINSTANCE
+ #endif
+ 
++#ifndef DBUS_STATIC_BUILD
++
+ BOOL WINAPI DllMain (hinst_t, DWORD, LPVOID);
+ 
+ /* We need this to free the TLS events on thread exit */
+@@ -107,6 +109,8 @@ DllMain (hinst_t hinstDLL,
+   return TRUE;
+ }
+ 
++#endif /* !DBUS_STATIC_BUILD */
++
+ DBusCMutex *
+ _dbus_platform_cmutex_new (void)
+ {
--- a/src/dbus.mk	Tue Mar 05 12:33:01 2019 -0500
+++ b/src/dbus.mk	Tue Mar 05 16:59:45 2019 -0500
@@ -3,31 +3,29 @@
 
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.10.0
-$(PKG)_CHECKSUM := eec3c798633f623e960eb1d9f93b47648f389443
+$(PKG)_VERSION  := 1.13.8
+$(PKG)_CHECKSUM := 6e9a99e0140f71800c1ed6283af80c26f7e3f39b
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := expat
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \
-    $(SED) -n "s,.*<a href='[^']*/tag/?h=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
-    grep -v '^1\.[01234]\.' | \
-    head -1
+    $(SED) -n "s,.*<a href='[^']*/tag/?h=dbus-\\([0-9][^']*\\)'.*,\\1,p" | \
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
-        --localstatedir=/var \
-        --with-xml=expat \
         --disable-tests \
         --disable-verbose-mode \
         --disable-asserts \
-        $(ENABLE_SHARED_OR_STATIC) \
         --disable-maintainer-mode \
         --disable-silent-rules \
         --disable-launchd \