Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e536c6aea1d2e01b2d2e10d0a1098bc71ffd41a5
commit e536c6aea1d2e01b2d2e10d0a1098bc71ffd41a5 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Mon Jan 21 22:53:53 2008 +0100 mono-1.2.6-2-i686 added threads-types-private-prototypes.patch: unbreak OOo build diff --git a/source/devel/mono/FrugalBuild b/source/devel/mono/FrugalBuild index bc661aa..4873128 100644 --- a/source/devel/mono/FrugalBuild +++ b/source/devel/mono/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mono pkgver=1.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="Mono runtime and class libraries, a C# compiler/interpreter" url="http://www.mono-project.com/"; depends=('glib2' 'zlib') @@ -13,18 +13,21 @@ groups=('devel') archs=('i686' 'x86_64') Finclude mono up2date="lynx -dump http://www.go-mono.com/sources-stable/|grep -m1 'mono-'|sed 's/.*-\(.*\).t.*/\1/'" -source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 rc.mono rc.mono-hu.po) +source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 rc.mono rc.mono-hu.po \ + mono-1.2.6-threads-types-private-prototypes.patch) Fconfopts="$Fconfopts --with-tls=__thread --with-libgdiplus=installed" sha1sums=('f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae' \ '143399121fac3d5dc47fb07e8dec4ded182a14bd' \ - '6c19f98462d7bb1ecba79a3ad284ea02a1eac2ec') + '6c19f98462d7bb1ecba79a3ad284ea02a1eac2ec' \ + 'd310d55923d4f3a8db699b64d6f5ac536d9f9a39') build() { Fmonoexport - Fcd + Fpatchall libtoolize -c -f || Fdie Fautoreconf - Fbuild + Fmake + Fmakeinstall Fmonocleanup } diff --git a/source/devel/mono/mono-1.2.6-threads-types-private-prototypes.patch b/source/devel/mono/mono-1.2.6-threads-types-private-prototypes.patch new file mode 100644 index 0000000..acb659e --- /dev/null +++ b/source/devel/mono/mono-1.2.6-threads-types-private-prototypes.patch @@ -0,0 +1,33 @@ +See https://bugzilla.novell.com/show_bug.cgi?id=349952, this fixes breakage with OOo. +--- mono/metadata/threads.h 2007/12/20 00:38:27 1.1 ++++ mono/metadata/threads.h 2007/12/20 00:38:46 +@@ -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_interruption_che + 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_ */ +--- mono/metadata/threads-types.h 2007/12/20 00:38:32 1.1 ++++ mono/metadata/threads-types.h 2007/12/20 00:40:55 +@@ -157,4 +157,8 @@ extern MonoThreadHazardPointers* mono_ha + (hp)->hazard_pointers [(i)] = NULL; \ + } while (0) + ++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; ++ + #endif /* _MONO_METADATA_THREADS_TYPES_H_ */ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
