Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.0.1_rc2.diff buildfix-mono-2-2.diff
Date: Tue, 27 Jan 2009 15:04:41
Message-Id: E1LRpUV-0000nb-Ix@stork.gentoo.org
1 suka 09/01/27 15:04:39
2
3 Modified: gentoo-3.0.1_rc2.diff
4 Added: buildfix-mono-2-2.diff
5 Log:
6 Fix build problems with Mono 2.2, see bug #255845
7 (Portage version: 2.2_rc23/cvs/Linux i686)
8
9 Revision Changes Path
10 1.2 app-office/openoffice/files/gentoo-3.0.1_rc2.diff
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.1_rc2.diff?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.1_rc2.diff?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.1_rc2.diff?r1=1.1&r2=1.2
15
16 Index: gentoo-3.0.1_rc2.diff
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.0.1_rc2.diff,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- gentoo-3.0.1_rc2.diff 18 Jan 2009 19:12:40 -0000 1.1
23 +++ gentoo-3.0.1_rc2.diff 27 Jan 2009 15:04:39 -0000 1.2
24 @@ -21,4 +21,14 @@
25 # Allow build to proceed with PaX enabled
26 gentoo-pax-fix.diff, aprosky
27 # support server-only versions of 64bit JDKs
28 +@@ -1527,6 +1527,9 @@
29 + mono-climaker-config.diff
30 + mono-climaker-bridgetest.diff
31 +
32 ++# Buildfix with Mono 2.2, aprosky
33 ++buildfix-mono-2-2.diff
34 ++
35 + [ VBAObjects ]
36 + SectionOwner => noelpwer
37 +
38
39
40
41
42 1.1 app-office/openoffice/files/buildfix-mono-2-2.diff
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/buildfix-mono-2-2.diff?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/buildfix-mono-2-2.diff?rev=1.1&content-type=text/plain
46
47 Index: buildfix-mono-2-2.diff
48 ===================================================================
49 --- cli_ure/source/climaker/makefile.mk
50 +++ cli_ure/source/climaker/makefile.mk
51 @@ -62,7 +62,7 @@
52
53 $(BIN)$/climaker : climaker_csharp.cs
54 gmcs -debug -unsafe climaker_csharp.cs -reference:$(BIN)/cli_basetypes.dll -out:$(BIN)$/climaker.exe
55 - mkbundle2 --static -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
56 + mkbundle2 -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
57
58 .INCLUDE : target.mk
59 .ENDIF # "$(ENABLE_MONO_CLIMAKER)" != "YES"