# HG changeset patch # User Michael Goffioul # Date 1384057684 18000 # Node ID 42a34b8928a638b1cb9ab028ca4c70ebeb205596 # Parent 8f0877237c5575c70b30ba776ed7eecc8f5296c2 [MSVC] Update patch to newer dbus. diff -r 8f0877237c55 -r 42a34b8928a6 src/msvc-dbus-1.patch --- a/src/msvc-dbus-1.patch Sat Nov 09 23:28:04 2013 -0500 +++ b/src/msvc-dbus-1.patch Sat Nov 09 23:28:04 2013 -0500 @@ -1,19 +1,19 @@ -diff -ur dbus-1.6.8-orig/dbus/Makefile.in dbus-1.6.8/dbus/Makefile.in ---- dbus-1.6.8-orig/dbus/Makefile.in 2012-09-28 15:45:15 -0400 -+++ dbus-1.6.8/dbus/Makefile.in 2013-06-28 20:27:45 -0400 -@@ -614,7 +614,7 @@ +diff -ur dbus-1.7.6-orig/dbus/Makefile.in dbus-1.7.6/dbus/Makefile.in +--- dbus-1.7.6-orig/dbus/Makefile.in 2013-10-09 07:05:16 -0400 ++++ dbus-1.7.6/dbus/Makefile.in 2013-11-08 23:55:33 -0500 +@@ -695,7 +695,7 @@ @DBUS_WIN_FALSE@no_undefined = @DBUS_WIN_TRUE@no_undefined = -no-undefined @DBUS_WIN_FALSE@export_symbols = -export-symbols-regex "^[^_].*" -@DBUS_WIN_TRUE@export_symbols = +@DBUS_WIN_TRUE@export_symbols = -export-symbols-regex "xXx" - @DBUS_WIN_TRUE@libdbus_1_la_DEPENDENCIES = $(dbus_res) + @DBUS_WIN_TRUE@EXTRA_libdbus_1_la_DEPENDENCIES = $(dbus_res) @DBUS_WIN_FALSE@intllibs = @LTLIBINTL@ @DBUS_WIN_TRUE@intllibs = -diff -ur dbus-1.6.8-orig/dbus/dbus-sysdeps-util-win.c dbus-1.6.8/dbus/dbus-sysdeps-util-win.c ---- dbus-1.6.8-orig/dbus/dbus-sysdeps-util-win.c 2012-09-28 15:17:25 -0400 -+++ dbus-1.6.8/dbus/dbus-sysdeps-util-win.c 2013-06-28 20:38:39 -0400 -@@ -105,7 +105,7 @@ +diff -ur dbus-1.7.6-orig/dbus/dbus-sysdeps-util-win.c dbus-1.7.6/dbus/dbus-sysdeps-util-win.c +--- dbus-1.7.6-orig/dbus/dbus-sysdeps-util-win.c 2013-10-08 13:40:40 -0400 ++++ dbus-1.7.6/dbus/dbus-sysdeps-util-win.c 2013-11-08 23:53:04 -0500 +@@ -107,7 +107,7 @@ return FALSE; } @@ -22,10 +22,10 @@ { dbus_set_error (error, _dbus_error_from_system_errno (), "Failed to format PID for \"%s\": %s", cfilename, -diff -ur dbus-1.6.8-orig/dbus/dbus-sysdeps-win.c dbus-1.6.8/dbus/dbus-sysdeps-win.c ---- dbus-1.6.8-orig/dbus/dbus-sysdeps-win.c 2013-06-28 20:29:08 -0400 -+++ dbus-1.6.8/dbus/dbus-sysdeps-win.c 2013-06-28 20:32:42 -0400 -@@ -1517,7 +1517,7 @@ +diff -ur dbus-1.7.6-orig/dbus/dbus-sysdeps-win.c dbus-1.7.6/dbus/dbus-sysdeps-win.c +--- dbus-1.7.6-orig/dbus/dbus-sysdeps-win.c 2013-10-08 13:40:40 -0400 ++++ dbus-1.7.6/dbus/dbus-sysdeps-win.c 2013-11-08 23:53:04 -0500 +@@ -1757,7 +1757,7 @@ host ? host : "*", port, _dbus_strerror_from_errno()); goto failed; } @@ -34,10 +34,10 @@ if (!_dbus_string_append(retport, portbuf)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); -diff -ur dbus-1.6.8-orig/dbus/dbus-sysdeps.c dbus-1.6.8/dbus/dbus-sysdeps.c ---- dbus-1.6.8-orig/dbus/dbus-sysdeps.c 2012-09-28 15:31:05 -0400 -+++ dbus-1.6.8/dbus/dbus-sysdeps.c 2013-06-28 20:32:45 -0400 -@@ -59,6 +59,10 @@ +diff -ur dbus-1.7.6-orig/dbus/dbus-sysdeps.c dbus-1.7.6/dbus/dbus-sysdeps.c +--- dbus-1.7.6-orig/dbus/dbus-sysdeps.c 2013-10-08 13:40:40 -0400 ++++ dbus-1.7.6/dbus/dbus-sysdeps.c 2013-11-08 23:53:04 -0500 +@@ -56,6 +56,10 @@ extern char **environ; #endif @@ -48,9 +48,9 @@ /** * @defgroup DBusSysdeps Internal system-dependent API * @ingroup DBusInternals -diff -ur dbus-1.6.8-orig/tools/dbus-monitor.c dbus-1.6.8/tools/dbus-monitor.c ---- dbus-1.6.8-orig/tools/dbus-monitor.c 2012-09-28 15:17:26 -0400 -+++ dbus-1.6.8/tools/dbus-monitor.c 2013-06-28 20:43:14 -0400 +diff -ur dbus-1.7.6-orig/tools/dbus-monitor.c dbus-1.7.6/tools/dbus-monitor.c +--- dbus-1.7.6-orig/tools/dbus-monitor.c 2013-10-09 06:22:07 -0400 ++++ dbus-1.7.6/tools/dbus-monitor.c 2013-11-08 23:53:04 -0500 @@ -39,6 +39,10 @@ #ifdef DBUS_WIN