[Pkg-mono-svn-commits] rev 3564 - in mono/trunk/debian: . patches

[Mirco Bauer]

Author: meebey
Date: 2007-12-26 22:52:49 +0000 (Wed, 26 Dec 2007)
New Revision: 3564

Added:
   mono/trunk/debian/patches/fix_threads.h.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
Log:
- last minute fixes



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-12-26 22:33:47 UTC (rev 3563)
+++ mono/trunk/debian/changelog	2007-12-26 22:52:49 UTC (rev 3564)
@@ -4,6 +4,10 @@
     + Disables delegate trampoline code for PPC, fixes instant SIGILL runtime
       crashes for every invoked application (as seen in PPC build logs of
       gtk-sharp2, gnome-sharp2 or beagle).
+  * debian/patches/fix_threads.h.dpatch:
+    + Don't include threads-type.h in threads.h and moved functions to the
+      correct header, fixes compiling of OpenOffice.org's Mono bridge.
+      (taken from upstream SVN revision 91687 + 91817)
   * debian/rules:
     + Make sure -j1 is passed to make, Mono's build system doesn't like -j > 1.
 

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2007-12-26 22:33:47 UTC (rev 3563)
+++ mono/trunk/debian/patches/00list	2007-12-26 22:52:49 UTC (rev 3564)
@@ -8,3 +8,4 @@
 fix_Mono.Cecil_linkage
 fix_implicit_pointer_conversions
 ppc_disable_delegate_trampoline_optimization
+fix_threads.h

Added: mono/trunk/debian/patches/fix_threads.h.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_threads.h.dpatch	                        (rev 0)
+++ mono/trunk/debian/patches/fix_threads.h.dpatch	2007-12-26 22:52:49 UTC (rev 3564)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_threads.h.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.2.6~/mono/metadata/threads-types.h mono-1.2.6/mono/metadata/threads-types.h
+--- mono-1.2.6~/mono/metadata/threads-types.h	2007-12-10 18:42:50.000000000 +0100
++++ mono-1.2.6/mono/metadata/threads-types.h	2007-12-26 23:48:10.000000000 +0100
+@@ -134,6 +134,10 @@
+ extern void mono_thread_current_check_pending_interrupt (void) MONO_INTERNAL;
+ extern void mono_thread_get_stack_bounds (guint8 **staddr, size_t *stsize) MONO_INTERNAL;
+ 
++extern void mono_thread_set_state (MonoThread *thread, MonoThreadState state) MONO_INTERNAL;
++extern void mono_thread_clr_state (MonoThread *thread, MonoThreadState state) MONO_INTERNAL;
++extern gboolean mono_thread_test_state (MonoThread *thread, MonoThreadState test) MONO_INTERNAL;
++
+ extern void mono_thread_init_apartment_state (void) MONO_INTERNAL;
+ extern void mono_thread_cleanup_apartment_state (void) MONO_INTERNAL;
+ 
+diff -urNad mono-1.2.6~/mono/metadata/threads.h mono-1.2.6/mono/metadata/threads.h
+--- mono-1.2.6~/mono/metadata/threads.h	2007-11-08 23:07:19.000000000 +0100
++++ mono-1.2.6/mono/metadata/threads.h	2007-12-26 23:47:38.000000000 +0100
+@@ -14,7 +14,6 @@
+ #include <mono/utils/mono-membar.h>
+ #include <mono/metadata/object.h>
+ #include <mono/metadata/appdomain.h>
+-#include <mono/metadata/threads-types.h>
+ 
+ G_BEGIN_DECLS
+ 
+@@ -67,10 +66,6 @@
+ extern void mono_thread_force_interruption_checkpoint (void);
+ extern gint32* mono_thread_interruption_request_flag (void);
+ 
+-extern void mono_thread_set_state (MonoThread *thread, MonoThreadState state);
+-extern void mono_thread_clr_state (MonoThread *thread, MonoThreadState state);
+-extern gboolean mono_thread_test_state (MonoThread *thread, MonoThreadState test);
+-
+ G_END_DECLS
+ 
+ #endif /* _MONO_METADATA_THREADS_H_ */


Property changes on: mono/trunk/debian/patches/fix_threads.h.dpatch
___________________________________________________________________
Name: svn:executable
   + *