From 62e1aa37a5bfccac5ef8c9355ec3fe0874c3b2dd Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sun, 7 Dec 2014 14:10:02 +0000 Subject: [PATCH] upgrading package: mono 2.8.2 -> 3.10.0 --- mono/mono.patch | 148 ++++++++++++++++++++++++++++++++++++------------ mono/mono.spec | 58 ++++++------------- 2 files changed, 128 insertions(+), 78 deletions(-) diff --git a/mono/mono.patch b/mono/mono.patch index bd530cf20f..9903a50a64 100644 --- a/mono/mono.patch +++ b/mono/mono.patch @@ -1,37 +1,100 @@ -Index: configure ---- configure.orig 2011-01-06 11:26:23.000000000 +0100 -+++ configure 2011-01-06 11:27:57.000000000 +0100 -@@ -17856,9 +17856,7 @@ - - +Index: eglib/src/gmisc-unix.c +--- eglib/src/gmisc-unix.c.orig 2014-09-22 15:23:05.000000000 +0200 ++++ eglib/src/gmisc-unix.c 2014-12-07 14:01:54.934943012 +0100 +@@ -93,24 +93,27 @@ + pthread_mutex_unlock (&pw_lock); + return; + } ++ ++ home_dir = g_getenv ("HOME"); ++ user_name = g_getenv ("USER"); ++ + #ifdef HAVE_GETPWUID_R +- if (getpwuid_r (getuid (), &pw, buf, 4096, &result) == 0) { +- home_dir = g_strdup (pw.pw_dir); +- user_name = g_strdup (pw.pw_name); ++ if (home_dir == NULL || user_name == NULL) { ++ if (getpwuid_r (getuid (), &pw, buf, 4096, &result) == 0) { ++ if (home_dir == NULL) ++ home_dir = g_strdup (pw.pw_dir); ++ if (user_name == NULL) ++ user_name = g_strdup (pw.pw_name); ++ } else { ++ if (user_name == NULL) ++ user_name = "somebody"; ++ } + } + #endif +- if (home_dir == NULL) +- home_dir = g_getenv ("HOME"); --if test "x$lt_cv_prog_gnu_ld" = "xno"; then - no_version_script=yes --fi +- if (user_name == NULL) { +- user_name = g_getenv ("USER"); +- if (user_name == NULL) +- user_name = "somebody"; +- } + pthread_mutex_unlock (&pw_lock); + } - if test x$no_version_script = xyes; then - NO_VERSION_SCRIPT_TRUE= +-/* Give preference to /etc/passwd than HOME */ + const gchar * + g_get_home_dir (void) + { +Index: eglib/src/gunicode.c +--- eglib/src/gunicode.c.orig 2014-09-22 15:23:05.000000000 +0200 ++++ eglib/src/gunicode.c 2014-12-07 14:01:54.934943012 +0100 +@@ -219,10 +219,10 @@ + is_utf8 = FALSE; + #else + /* These shouldn't be heap allocated */ +-#if HAVE_LOCALCHARSET_H +- my_charset = locale_charset (); +-#elif defined(HAVE_LANGINFO_H) ++#if defined(HAVE_LANGINFO_H) + my_charset = nl_langinfo (CODESET); ++#elif defined(HAVE_LOCALCHARSET_H) ++ my_charset = locale_charset (); + #else + my_charset = "UTF-8"; + #endif Index: mono/Makefile.in ---- mono/Makefile.in.orig 2011-01-04 18:58:11.000000000 +0100 -+++ mono/Makefile.in 2011-01-06 11:26:23.000000000 +0100 -@@ -252,10 +252,10 @@ +--- mono/Makefile.in.orig 2014-10-04 11:28:59.000000000 +0200 ++++ mono/Makefile.in 2014-12-07 14:01:54.916050459 +0100 +@@ -380,7 +380,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ --@CROSS_COMPILING_FALSE@@MOONLIGHT_FALSE@SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph tests benchmark profiler -+@CROSS_COMPILING_FALSE@@MOONLIGHT_FALSE@SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph benchmark profiler - @CROSS_COMPILING_FALSE@@MOONLIGHT_TRUE@SUBDIRS = utils io-layer metadata arch $(interpreter_dir) mini - @CROSS_COMPILING_TRUE@SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis --DIST_SUBDIRS = utils io-layer cil metadata arch interpreter mini dis monograph tests benchmark profiler -+DIST_SUBDIRS = utils io-layer cil metadata arch interpreter mini dis monograph benchmark profiler - all: all-recursive - - .SUFFIXES: +-@CROSS_COMPILING_FALSE@@INSTALL_MONOTOUCH_FALSE@SUBDIRS = arch utils io-layer cil metadata $(interpreter_dir) mini dis monograph tests unit-tests benchmark profiler ++@CROSS_COMPILING_FALSE@@INSTALL_MONOTOUCH_FALSE@SUBDIRS = arch utils io-layer cil metadata $(interpreter_dir) mini dis monograph profiler + @CROSS_COMPILING_FALSE@@INSTALL_MONOTOUCH_TRUE@SUBDIRS = utils io-layer metadata arch mini profiler + @CROSS_COMPILING_TRUE@SUBDIRS = arch utils io-layer cil metadata $(interpreter_dir) mini dis profiler + DIST_SUBDIRS = arch utils io-layer cil metadata interpreter mini dis monograph tests unit-tests benchmark profiler +Index: mono/io-layer/processes.h +--- mono/io-layer/processes.h.orig 2014-09-22 15:23:09.000000000 +0200 ++++ mono/io-layer/processes.h 2014-12-07 14:01:54.916050459 +0100 +@@ -11,6 +11,7 @@ + #define _WAPI_PROCESSES_H_ + + #include ++#include + + #include + #include +Index: mono/mini/ldscript.mono +--- mono/mini/ldscript.mono.orig 2014-09-22 15:23:09.000000000 +0200 ++++ mono/mini/ldscript.mono 2014-12-07 14:01:54.934943012 +0100 +@@ -7,6 +7,4 @@ + gc_thread_vtable; + mini_type_is_vtype; + mini_is_gsharedvt_klass; +- local: +- *; + }; Index: mono/mini/mini-x86.c ---- mono/mini/mini-x86.c.orig 2011-01-04 18:39:55.000000000 +0100 -+++ mono/mini/mini-x86.c 2011-01-06 11:26:23.000000000 +0100 -@@ -583,6 +583,34 @@ - return get_call_info_internal (gsctx, cinfo, sig, is_pinvoke); +--- mono/mini/mini-x86.c.orig 2014-10-04 11:27:43.000000000 +0200 ++++ mono/mini/mini-x86.c 2014-12-07 14:01:54.916050459 +0100 +@@ -621,6 +621,34 @@ + return get_call_info_internal (gsctx, cinfo, sig); } +#ifndef signbit @@ -66,9 +129,9 @@ Index: mono/mini/mini-x86.c * mono_arch_get_argument_info: * @csig: a method signature Index: mono/utils/mono-codeman.c ---- mono/utils/mono-codeman.c.orig 2011-01-04 18:39:55.000000000 +0100 -+++ mono/utils/mono-codeman.c 2011-01-06 11:26:23.000000000 +0100 -@@ -52,7 +52,7 @@ +--- mono/utils/mono-codeman.c.orig 2014-09-22 15:23:09.000000000 +0200 ++++ mono/utils/mono-codeman.c 2014-12-07 14:01:54.925376402 +0100 +@@ -68,7 +68,7 @@ #define MAX_WASTAGE 32 #define MIN_BSIZE 32 @@ -78,19 +141,30 @@ Index: mono/utils/mono-codeman.c #else #define ARCH_MAP_FLAGS 0 Index: mono/utils/mono-proclib.c ---- mono/utils/mono-proclib.c.orig 2011-01-04 18:39:55.000000000 +0100 -+++ mono/utils/mono-proclib.c 2011-01-06 11:26:23.000000000 +0100 -@@ -17,6 +17,7 @@ +--- mono/utils/mono-proclib.c.orig 2014-09-22 15:23:09.000000000 +0200 ++++ mono/utils/mono-proclib.c 2014-12-07 14:01:54.925376402 +0100 +@@ -23,6 +23,7 @@ #include #include #include +#include #include - #ifdef HAVE_SYS_USER_H - #include + #if defined(__APPLE__) + #include +Index: mono/utils/mono-threads-freebsd.c +--- mono/utils/mono-threads-freebsd.c.orig 2014-09-22 15:23:09.000000000 +0200 ++++ mono/utils/mono-threads-freebsd.c 2014-12-07 14:01:54.925376402 +0100 +@@ -2,6 +2,7 @@ + + #if defined(__FreeBSD__) + ++#include + #include + #include + Index: support/stdio.c ---- support/stdio.c.orig 2011-01-04 18:39:55.000000000 +0100 -+++ support/stdio.c 2011-01-06 11:26:23.000000000 +0100 +--- support/stdio.c.orig 2014-09-22 15:23:09.000000000 +0200 ++++ support/stdio.c 2014-12-07 14:01:54.934943012 +0100 @@ -146,13 +146,13 @@ Mono_Posix_Stdlib_setvbuf (void* stream, void *buf, int mode, mph_size_t size) { diff --git a/mono/mono.spec b/mono/mono.spec index 6115d7a779..720a1cca5e 100644 --- a/mono/mono.spec +++ b/mono/mono.spec @@ -22,13 +22,13 @@ ## # package version -%define V_major 2.8 -%define V_minor 2 +%define V_major 3.10 +%define V_minor 0 # package information Name: mono Summary: Unix .NET Development Framework -URL: http://go-mono.com/ +URL: http://www.mono-project.com/ Vendor: The Mono Project Packager: OpenPKG Foundation e.V. Distribution: OpenPKG Community @@ -36,17 +36,17 @@ Class: EVAL Group: Language License: GPL Version: %{V_major}.%{V_minor} -Release: 20120713 +Release: 20141207 # list of sources -Source0: http://go-mono.com/sources/mono/mono-%{version}.tar.bz2 +Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2 Patch0: mono.patch # build information -BuildPreReq: OpenPKG, openpkg >= 20100101, pkgconfig, perl, bison, make, gcc -PreReq: OpenPKG, openpkg >= 20100101 -BuildPreReq: glib2, glib::with_threads = yes, gc, gc::with_threads = yes -PreReq: glib2, glib::with_threads = yes, gc, gc::with_threads = yes +BuildPreReq: OpenPKG, openpkg >= 20140101, pkgconfig, perl, bison, make, gcc +PreReq: OpenPKG, openpkg >= 20140101 +BuildPreReq: glib, glib::with_threads = yes, gc, gc::with_threads = yes +PreReq: glib, glib::with_threads = yes, gc, gc::with_threads = yes Conflicts: pnet %description @@ -60,7 +60,7 @@ Conflicts: pnet %track prog mono = { version = %{version} - url = http://go-mono.com/sources-stable/ + url = http://download.mono-project.com/sources/mono/ regex = mono-(\d+\.\d+(\.\d+)*)\.tar\.bz2 } @@ -69,42 +69,16 @@ Conflicts: pnet %patch -p0 %build - # trick configure to not use truncl(3) - # because this is not available everywhere, - # although sometimes defined in - ( echo "ac_cv_header_aio_h=no" - echo "ac_cv_func_trunc=no" - echo "ac_cv_trunc=no" - echo "ac_cv_lib_sunmath_aintl=no" - ) >config.cache + # configure program %{l_shtool} subst \ - -e 's/trunc;/notexisting;/' \ -e 's/-lgc/-lgcthread/g' \ + -e 's/isinf (1)/isinf (1.0)/g' \ 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.in \ - scripts/mono-find-requires.in \ - web/mono-build-w32.sh \ - mcs/class/Mono.WebBrowser/build-csproj2k5 \ - 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}" \ CPPFLAGS="%{l_cppflags gc .}" \ LDFLAGS="%{l_ldflags}" \ + MONO_SHARED_DIR="`pwd`" \ ./configure \ --cache-file=./config.cache \ --prefix=%{l_prefix} \ @@ -112,10 +86,12 @@ Conflicts: pnet --bindir=%{l_prefix}/libexec/mono \ --with-gc=boehm \ --with-jit=yes \ - --disable-shared + --without-moonlight \ + --disable-shared \ + --disable-dtrace # build program - %{l_make} %{l_mflags} + %{l_make} %{l_mflags -O} %install # use a working install to create subdirs