| 1 |
suka 08/09/26 11:27:06 |
| 2 |
|
| 3 |
Modified: gentoo-3.0.0_rc2.diff |
| 4 |
Added: stax-saxon-no-java.diff |
| 5 |
Log: |
| 6 |
Another fix for building without java, closes bug #238642 |
| 7 |
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-office/openoffice/files/gentoo-3.0.0_rc2.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0_rc2.diff?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0_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.0_rc2.diff?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: gentoo-3.0.0_rc2.diff |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0_rc2.diff,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- gentoo-3.0.0_rc2.diff 23 Sep 2008 12:58:36 -0000 1.1 |
| 23 |
+++ gentoo-3.0.0_rc2.diff 26 Sep 2008 11:27:05 -0000 1.2 |
| 24 |
@@ -8,4 +8,15 @@ |
| 25 |
$OOINSTBASE/program/soffice $2 "\$@" |
| 26 |
EOT |
| 27 |
chmod 755 $1 |
| 28 |
+--- patches/dev300/apply |
| 29 |
++++ patches/dev300/apply |
| 30 |
+@@ -1437,6 +1437,8 @@ |
| 31 |
+ #vcl_font-NO_LIST.diff |
| 32 |
+ # linux-headers-2.6.22 issue?! |
| 33 |
+ linux-headers.diff |
| 34 |
++#fix build without java |
| 35 |
++stax-saxon-no-java.diff |
| 36 |
+ |
| 37 |
+ [ DebianBaseOnly ] |
| 38 |
+ SectionOwner => rengelha |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 app-office/openoffice/files/stax-saxon-no-java.diff |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/stax-saxon-no-java.diff?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/stax-saxon-no-java.diff?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: stax-saxon-no-java.diff |
| 49 |
=================================================================== |
| 50 |
? stax/unxlngx6.pro |
| 51 |
? saxon/unxlngx6.pro |
| 52 |
Index: stax/makefile.mk |
| 53 |
=================================================================== |
| 54 |
RCS file: /cvs/external/stax/makefile.mk,v |
| 55 |
retrieving revision 1.4 |
| 56 |
diff -u -r1.4 makefile.mk |
| 57 |
--- stax/makefile.mk 28 Jul 2008 11:59:31 -0000 1.4 |
| 58 |
+++ stax/makefile.mk 26 Sep 2008 09:32:56 -0000 |
| 59 |
@@ -64,5 +64,7 @@ |
| 60 |
|
| 61 |
.INCLUDE : set_ext.mk |
| 62 |
.INCLUDE : target.mk |
| 63 |
+.IF "$(SOLAR_JAVA)" != "" |
| 64 |
.INCLUDE : tg_ext.mk |
| 65 |
+.ENDIF |
| 66 |
|
| 67 |
Index: saxon/makefile.mk |
| 68 |
=================================================================== |
| 69 |
RCS file: /cvs/external/saxon/makefile.mk,v |
| 70 |
retrieving revision 1.1 |
| 71 |
diff -u -r1.1 makefile.mk |
| 72 |
--- saxon/makefile.mk 14 Jul 2008 15:43:51 -0000 1.1 |
| 73 |
+++ saxon/makefile.mk 26 Sep 2008 09:32:56 -0000 |
| 74 |
@@ -63,5 +63,7 @@ |
| 75 |
|
| 76 |
.INCLUDE : set_ext.mk |
| 77 |
.INCLUDE : target.mk |
| 78 |
+.IF "$(SOLAR_JAVA)" != "" |
| 79 |
.INCLUDE : tg_ext.mk |
| 80 |
+.ENDIF |
Archives