diff --git a/mono-2.8-libdir.patch b/mono-2.8-libdir.patch deleted file mode 100644 index 09c08a9..0000000 --- a/mono-2.8-libdir.patch +++ /dev/null @@ -1,246 +0,0 @@ ---- mono-2.8/mono/metadata/assembly.c 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/mono/metadata/assembly-new.c 2010-09-15 13:40:24.295239665 +0100 -@@ -564,7 +564,7 @@ - } - - config = g_build_filename (base, "etc", NULL); -- lib = g_build_filename (base, "lib", NULL); -+ lib = g_build_filename (base, MONO_RELOC_LIBDIR, NULL); - mono = g_build_filename (lib, "mono/1.0", NULL); - if (stat (mono, &buf) == -1) - fallback (); -@@ -2088,7 +2088,7 @@ - if (extra_gac_paths) { - paths = extra_gac_paths; - while (!res && *paths) { -- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL); -+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", aname->name, NULL); - res = probe_for_partial_name (gacpath, fullname, aname, status); - g_free (gacpath); - paths++; -@@ -2218,7 +2218,7 @@ - paths = extra_gac_paths; - while (!image && *paths) { - fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, -- "lib", "mono", "gac", subpath, NULL); -+ MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL); - image = mono_image_open (fullpath, NULL); - g_free (fullpath); - paths++; -@@ -2510,7 +2510,7 @@ - if (extra_gac_paths) { - paths = extra_gac_paths; - while (!result && *paths) { -- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL); -+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL); - result = mono_assembly_open_full (fullpath, status, refonly); - g_free (fullpath); - paths++; ---- mono-2.8/mcs/tools/gacutil/driver.cs 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/mcs/tools/gacutil/driver-new.cs 2010-09-15 13:32:30.335396575 +0100 -@@ -808,7 +808,7 @@ - private static string EnsureLib (string dir) - { - DirectoryInfo d = new DirectoryInfo (dir); -- if (d.Name == "lib") -+ if (d.Name == "lib" || d.Name == "lib64") - return dir; - return Path.Combine (dir, "lib"); - } ---- mono-2.6.4/mcs/build/config-default.make 2010-04-22 16:38:03.000000000 +0100 -+++ mono-2.6.4/mcs/build/config-default-new.make 2010-04-27 00:29:59.000000000 +0100 -@@ -19,7 +19,7 @@ - endif - prefix = /usr/local - exec_prefix = $(prefix) --mono_libdir = $(exec_prefix)/lib -+mono_libdir = @LIBDIR@ - sysconfdir = $(prefix)/etc - #RUNTIME = mono - RUNTIME = false ---- mono-2.6.4/scripts/Makefile.am 2010-04-22 16:37:43.000000000 +0100 -+++ mono-2.6.4/scripts/Makefile-new.am 2010-04-27 00:42:28.000000000 +0100 -@@ -176,7 +176,7 @@ - endif - else - plat_bindir = $(bindir) --mono_instdir = $(prefix)/lib/mono -+mono_instdir = @LIBDIR@/mono - endif - - ---- mono-2.6.4/data/cecil.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/cecil.pc-new.in 2010-04-27 00:33:58.000000000 +0100 -@@ -1,4 +1,4 @@ --assemblies_dir=@prefix@/lib/mono -+assemblies_dir=@LIBDIR@/mono - Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll - - Name: Mono Internal -- Do not use. ---- mono-2.6.4/data/mint.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/mint.pc-new.in 2010-04-27 00:34:27.000000000 +0100 -@@ -1,6 +1,6 @@ - prefix=${pcfiledir}/../.. - exec_prefix=${pcfiledir}/../.. --libdir=${prefix}/lib -+libdir=@LIBDIR@ - includedir=${prefix}/include/mono-@API_VER@ - - ---- mono-2.6.4/data/mono.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/mono.pc-new.in 2010-04-27 00:34:57.000000000 +0100 -@@ -1,6 +1,6 @@ - prefix=${pcfiledir}/../.. - exec_prefix=${pcfiledir}/../.. --libdir=${prefix}/@reloc_libdir@ -+libdir=@LIBDIR@ - includedir=${prefix}/include/mono-@API_VER@ - sysconfdir=@sysconfdir@ - ---- mono-2.6.4/data/mono.web.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/mono.web.pc-new.in 2010-04-27 00:40:27.000000000 +0100 -@@ -1,4 +1,4 @@ - Name: Mono.Web - Description: Mono ASP.NET extension classes - Version: 2.0.0.0 --Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll -+Libs: -r:@LIBDIR@/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll - ---- mono-2.6.4/data/mono-lineeditor.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/mono-lineeditor.pc-new.in 2010-04-27 00:37:17.000000000 +0100 -@@ -1,5 +1,5 @@ - prefix=${pcfiledir}/../.. --assemblies_dir=${prefix}/lib/mono-source-libs -+assemblies_dir=@LIBDIR@/mono-source-libs - Sources=${assemblies_dir}/getline.cs - - Name: Mono.Terminal.LineEditor ---- mono-2.6.4/data/mono-nunit.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/mono-nunit.pc-new.in 2010-04-27 00:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - prefix=${pcfiledir}/../.. - exec_prefix=${prefix} --libdir=${exec_prefix}/lib -+libdir=@LIBDIR@ - - - Name: Mono NUnit ---- mono-2.6.4/data/mono-options.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/mono-options.pc-new.in 2010-04-27 00:38:21.000000000 +0100 -@@ -1,5 +1,5 @@ - prefix=${pcfiledir}/../.. --assemblies_dir=${prefix}/lib/mono-source-libs -+assemblies_dir=@LIBDIR@/mono-source-libs - Sources=${assemblies_dir}/Options.cs - - Name: Mono.Options ---- mono-2.6.4/data/system.web.extensions.design_1.0.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/system.web.extensions.design_1.0.pc-new.in 2010-04-27 00:38:43.000000000 +0100 -@@ -1,4 +1,4 @@ - Name: System.Web.Extensions.Design - Description: System.Web.Extensions.Design ASP.NET 2.0 add-on - Version: 1.0.61025.0 --Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll -+Libs: -r:@LIBDIR@/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll ---- mono-2.6.4/data/system.web.extensions_1.0.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/system.web.extensions_1.0.pc-new.in 2010-04-27 00:39:00.000000000 +0100 -@@ -1,4 +1,4 @@ - Name: System.Web.Extensions - Description: System.Web.Extensions ASP.NET 2.0 add-on - Version: 1.0.61025.0 --Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll -+Libs: -r:@LIBDIR@/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll ---- mono-2.6.4/data/system.web.mvc.pc.in 2010-04-22 16:37:47.000000000 +0100 -+++ mono-2.6.4/data/system.web.mvc.pc-new.in 2010-04-27 00:39:16.000000000 +0100 -@@ -1,4 +1,4 @@ - Name: System.Web.Mvc - Description: System.Web.Mvc - ASP.NET MVC - Version: 1.0.0.0 --Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll -+Libs: -r:@LIBDIR@/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll - ---- mono-2.8/configure.in 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/configure-new.in 2010-09-15 14:01:05.640710876 +0100 -@@ -2886,7 +2886,7 @@ - echo "prefix=$prefix" > $mcs_topdir/build/config.make - echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make - echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make -- echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make -+ echo 'mono_libdir=@LIBDIR@' >> $mcs_topdir/build/config.make - echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $mcs_topdir/build/config.make - echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make - echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make -@@ -2937,7 +2937,7 @@ - - echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make - echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make -- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make -+ echo 'mono_libdir=@LIBDIR@' >> $srcdir/$olivedir/build/config.make - echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make - echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make - echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make ---- mono-2.8/data/monodoc.pc.in 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/data/monodoc.pc-new.in 2010-09-22 12:43:38.220677135 +0100 -@@ -1,9 +1,9 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@prefix@/lib -+libdir=@LIBDIR@ - sourcesdir=${libdir}/monodoc/sources - - Name: Monodoc - Description: Monodoc - Mono Documentation Tools - Version: @VERSION@ --Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll -+Libs: /r:${libdir}/mono/monodoc/monodoc.dll ---- mono-2.8/data/mono-cairo.pc.in 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/data/mono-cairo.pc-new.in 2010-09-22 12:42:53.873541601 +0100 -@@ -1,9 +1,9 @@ - prefix=${pcfiledir}/../.. - exec_prefix=${pcfiledir}/../.. --libdir=${prefix}/@reloc_libdir@ -+libdir=@LIBDIR@ - includedir=${prefix}/include - - Name: Mono.Cairo - Description: Cairo bindings for Mono - Version: @VERSION@ --Libs: -r:${prefix}/lib/mono/2.0/Mono.Cairo.dll -+Libs: -r:${libdir}/mono/2.0/Mono.Cairo.dll ---- mono-2.8/data/system.web.mvc2.pc.in 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/data/system.web.mvc2.pc-new.in 2010-09-22 12:44:16.452759229 +0100 -@@ -1,4 +1,4 @@ - Name: System.Web.Mvc2 - Description: System.Web.Mvc - ASP.NET MVC v2 - Version: 2.0.0.0 --Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll -+Libs: -r:@LIBDIR@/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll ---- mono-2.8/docs/Makefile.in 2010-09-10 21:58:21.000000000 +0100 -+++ mono-2.8/docs/Makefile-new.in 2010-09-22 12:51:28.223926963 +0100 -@@ -252,7 +252,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --sourcesdir = $(prefix)/lib/monodoc/sources -+sourcesdir = @LIBDIR@/monodoc/sources - sources_DATA = \ - mono-file-formats.source \ - mono-tools.source \ ---- mono-2.8/docs/Makefile.am 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/docs/Makefile-new.am 2010-09-22 12:49:54.369453974 +0100 -@@ -1,4 +1,4 @@ --sourcesdir = $(prefix)/lib/monodoc/sources -+sourcesdir = @LIBDIR@/monodoc/sources - - sources_DATA = \ - mono-file-formats.source \ ---- mono-2.8/data/mono-2.pc.in 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/data/mono-2.pc-new.in 2010-09-22 12:54:54.445011590 +0100 -@@ -1,6 +1,6 @@ - prefix=${pcfiledir}/../.. - exec_prefix=${pcfiledir}/../.. --libdir=${prefix}/@reloc_libdir@ -+libdir=@LIBDIR@ - includedir=${prefix}/include/mono-@API_VER@ - sysconfdir=@sysconfdir@ - diff --git a/mono-2.8-metadata-makefile.patch b/mono-2.8-metadata-makefile.patch deleted file mode 100644 index 0e54ace..0000000 --- a/mono-2.8-metadata-makefile.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- mono-2.8/mono/metadata/Makefile.am 2010-09-10 21:55:45.000000000 +0100 -+++ mono-2.8/mono/metadata/Makefile-new.am 2010-09-15 13:47:56.378549804 +0100 -@@ -20,7 +20,7 @@ - AM_CFLAGS = -O - else - --assembliesdir = $(exec_prefix)/lib -+assembliesdir = @LIBDIR@ - confdir = $(sysconfdir) - unix_sources = \ - console-unix.c -@@ -40,7 +40,7 @@ - - noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_libraries) - --INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" - - # - # Make sure any prefix changes are updated in the binaries too. ---- mono-2.8/mono/metadata/Makefile.in 2010-09-10 21:58:23.000000000 +0100 -+++ mono-2.8/mono/metadata/Makefile-new.in 2010-09-15 13:51:58.500133920 +0100 -@@ -713,7 +713,7 @@ - # The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the - # / by \ if running under WIN32. - @CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@assembliesdir = ${libdir} --@HOST_WIN32_FALSE@assembliesdir = $(exec_prefix)/lib -+@HOST_WIN32_FALSE@assembliesdir = @LIBDIR@ - @CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE@confdir = `cygpath -m "${sysconfdir}"` - @CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@confdir = ${sysconfdir} - @HOST_WIN32_FALSE@confdir = $(sysconfdir) -@@ -730,7 +730,7 @@ - # - @SUPPORT_SGEN_TRUE@sgen_libraries = libmonoruntimesgen.la libmonoruntimesgen-static.la - noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_libraries) --INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" - CLEANFILES = mono-bundle.stamp - libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD) - null_sources = \ diff --git a/mono-2.8-monodis.patch b/mono-2.8-monodis.patch deleted file mode 100644 index dac1893..0000000 --- a/mono-2.8-monodis.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mono-2.8/mono/Makefile.am.old 2010-10-10 19:51:15.000000000 +1300 -+++ mono-2.8/mono/Makefile.am 2010-10-10 19:54:07.000000000 +1300 -@@ -2,7 +2,7 @@ - SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis - else - if MOONLIGHT --SUBDIRS = utils io-layer metadata arch $(interpreter_dir) mini -+SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph tests benchmark profiler - else - SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph tests benchmark profiler - endif diff --git a/mono-242-libgdiplusconfig.patch b/mono-242-libgdiplusconfig.patch deleted file mode 100644 index 712f5b9..0000000 --- a/mono-242-libgdiplusconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- mono-2.4.2/data/config.in 2009-06-15 22:16:29.000000000 +0100 -+++ mono-2.4.2/data/config-new.in 2009-06-17 22:57:56.000000000 +0100 -@@ -15,7 +15,8 @@ - - - -- -+ -+ - - - diff --git a/mono-281-moonlightbuild.patch b/mono-281-moonlightbuild.patch deleted file mode 100644 index b8a6172..0000000 --- a/mono-281-moonlightbuild.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mono-2.8.1/mcs/class/System/System.Net.Sockets/Socket_2_1.cs 2010-11-12 10:24:41.000000000 +0000 -+++ mono-2.8.1/mcs/class/System/System.Net.Sockets/Socket_2_1-new.cs 2010-11-24 19:45:15.538121958 +0000 -@@ -485,7 +485,11 @@ - throw new ArgumentNullException ("remoteEP"); - - IPEndPoint ep = remoteEP as IPEndPoint; -+#if !MOONLIGHT - if (ep != null && socket_type != SocketType.Dgram) /* Dgram uses Any to 'disconnect' */ -+#else -+ if(ep != null) -+#endif - if (ep.Address.Equals (IPAddress.Any) || ep.Address.Equals (IPAddress.IPv6Any)) - throw new SocketException ((int) SocketError.AddressNotAvailable); -