summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Anders Ladegaard Marchsteiner <alm.anma@gmail.com> 2014-08-06 20:28:55 +0200
committerAvatar Anders Ladegaard Marchsteiner <alm.anma@gmail.com> 2014-08-06 22:16:10 +0200
commit906267b14fbc61f2575b27bc4399082041d649fb (patch)
tree221351a1e99030d32d62e7edb05ae85263e6f379
parent731cfe7384dcb1b64a1e63c1abfabeebbc202a75 (diff)
downloadmono-906267b14fbc61f2575b27bc4399082041d649fb.tar.gz
mono-906267b14fbc61f2575b27bc4399082041d649fb.tar.xz
Bump mono to 3.4.0
-rw-r--r--packages/dev-lang/mono/files/mono-3.4.0-fix-libdir.patch (renamed from packages/dev-lang/mono/files/mono-3.2.3-fix-libdir.patch)0
-rw-r--r--packages/dev-lang/mono/files/mono-3.4.0-include-common-targets.patch23
-rw-r--r--packages/dev-lang/mono/mono-3.4.0.exheres-0 (renamed from packages/dev-lang/mono/mono-3.2.3.exheres-0)5
3 files changed, 27 insertions, 1 deletions
diff --git a/packages/dev-lang/mono/files/mono-3.2.3-fix-libdir.patch b/packages/dev-lang/mono/files/mono-3.4.0-fix-libdir.patch
index fbbafea..fbbafea 100644
--- a/packages/dev-lang/mono/files/mono-3.2.3-fix-libdir.patch
+++ b/packages/dev-lang/mono/files/mono-3.4.0-fix-libdir.patch
diff --git a/packages/dev-lang/mono/files/mono-3.4.0-include-common-targets.patch b/packages/dev-lang/mono/files/mono-3.4.0-include-common-targets.patch
new file mode 100644
index 0000000..45d49a6
--- /dev/null
+++ b/packages/dev-lang/mono/files/mono-3.4.0-include-common-targets.patch
@@ -0,0 +1,23 @@
+Source: https://github.com/mono/mono/commit/c4667496bf3a82b91173c07a761d1dcbf935edf9
+Upstream: yes, in next release: https://bugzilla.xamarin.com/show_bug.cgi?id=18690
+Reason: Microsoft.Portable.Common.targets is missing in mono 3.4.0 tarball. Remove this patch in next bump.
+
+diff -urpN a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
+--- a/mcs/tools/xbuild/Makefile 2014-08-06 20:36:09.169162912 +0200
++++ b/mcs/tools/xbuild/Makefile 2014-08-06 21:49:37.444329864 +0200
+@@ -93,6 +93,7 @@ EXTRA_DISTFILES = \
+ frameworks/net_4.5.xml \
+ targets/Microsoft.Portable.CSharp_4.0.targets \
+ targets/Microsoft.Portable.CSharp_4.5.targets \
++ targets/Microsoft.Portable.Common.targets \
+ targets/Microsoft.Portable.Core.targets \
+ targets/Microsoft.Portable.Core.props \
+ targets/Microsoft.WebApplication.targets \
+diff -urpN a/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets b/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets
+--- a/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets 1970-01-01 01:00:00.000000000 +0100
++++ b/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets 2014-08-06 22:08:19.612973722 +0200
+@@ -0,0 +1,4 @@
++<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++ <Import Project="..\Microsoft.Portable.Core.props" />
++ <Import Project="..\Microsoft.Portable.Core.targets" />
++</Project>
diff --git a/packages/dev-lang/mono/mono-3.2.3.exheres-0 b/packages/dev-lang/mono/mono-3.4.0.exheres-0
index 65a8b8f..9a2c50f 100644
--- a/packages/dev-lang/mono/mono-3.2.3.exheres-0
+++ b/packages/dev-lang/mono/mono-3.4.0.exheres-0
@@ -23,7 +23,10 @@ DEPENDENCIES="
X? ( dev-dotnet/libgdiplus[>=2] )
"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-fix-libdir.patch" )
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}/${PNV}-fix-libdir.patch"
+ "${FILES}/${PNV}-include-common-targets.patch"
+)
src_configure() {
if ! option X ; then