summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Anders Ladegaard Marchsteiner <alm.anma@gmail.com> 2014-08-14 09:55:37 +0200
committerAvatar Anders Ladegaard Marchsteiner <alm.anma@gmail.com> 2014-08-15 09:24:22 +0200
commit844e62c867b66d750f7fc76fdae8b93d2b143faf (patch)
tree906267ab905e0938d44ef79046e8ca5c052aaf47
parent906267b14fbc61f2575b27bc4399082041d649fb (diff)
downloadmono-844e62c867b66d750f7fc76fdae8b93d2b143faf.tar.gz
mono-844e62c867b66d750f7fc76fdae8b93d2b143faf.tar.xz
Bump mono to 3.6.0.
-rw-r--r--packages/dev-lang/mono/files/mono-3.4.0-include-common-targets.patch23
-rw-r--r--packages/dev-lang/mono/files/mono-3.6.0-fix-libdir.patch (renamed from packages/dev-lang/mono/files/mono-3.4.0-fix-libdir.patch)12
-rw-r--r--packages/dev-lang/mono/mono-3.6.0.exheres-0 (renamed from packages/dev-lang/mono/mono-3.4.0.exheres-0)5
3 files changed, 3 insertions, 37 deletions
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
deleted file mode 100644
index 45d49a6..0000000
--- a/packages/dev-lang/mono/files/mono-3.4.0-include-common-targets.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/files/mono-3.4.0-fix-libdir.patch b/packages/dev-lang/mono/files/mono-3.6.0-fix-libdir.patch
index fbbafea..175d9dd 100644
--- a/packages/dev-lang/mono/files/mono-3.4.0-fix-libdir.patch
+++ b/packages/dev-lang/mono/files/mono-3.6.0-fix-libdir.patch
@@ -34,14 +34,6 @@ Reason: Respect 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 @@
@@ -94,8 +86,8 @@ Reason: Respect libdir
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:@libidr@/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
---- a/configure.in 2012-11-14 10:43:12.228777687 +0000
-+++ b/configure.in 2012-11-14 10:45:22.611899154 +0000
+--- a/configure.ac 2012-11-14 10:43:12.228777687 +0000
++++ b/configure.ac 2012-11-14 10:45:22.611899154 +0000
@@ -3226,7 +3226,7 @@ fi
echo "prefix=$prefix" > $mcs_topdir/build/config.make
echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make
diff --git a/packages/dev-lang/mono/mono-3.4.0.exheres-0 b/packages/dev-lang/mono/mono-3.6.0.exheres-0
index 9a2c50f..65a8b8f 100644
--- a/packages/dev-lang/mono/mono-3.4.0.exheres-0
+++ b/packages/dev-lang/mono/mono-3.6.0.exheres-0
@@ -23,10 +23,7 @@ DEPENDENCIES="
X? ( dev-dotnet/libgdiplus[>=2] )
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}/${PNV}-fix-libdir.patch"
- "${FILES}/${PNV}-include-common-targets.patch"
-)
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-fix-libdir.patch" )
src_configure() {
if ! option X ; then