Update of /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29247/10.4/main/finkinfo/languages
Modified Files: mono.info mono.patch Log Message: buncha work on dbus, still not sure it works, other misc in-progress stuff Index: mono.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/languages/mono.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mono.info 16 Aug 2005 18:53:35 -0000 1.5 +++ mono.info 12 Sep 2005 18:07:04 -0000 1.6 @@ -1,12 +1,12 @@ Package: mono -Version: 1.1.8.3 +Version: 1.1.9 Revision: 21 Source: http://www.go-mono.com/sources/%n-1.1/%n-%v.tar.gz -Source-MD5: 5aefdc915cbd6ed84834692f59b92080 +Source-MD5: de159531bc8f00c058fb5f4ee1d5ebe3 PatchScript: sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1 DocFiles: AUTHORS COPYING* ChangeLog NEWS README -Depends: cairo-shlibs (>= 0.5.0-1), glib2-shlibs (>= 2.4.6-7), libgettext3-shlibs, system-java14 -BuildDepends: cairo (>= 0.5.0-1), fink (>= 0.22.2-1), libgettext3-dev, gettext-tools, glib2-dev (>= 2.4.6-7), glib2 (>= 2.4.6-7), glitz (>= 0.4.0-1), libiconv-dev, libicu32-dev, libpixman1 (>= 0.1.5-1), pkgconfig, system-java14-dev +Depends: cairo-shlibs (>= 1.0.0-1), glib2-shlibs (>= 2.4.6-7), libgettext3-shlibs, system-java14 +BuildDepends: cairo (>= 1.0.0-1), fink (>= 0.22.2-1), libgettext3-dev, gettext-tools, glib2-dev (>= 2.4.6-7), glib2 (>= 2.4.6-7), glitz (>= 0.4.4-1), libiconv-dev, libicu32-dev, libpixman1 (>= 0.1.5-1), pkgconfig, system-java14-dev BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev Type: java(1.4) Homepage: http://go-mono.com/ Index: mono.patch =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/languages/mono.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mono.patch 16 Aug 2005 20:09:59 -0000 1.5 +++ mono.patch 12 Sep 2005 18:07:04 -0000 1.6 @@ -1,6 +1,6 @@ -diff -uNr mono-1.1.8.3/data/config.in mono-1.1.8.3-new/data/config.in ---- mono-1.1.8.3/data/config.in Mon Jun 13 10:00:53 2005 -+++ mono-1.1.8.3-new/data/config.in Tue Aug 16 16:09:07 2005 +diff -uNr mono-1.1.9/data/config.in mono-1.1.9-new/data/config.in +--- mono-1.1.9/data/config.in 2005-09-02 06:27:31.000000000 -0400 ++++ mono-1.1.9-new/data/config.in 2005-09-09 16:50:11.000000000 -0400 @@ -9,6 +9,10 @@ <dllmap dll="db2cli" target="[EMAIL PROTECTED]@"/> <dllmap dll="msvcrt" target="@LIBC@"/> @@ -12,9 +12,9 @@ <dllmap dll="sqlite" target="@SQLITE@"/> <dllmap dll="sqlite3" target="@SQLITE3@"/> <dllmap dll="libX11" target="@X11@"/> -diff -uNr mono-1.1.8.3/mono/metadata/Makefile.in mono-1.1.8.3-new/mono/metadata/Makefile.in ---- mono-1.1.8.3/mono/metadata/Makefile.in Tue Jul 26 20:08:30 2005 -+++ mono-1.1.8.3-new/mono/metadata/Makefile.in Tue Aug 16 16:09:07 2005 +diff -uNr mono-1.1.9/mono/metadata/Makefile.in mono-1.1.9-new/mono/metadata/Makefile.in +--- mono-1.1.9/mono/metadata/Makefile.in 2005-09-08 19:32:45.000000000 -0400 ++++ mono-1.1.9-new/mono/metadata/Makefile.in 2005-09-09 16:50:11.000000000 -0400 @@ -68,7 +68,7 @@ am_libmonoruntime_static_la_OBJECTS = $(am__objects_1) libmonoruntime_static_la_OBJECTS = \ @@ -24,10 +24,10 @@ am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \ decimal.lo boehm-gc.lo null-gc.lo gc.lo marshal.lo monitor.lo \ threads.lo threadpool.lo file-io.lo socket-io.lo exception.lo \ -diff -uNr mono-1.1.8.3/mono/metadata/loader.c mono-1.1.8.3-new/mono/metadata/loader.c ---- mono-1.1.8.3/mono/metadata/loader.c Mon Jun 13 10:11:20 2005 -+++ mono-1.1.8.3-new/mono/metadata/loader.c Tue Aug 16 16:10:16 2005 -@@ -736,6 +736,19 @@ +diff -uNr mono-1.1.9/mono/metadata/loader.c mono-1.1.9-new/mono/metadata/loader.c +--- mono-1.1.9/mono/metadata/loader.c 2005-08-03 01:09:35.000000000 -0400 ++++ mono-1.1.9-new/mono/metadata/loader.c 2005-09-09 16:50:11.000000000 -0400 +@@ -780,6 +780,19 @@ } if (!gmodule) { @@ -47,89 +47,3 @@ full_name = g_module_build_path (".", file_name); mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, "DllImport loading library: '%s'.", full_name); -diff -uNr mono-1.1.8.3/mono/metadata/mono-debug-debugger.c mono-1.1.8.3-new/mono/metadata/mono-debug-debugger.c ---- mono-1.1.8.3/mono/metadata/mono-debug-debugger.c Thu May 12 11:36:50 2005 -+++ mono-1.1.8.3-new/mono/metadata/mono-debug-debugger.c Tue Aug 16 16:09:07 2005 -@@ -65,9 +65,12 @@ - - #endif - -+static int initialized = 0; -+ - void - mono_debugger_lock (void) - { -+ g_assert (initialized); - EnterCriticalSection (&debugger_lock_mutex); - debugger_lock_level++; - } -@@ -75,6 +78,7 @@ - void - mono_debugger_unlock (void) - { -+ g_assert (initialized); - if (debugger_lock_level == 1) { - if (must_reload_symtabs && mono_debugger_use_debugger) { - mono_debugger_event (MONO_DEBUGGER_EVENT_RELOAD_SYMTABS, 0, 0); -@@ -95,6 +99,7 @@ - - InitializeCriticalSection (&debugger_lock_mutex); - mono_debugger_use_debugger = use_debugger; -+ initialized = 1; - } - - void -diff -uNr mono-1.1.8.3/mono/metadata/mono-debug.c mono-1.1.8.3-new/mono/metadata/mono-debug.c ---- mono-1.1.8.3/mono/metadata/mono-debug.c Tue Jul 26 14:26:52 2005 -+++ mono-1.1.8.3-new/mono/metadata/mono-debug.c Tue Aug 16 16:09:07 2005 -@@ -771,6 +771,9 @@ - char *res = NULL; - gint32 offset; - -+ if (mono_debug_format == MONO_DEBUG_FORMAT_NONE) -+ return NULL; -+ - mono_debugger_lock (); - minfo = _mono_debug_lookup_method (method); - if (!minfo || !minfo->handle || !minfo->handle->symfile || !minfo->handle->symfile->offset_table) { -@@ -808,6 +811,9 @@ - char *res; - MonoDebugMethodInfo *minfo; - -+ if (mono_debug_format == MONO_DEBUG_FORMAT_NONE) -+ return NULL; -+ - mono_debugger_lock (); - minfo = _mono_debug_lookup_method (method); - if (!minfo || !minfo->handle || !minfo->handle->symfile) { -@@ -835,7 +841,7 @@ - MonoDebugMethodInfo *minfo; - gint32 res; - -- if (address < 0) -+ if ((address < 0) || (mono_debug_format == MONO_DEBUG_FORMAT_NONE)) - return -1; - - mono_debugger_lock (); -@@ -867,7 +873,7 @@ - MonoDebugMethodJitInfo *jit; - gint32 res; - -- if (il_offset < 0) -+ if ((il_offset < 0) || (mono_debug_format == MONO_DEBUG_FORMAT_NONE)) - return -1; - - mono_debugger_lock (); -diff -uNr mono-1.1.8.3/mono/metadata/process.c mono-1.1.8.3-new/mono/metadata/process.c ---- mono-1.1.8.3/mono/metadata/process.c Sun Mar 13 21:18:24 2005 -+++ mono-1.1.8.3-new/mono/metadata/process.c Tue Aug 16 16:09:07 2005 -@@ -854,7 +854,8 @@ - process_info->process_handle=procinfo.hProcess; - /*process_info->thread_handle=procinfo.hThread;*/ - process_info->thread_handle=NULL; -- CloseHandle(procinfo.hThread); -+ if (procinfo.hThread != NULL) -+ CloseHandle(procinfo.hThread); - process_info->pid=procinfo.dwProcessId; - process_info->tid=procinfo.dwThreadId; - } else { ------------------------------------------------------- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits