Merge pull request #1 from import/mono:rosa2016.1

Backports

.abf.yml

@@ -1,6 +1,2 @@
-removed_sources:
-  mono-2.10.9.tar.bz2: 1a6e8c5a0c3d88d87982259aa04402e028a283de
-  mono-3.4.0.tar.bz2: bae86f50f9a29d68d4e1917358996e7186e7f89e
 sources:
-  mono-3.12.1.tar.bz2: c525a37e95607af588f3fcb2ff919997949e8728
   mono.snk: b1ed4139f1dec3258166918570852bfc77f68dbb

mono-4.6.0-config.patch

@@ -0,0 +1,12 @@
+diff -urN mono-4.6.0/data/config.in mono-4.6.0-patched/data/config.in
+--- mono-4.6.0/data/config.in	2016-08-25 12:15:50.000000000 +0300
++++ mono-4.6.0-patched/data/config.in	2017-08-23 06:21:09.579903848 +0300
+@@ -10,7 +10,7 @@
+ 	<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
+ 	<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
+ 	<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
+-	<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
++	<dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
+ 	<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
+ 	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
+ 	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>

mono-dllmap.patch

@@ -1,7 +1,7 @@
-diff -Naur mono-3.12.1.orig/data/config.in mono-3.12.1/data/config.in
---- mono-3.12.1.orig/data/config.in	2015-07-09 15:46:31.851873352 +0300
-+++ mono-3.12.1/data/config.in	2015-07-09 15:54:33.674856211 +0300
-@@ -5,12 +5,13 @@
+diff -urN mono-4.6.0/data/config.in mono-4.6.0-patched/data/config.in
+--- mono-4.6.0/data/config.in	2016-08-25 19:15:50.000000000 +1000
++++ mono-4.6.0-patched/data/config.in	2016-09-03 22:23:58.097043925 +1000
+@@ -5,8 +5,8 @@
  	<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
  	<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
  	<dllmap dll="libintl" target="@INTL@" os="!windows"/>
@@ -12,12 +12,7 @@ diff -Naur mono-3.12.1.orig/data/config.in mono-3.12.1/data/config.in
  	<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
  	<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
  	<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
- 	<dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
-+	<dllmap dll="gluezilla" target="libgluezilla.so.0"/>
- 	<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
- 	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
- 	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
-@@ -29,8 +30,8 @@
+@@ -29,8 +29,8 @@
  		<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
  		<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
  	</dllmap>