OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Aug-2007 17:58:27
Branch: HEAD Handle: 2007083116582600
Modified files:
openpkg-src/mono mono.patch mono.spec
Log:
upgrading package: mono 1.2.3.1 -> 1.2.5
Summary:
Revision Changes Path
1.16 +23 -35 openpkg-src/mono/mono.patch
1.50 +23 -5 openpkg-src/mono/mono.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mono/mono.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 mono.patch
--- openpkg-src/mono/mono.patch 7 Feb 2007 11:13:06 -0000 1.15
+++ openpkg-src/mono/mono.patch 31 Aug 2007 15:58:26 -0000 1.16
@@ -1,6 +1,6 @@
Index: mcs/jay/Makefile
---- mcs/jay/Makefile.orig 2006-04-14 19:47:49 +0200
-+++ mcs/jay/Makefile 2007-02-07 11:56:40 +0100
+--- mcs/jay/Makefile.orig 2007-04-25 20:48:54 +0200
++++ mcs/jay/Makefile 2007-08-31 15:47:11 +0200
@@ -2,7 +2,7 @@
SUBDIRS :=
include ../build/rules.make
@@ -29,9 +29,9 @@
uninstall-local:
-rm -f $(DESTDIR)$(prefix)/bin/jay
Index: mono/Makefile.in
---- mono/Makefile.in.orig 2007-02-07 02:53:37 +0100
-+++ mono/Makefile.in 2007-02-07 11:56:40 +0100
-@@ -268,7 +268,7 @@
+--- mono/Makefile.in.orig 2007-08-27 21:33:44 +0200
++++ mono/Makefile.in 2007-08-31 15:47:11 +0200
+@@ -274,7 +274,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = utils io-layer monoburg os cil metadata \
@@ -40,21 +40,10 @@
all: all-recursive
-Index: mono/mini/aot-runtime.c
---- mono/mini/aot-runtime.c.orig 2007-01-25 07:11:23 +0100
-+++ mono/mini/aot-runtime.c 2007-02-07 11:56:40 +0100
-@@ -10,6 +10,7 @@
-
- #include "config.h"
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
Index: mono/mini/mini-x86.c
---- mono/mini/mini-x86.c.orig 2007-01-25 07:11:22 +0100
-+++ mono/mini/mini-x86.c 2007-02-07 11:56:40 +0100
-@@ -419,6 +419,34 @@
+--- mono/mini/mini-x86.c.orig 2007-07-24 23:47:30 +0200
++++ mono/mini/mini-x86.c 2007-08-31 15:47:11 +0200
+@@ -424,6 +424,34 @@
return cinfo;
}
@@ -90,9 +79,9 @@
* mono_arch_get_argument_info:
* @csig: a method signature
Index: mono/utils/mono-codeman.c
---- mono/utils/mono-codeman.c.orig 2007-01-25 07:11:23 +0100
-+++ mono/utils/mono-codeman.c 2007-02-07 11:57:12 +0100
-@@ -24,7 +24,7 @@
+--- mono/utils/mono-codeman.c.orig 2007-08-01 20:07:31 +0200
++++ mono/utils/mono-codeman.c 2007-08-31 15:47:11 +0200
+@@ -31,7 +31,7 @@
#define MAX_WASTAGE 32
#define MIN_BSIZE 32
@@ -102,9 +91,9 @@
#else
#define ARCH_MAP_FLAGS 0
Index: support/stdio.c
---- support/stdio.c.orig 2006-11-02 19:09:53 +0100
-+++ support/stdio.c 2007-02-07 11:56:40 +0100
-@@ -142,14 +142,14 @@
+--- support/stdio.c.orig 2007-07-24 23:47:31 +0200
++++ support/stdio.c 2007-08-31 17:20:28 +0200
+@@ -142,13 +142,13 @@
Mono_Posix_Stdlib_setvbuf (void* stream, void *buf, int mode, mph_size_t
size)
{
mph_return_if_size_t_overflow (size);
@@ -115,13 +104,12 @@
int
Mono_Posix_Stdlib_setbuf (void* stream, void* buf)
{
- errno = 0;
- setbuf (stream, buf);
+ setbuf ((FILE *)stream, buf);
- return errno == 0 ? 0 : -1;
+ return 0;
}
-@@ -158,13 +158,13 @@
+@@ -157,13 +157,13 @@
{
mph_return_if_long_overflow (offset);
@@ -137,7 +125,7 @@
}
void*
-@@ -177,20 +177,20 @@
+@@ -176,20 +176,20 @@
gint32
Mono_Posix_Stdlib_fgetpos (void* stream, void *pos)
{
@@ -155,9 +143,9 @@
int
Mono_Posix_Stdlib_rewind (void* stream)
{
- errno = 0;
-- rewind (stream);
-+ rewind ((FILE *)stream);
- return errno == 0 ? 0 : -1;
- }
-
+ do {
+- rewind (stream);
++ rewind ((FILE *)stream);
+ } while (errno == EINTR);
+ mph_return_if_val_in_list5(errno, EAGAIN, EBADF, EFBIG, EINVAL, EIO);
+ mph_return_if_val_in_list5(errno, ENOSPC, ENXIO, EOVERFLOW, EPIPE,
ESPIPE);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mono/mono.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 mono.spec
--- openpkg-src/mono/mono.spec 20 Jul 2007 20:17:24 -0000 1.49
+++ openpkg-src/mono/mono.spec 31 Aug 2007 15:58:26 -0000 1.50
@@ -24,7 +24,7 @@
# package version
%define V_major 1.2
-%define V_minor 3.1
+%define V_minor 5
# package information
Name: mono
@@ -37,10 +37,10 @@
Group: Language
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20070720
+Release: 20070831
# list of sources
-Source0: http://go-mono.com/sources/mono/mono-%{version}.tar.gz
+Source0: http://go-mono.com/sources/mono/mono-%{version}.tar.bz2
Patch0: mono.patch
# build information
@@ -66,7 +66,7 @@
prog mono = {
version = %{version}
url = http://go-mono.com/sources-stable/
- regex = mono-(\d+\.\d+(\.\d+)*)\.tar\.gz
+ regex = mono-(\d+\.\d+(\.\d+)*)\.tar\.bz2
}
%prep
@@ -86,6 +86,23 @@
-e 's/trunc;/notexisting;/' \
configure
+ # workaround Linux-specifics
+ %{l_shtool} subst \
+ -e 's;#!/bin/bash;#!%{l_bash};g' \
+ mono/arch/arm/dpiops.sh \
+ mono/arch/arm/fpaops.sh \
+ mono/arch/arm/vfpops.sh \
+ scripts/mono-find-provides \
+ scripts/mono-find-requires \
+ web/mono-build-w32.sh \
+ mcs/class/Managed.Windows.Forms/build-csproj \
+ mcs/class/Managed.Windows.Forms/build-csproj2k5 \
+ mcs/class/Mono.Cairo/Samples/gtk/compile.sh \
+ mcs/class/Mono.Cairo/Samples/png/compile.sh \
+ mcs/class/Mono.Cairo/Samples/win32/compile.sh \
+ mcs/class/Mono.Cairo/Samples/x11/compile.sh \
+ mcs/tools/tinderbox/tinderbox.sh
+
# configure program
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ -94,13 +111,14 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--bindir=%{l_prefix}/libexec/mono \
--with-gc=included \
--with-jit=yes \
--disable-shared
# build program
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
# use a working install to create subdirs
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
