Mercurial > mxe-octave
changeset 1530:dc693d2ea488
new package dbus
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Tue, 04 Jan 2011 01:16:11 +0100 |
parents | 6aae881567fc |
children | 3d2a35555fd3 |
files | src/dbus-1-fixes.patch src/dbus.mk |
diffstat | 2 files changed, 126 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dbus-1-fixes.patch Tue Jan 04 01:16:11 2011 +0100 @@ -0,0 +1,92 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Taken from https://bugs.freedesktop.org/show_bug.cgi?id=32805 + +From 3266c13ab957fccb20ae811f044feb7eff66f4bb Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 4 Jan 2011 00:46:29 +0100 +Subject: [PATCH 1/2] sysdeps-win needs _dbus_path_is_absolute + + +diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c +index 2f21409..9a056ec 100644 +--- a/dbus/dbus-sysdeps-util-win.c ++++ b/dbus/dbus-sysdeps-util-win.c +@@ -677,23 +677,6 @@ _dbus_directory_close (DBusDirIter *iter) + dbus_free (iter); + } + +-/** +- * Checks whether the filename is an absolute path +- * +- * @param filename the filename +- * @returns #TRUE if an absolute path +- */ +-dbus_bool_t +-_dbus_path_is_absolute (const DBusString *filename) +-{ +- if (_dbus_string_get_length (filename) > 0) +- return _dbus_string_get_byte (filename, 1) == ':' +- || _dbus_string_get_byte (filename, 0) == '\\' +- || _dbus_string_get_byte (filename, 0) == '/'; +- else +- return FALSE; +-} +- + /** @} */ /* End of DBusInternalsUtils functions */ + + /** +diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c +index b70ac6a..19f6fa0 100644 +--- a/dbus/dbus-sysdeps-win.c ++++ b/dbus/dbus-sysdeps-win.c +@@ -3557,6 +3557,23 @@ _dbus_delete_directory (const DBusString *filename, + return TRUE; + } + ++/** ++ * Checks whether the filename is an absolute path ++ * ++ * @param filename the filename ++ * @returns #TRUE if an absolute path ++ */ ++dbus_bool_t ++_dbus_path_is_absolute (const DBusString *filename) ++{ ++ if (_dbus_string_get_length (filename) > 0) ++ return _dbus_string_get_byte (filename, 1) == ':' ++ || _dbus_string_get_byte (filename, 0) == '\\' ++ || _dbus_string_get_byte (filename, 0) == '/'; ++ else ++ return FALSE; ++} ++ + /** @} end of sysdeps-win */ + /* tests in dbus-sysdeps-util.c */ + +-- +1.7.1 + + +From 7241e09abbfc2021f2a7e5cbded70222023fa7e6 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 4 Jan 2011 00:47:49 +0100 +Subject: [PATCH 2/2] always static in mingw-cross-env + + +diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h +index d1e40ec..3a32355 100644 +--- a/dbus/dbus-macros.h ++++ b/dbus/dbus-macros.h +@@ -158,6 +158,7 @@ + */ + + #if defined(_WIN32) ++# define DBUS_STATIC_BUILD + # if defined(DBUS_STATIC_BUILD) + # define DBUS_EXPORT + # elif defined(dbus_1_EXPORTS) +-- +1.7.1 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dbus.mk Tue Jan 04 01:16:11 2011 +0100 @@ -0,0 +1,34 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# dbus +PKG := dbus +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.4.1 +$(PKG)_CHECKSUM := 112279ff58305027294fe0eb5bee600f68cf0b50 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://$(PKG).freedesktop.org/ +$(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \ + $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ + grep -v '^1\.[0123]\.' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --with-xml=expat \ + --disable-tests \ + --disable-verbose-mode \ + --disable-asserts \ + --disable-shared \ + --enable-static \ + --disable-silent-rules + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef