1 |
suka 08/09/26 11:27:04 |
2 |
|
3 |
Modified: openoffice-3.0.0_rc2.ebuild ChangeLog |
4 |
Log: |
5 |
Another fix for building without java, closes bug #238642 |
6 |
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 app-office/openoffice/openoffice-3.0.0_rc2.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: openoffice-3.0.0_rc2.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- openoffice-3.0.0_rc2.ebuild 23 Sep 2008 21:41:07 -0000 1.2 |
22 |
+++ openoffice-3.0.0_rc2.ebuild 26 Sep 2008 11:27:03 -0000 1.3 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild,v 1.2 2008/09/23 21:41:07 suka Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild,v 1.3 2008/09/26 11:27:03 suka Exp $ |
28 |
|
29 |
WANT_AUTOCONF="2.5" |
30 |
WANT_AUTOMAKE="1.9" |
31 |
@@ -245,6 +245,8 @@ |
32 |
epatch "${FILESDIR}/gentoo-${PV}.diff" |
33 |
epatch "${FILESDIR}/ooo-env_log.diff" |
34 |
|
35 |
+ cp -f "${FILESDIR}/stax-saxon-no-java.diff" ${S}/patches/dev300/ || die |
36 |
+ |
37 |
#Use flag checks |
38 |
if use java ; then |
39 |
echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE} |
40 |
@@ -377,6 +379,7 @@ |
41 |
# Add available & useful jars to openoffice classpath |
42 |
use java && /usr/$(get_libdir)/openoffice/basis3.0/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null |
43 |
|
44 |
+ elog |
45 |
elog " Spell checking is provided through our own myspell-ebuilds, " |
46 |
elog " if you want to use it, please install the correct myspell package " |
47 |
elog " according to your language needs. " |
48 |
|
49 |
|
50 |
|
51 |
1.419 app-office/openoffice/ChangeLog |
52 |
|
53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.419&view=markup |
54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.419&content-type=text/plain |
55 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.418&r2=1.419 |
56 |
|
57 |
Index: ChangeLog |
58 |
=================================================================== |
59 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v |
60 |
retrieving revision 1.418 |
61 |
retrieving revision 1.419 |
62 |
diff -u -r1.418 -r1.419 |
63 |
--- ChangeLog 23 Sep 2008 21:41:07 -0000 1.418 |
64 |
+++ ChangeLog 26 Sep 2008 11:27:03 -0000 1.419 |
65 |
@@ -1,6 +1,11 @@ |
66 |
# ChangeLog for app-office/openoffice |
67 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
68 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.418 2008/09/23 21:41:07 suka Exp $ |
69 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.419 2008/09/26 11:27:03 suka Exp $ |
70 |
+ |
71 |
+ 26 Sep 2008; Andreas Proschofsky <suka@g.o> |
72 |
+ files/gentoo-3.0.0_rc2.diff, +files/stax-saxon-no-java.diff, |
73 |
+ openoffice-3.0.0_rc2.ebuild: |
74 |
+ Another fix for building without java, closes bug #238642 |
75 |
|
76 |
23 Sep 2008; Andreas Proschofsky <suka@g.o> |
77 |
openoffice-3.0.0_rc2.ebuild: |