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

[daniel at archlinux.org]

    Date: Monday, October 13, 2008 @ 12:29:29
  Author: daniel
Revision: 15385

Merged revisions 6071,15384 via svnmerge from 
svn+ssh://daniel@svn.archlinux.org/home/svn-packages/mono/trunk

........
  r6071 | daniel | 2008-07-23 16:40:36 +0200 (Wed, 23 Jul 2008) | 1 line
  
  Add patch to fix FS#10991
........
  r15384 | daniel | 2008-10-13 18:28:31 +0200 (Mon, 13 Oct 2008) | 2 lines
  
  upgpkg: mono 2.0-1
      Mono 2.0 release
........

Added:
  mono/repos/extra-x86_64/mono-1.9.1-wapi_glop.diff
    (from rev 15384, mono/trunk/mono-1.9.1-wapi_glop.diff)
Modified:
  mono/repos/extra-x86_64/	(properties)
  mono/repos/extra-x86_64/PKGBUILD

---------------------------+
 PKGBUILD                  |   13 ++++++++-----
 mono-1.9.1-wapi_glop.diff |   16 ++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)


Property changes on: mono/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /mono/trunk:1-837
   + /mono/trunk:1-15384

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-13 16:28:31 UTC (rev 15384)
+++ extra-x86_64/PKGBUILD	2008-10-13 16:29:29 UTC (rev 15385)
@@ -3,19 +3,21 @@
 # Contributor: Brice Carpentier <brice at dlfp.org>
 
 pkgname=mono
-pkgver=1.9.1
+pkgver=2.0
 pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
 url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=1.9')
+depends=('zlib' 'libgdiplus>=2.0')
 makedepends=('pkgconfig')
 options=('!libtool' '!makeflags')
 source=(http://www.go-mono.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        mono.rc.d)
-md5sums=('6610c3b999d791553a9dc21059ca9d35'
-         '8315e46c6a6e9625502521fc0ad1a322')
+        mono.rc.d
+	mono-1.9.1-wapi_glop.diff)
+md5sums=('d8fb1b2bab0066b82289b8a5856b9705'
+         '8315e46c6a6e9625502521fc0ad1a322'
+         'dbedac8463eceba2b05194d4e8ceda6c')
 
 build() {
   # get rid of that .wapi errors; thanks to brice
@@ -32,6 +34,7 @@
               --with-tls=pthread --with-jit=yes --with-preview=yes \
               --with-sigaltstack=yes --enable-nunit-tests \
 	      --with-moonlight=yes
+  #patch -Np0 -i ../mono-1.9.1-wapi_glop.diff || return 1
   make || return 1
   sed -i "/NO_INSTALL = yes/d" mcs/nunit20/nunit-console/Makefile
   make DESTDIR=${startdir}/pkg install

Copied: mono/repos/extra-x86_64/mono-1.9.1-wapi_glop.diff (from rev 15384, mono/trunk/mono-1.9.1-wapi_glop.diff)
===================================================================
--- extra-x86_64/mono-1.9.1-wapi_glop.diff	                        (rev 0)
+++ extra-x86_64/mono-1.9.1-wapi_glop.diff	2008-10-13 16:29:29 UTC (rev 15385)
@@ -0,0 +1,16 @@
+--- ./mono/io-layer/wapi_glob.c.orig	2008-06-13 09:27:08.361391740 +0200
++++ ./mono/io-layer/wapi_glob.c	2008-06-13 09:27:36.338060353 +0200
+@@ -52,6 +52,13 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#if defined(_SC_ARG_MAX)
++# if defined(ARG_MAX)
++#    undef ARG_MAX
++# endif
++# define ARG_MAX sysconf (_SC_ARG_MAX)
++#endif"
++
+ #include "wapi_glob.h"
+ 
+ #define	EOS		'\0'