[packages/mono] - updated to 3.4.0 - updated sonames patch - added missing patch (missing file from mono git)

qboosh qboosh at pld-linux.org
Fri Apr 4 17:37:23 CEST 2014


commit a0d468f1821fd92e79502218f22873e90563c73b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 4 17:38:54 2014 +0200

    - updated to 3.4.0
    - updated sonames patch
    - added missing patch (missing file from mono git)

 mono-missing.patch |  7 +++++++
 mono-sonames.patch | 10 +++++++---
 mono.spec          |  6 ++++--
 3 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/mono.spec b/mono.spec
index 53f8a79..df295c5 100644
--- a/mono.spec
+++ b/mono.spec
@@ -13,13 +13,14 @@
 Summary:	Common Language Infrastructure implementation
 Summary(pl.UTF-8):	Implementacja Common Language Infrastructure
 Name:		mono
-Version:	3.2.8
+Version:	3.4.0
 Release:	1
 License:	LGPL v2 (VM), MIT X11/GPL v2 (C# compilers), MIT X11 (classes, tools), GPL v2 (tools)
 Group:		Development/Languages
 # latest downloads summary at http://download.mono-project.com/sources-stable/
 Source0:	http://download.mono-project.com/sources/mono/%{name}-%{version}.tar.bz2
-# Source0-md5:	1075f99bd8a69890af9e30309728e684
+# Source0-md5:	698024a40ee0721c2a24c45be2e39f28
+Patch0:		%{name}-missing.patch
 Patch1:		%{name}-mint.patch
 Patch2:		%{name}-sonames.patch
 Patch4:		%{name}-console-no-utf8-bom.patch
@@ -215,6 +216,7 @@ oraz dotGNU.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch4 -p1
diff --git a/mono-missing.patch b/mono-missing.patch
new file mode 100644
index 0000000..e78407f
--- /dev/null
+++ b/mono-missing.patch
@@ -0,0 +1,7 @@
+--- mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets.orig	1970-01-01 01:00:00.000000000 +0100
++++ mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets	2014-04-04 16:08:12.169422698 +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/mono-sonames.patch b/mono-sonames.patch
index 6d6d1c1..9c92398 100644
--- a/mono-sonames.patch
+++ b/mono-sonames.patch
@@ -1,5 +1,5 @@
---- mono-3.2.8/data/config.in.orig	2014-02-19 19:51:55.000000000 +0100
-+++ mono-3.2.8/data/config.in	2014-03-03 11:03:45.980947697 +0100
+--- mono-3.4.0/data/config.in.orig	2014-03-31 22:25:07.000000000 +0200
++++ mono-3.4.0/data/config.in	2014-04-03 20:03:02.227596535 +0200
 @@ -5,8 +5,8 @@
  	<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
  	<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
@@ -11,12 +11,16 @@
  	<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
  	<dllmap dll="oci" target="libclntsh at libsuffix@" os="!windows"/>
  	<dllmap dll="db2cli" target="libdb2_36 at libsuffix@" os="!windows"/>
-@@ -26,6 +26,6 @@
+@@ -26,8 +26,8 @@
  		<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
  		<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
  	</dllmap>
 -	<dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus at libsuffix@" os="!windows"/>
 -	<dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus at libsuffix@"  os="!windows"/>
+-	<dllmap dll="gdi32" target="@prefix@/lib/libgdiplus at libsuffix@" os="!windows"/>
+-	<dllmap dll="gdi32.dll" target="@prefix@/lib/libgdiplus at libsuffix@" os="!windows"/>
 +	<dllmap dll="gdiplus" target="libgdiplus.so.0" os="!windows"/>
 +	<dllmap dll="gdiplus.dll" target="libgdiplus.so.0"  os="!windows"/>
++	<dllmap dll="gdi32" target="libgdiplus.so.0" os="!windows"/>
++	<dllmap dll="gdi32.dll" target="libgdiplus.so.0" os="!windows"/>
  </configuration>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mono.git/commitdiff/a0d468f1821fd92e79502218f22873e90563c73b



More information about the pld-cvs-commit mailing list