[arch-commits] Commit in mono/trunk (3 files)

[Daniel Isenmann]

    Date: Wednesday, June 25, 2014 @ 23:05:45
  Author: daniel
Revision: 215453

upgpkg: mono 3.4.0-1

Upstream release, must added two new files to get this thing compile. Also disable mcs-doc this time.

Added:
  mono/trunk/Microsoft.Portable.Common.targets
  mono/trunk/build_fix.patch
Modified:
  mono/trunk/PKGBUILD

-----------------------------------+
 Microsoft.Portable.Common.targets |    4 ++++
 PKGBUILD                          |   19 ++++++++++++++-----
 build_fix.patch                   |   25 +++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)

Added: Microsoft.Portable.Common.targets
===================================================================
--- Microsoft.Portable.Common.targets	                        (rev 0)
+++ Microsoft.Portable.Common.targets	2014-06-25 21:05:45 UTC (rev 215453)
@@ -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>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-25 20:58:44 UTC (rev 215452)
+++ PKGBUILD	2014-06-25 21:05:45 UTC (rev 215453)
@@ -3,7 +3,7 @@
 # Contributor: Brice Carpentier <brice at dlfp.org>
 
 pkgname=mono
-pkgver=3.2.8
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
@@ -15,13 +15,21 @@
 conflicts=('monodoc')
 source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
         mono.binfmt.d
-        sgen_fix.patch)
-md5sums=('1075f99bd8a69890af9e30309728e684'
+        sgen_fix.patch
+	build_fix.patch
+	Microsoft.Portable.Common.targets)
+md5sums=('698024a40ee0721c2a24c45be2e39f28'
          'b9ef8a65fea497acf176cca16c1e2402'
-         '8a700b94bff7a913f920e95890d2fb4c')
+         '8a700b94bff7a913f920e95890d2fb4c'
+         '30a5af1a4ff50b98f9e73cc2ae554115'
+         'acbffadb0ac233c494b40dd5e79209a5')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+
+  patch -p1 < ../build_fix.patch  
+  cp ../Microsoft.Portable.Common.targets mcs/tools/xbuild/targets/
+
   # build mono
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -29,7 +37,8 @@
     --sbindir=/usr/bin \
     --disable-quiet-build \
     --disable-system-aot \
-    --disable-static
+    --disable-static \
+    --with-mcs-docs=no
   make
 
   # build jay

Added: build_fix.patch
===================================================================
--- build_fix.patch	                        (rev 0)
+++ build_fix.patch	2014-06-25 21:05:45 UTC (rev 215453)
@@ -0,0 +1,25 @@
+From c68c72144d7b2a0516276137855d4508a3f59a17 Mon Sep 17 00:00:00 2001
+From: Michael Hutchinson <m.j.hutchinson at gmail.com>
+Date: Tue, 1 Apr 2014 17:21:51 -0400
+Subject: [PATCH] [xbuild] Include PCL common targets in tarball
+
+BXC18690 - Microsoft.Portable.Common.targets is missing in mono 3.4.0 tarball
+---
+ mcs/tools/xbuild/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
+index c3a5d6a..31d5329 100644
+--- a/mcs/tools/xbuild/Makefile
++++ b/mcs/tools/xbuild/Makefile
+@@ -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 \
+-- 
+1.9.3
+