[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] portage/win32libs-sources/dbus-src: Fix dbus build on MSVC10
From:       Michael Drueing <michael () drueing ! de>
Date:       2011-08-08 19:12:10
Message-ID: 20110808191210.A248BA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 8b8b844682b853441f65b0f6e4480da97bd113b2 by Michael Drueing.
Committed on 08/08/2011 at 21:02.
Pushed by mdrueing into branch 'master'.

Fix dbus build on MSVC10

Add a workaround (taken from dbus/dbus-internals.c) because
MSVC10 doesn't handle the "inline" keyword in C code in the
same way as gcc.

M  +2    -0    portage/win32libs-sources/dbus-src/dbus-src-1.4.10-20110302.py
A  +14   -0    portage/win32libs-sources/dbus-src/workaround-for-inline-keyword-in-msvc10.patch


http://commits.kde.org/emerge/8b8b844682b853441f65b0f6e4480da97bd113b2

diff --git a/portage/win32libs-sources/dbus-src/dbus-src-1.4.10-20110302.py \
b/portage/win32libs-sources/dbus-src/dbus-src-1.4.10-20110302.py index \
                dacee7c..86c538b 100644
--- a/portage/win32libs-sources/dbus-src/dbus-src-1.4.10-20110302.py
+++ b/portage/win32libs-sources/dbus-src/dbus-src-1.4.10-20110302.py
@@ -69,6 +69,8 @@ class subinfo(info.infoclass):
             self.patchToApply['1.4.6'] = [('live-lock-fix.diff', 1),
                                           \
('0001-Do-not-use-ELEMENT_TYPE-which-is-reserved.patch', 1)  ]
+            self.patchToApply['1.4.10'] = \
[('workaround-for-inline-keyword-in-msvc10.patch', 1) +                               \
]  
         self.shortDescription = "Freedesktop message bus system (daemon and \
clients)"  if emergePlatform.isCrossCompilingEnabled():
diff --git a/portage/win32libs-sources/dbus-src/workaround-for-inline-keyword-in-msvc10.patch \
b/portage/win32libs-sources/dbus-src/workaround-for-inline-keyword-in-msvc10.patch \
new file mode 100644 index 0000000..b84e40b
--- /dev/null
+++ b/portage/win32libs-sources/dbus-src/workaround-for-inline-keyword-in-msvc10.patch
 @@ -0,0 +1,14 @@
+diff --git a/bus/bus.c b/bus/bus.c
+index 6b0dc08..c459b42 100644
+--- a/bus/bus.c
++++ b/bus/bus.c
+@@ -40,6 +40,9 @@
+ #include <dbus/dbus-credentials.h>
+ #include <dbus/dbus-internals.h>
+
++#ifdef _MSC_VER
++#define inline
++#endif
+ #ifdef DBUS_CYGWIN
+ #include <signal.h>
+ #endif


[prev in list] [next in list] [prev in thread] [next in thread]