diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus-1-fixes.patch | 70 | ||||
| -rw-r--r-- | src/dbus.mk | 4 |
2 files changed, 3 insertions, 71 deletions
diff --git a/src/dbus-1-fixes.patch b/src/dbus-1-fixes.patch index f5843c1..41878d9 100644 --- a/src/dbus-1-fixes.patch +++ b/src/dbus-1-fixes.patch @@ -1,78 +1,10 @@ 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 +Subject: [PATCH 1/1] always static in mingw-cross-env diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h diff --git a/src/dbus.mk b/src/dbus.mk index b98e8cc..60d7324 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -4,8 +4,8 @@ # dbus PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.6 -$(PKG)_CHECKSUM := e87520518dfa0bfc4b8791105673e48f993874d7 +$(PKG)_VERSION := 1.5.0 +$(PKG)_CHECKSUM := 4f0c82af6de628d7359dcdbc0da402f8e369e367 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://$(PKG).freedesktop.org/ |