| 1 |
suka 08/10/13 12:41:11 |
| 2 |
|
| 3 |
Added: nojavanostax.diff gentoo-3.0.0.diff |
| 4 |
Log: |
| 5 |
openoffice-3.0.0, masked until build without-java fixes are tested |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-office/openoffice/files/nojavanostax.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/nojavanostax.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/nojavanostax.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nojavanostax.diff |
| 15 |
=================================================================== |
| 16 |
--- config_office/configure.in |
| 17 |
+++ config_office/configure.in |
| 18 |
@@ -3452,6 +3452,7 @@ |
| 19 |
dnl =================================================================== |
| 20 |
dnl Check for building stax |
| 21 |
dnl =================================================================== |
| 22 |
+if test "$SOLAR_JAVA" != ""; then |
| 23 |
AC_MSG_CHECKING([whether to build the stax]) |
| 24 |
if test -f "../external/StAX/jsr173_1.0_api.jar"; then |
| 25 |
BUILD_STAX=NO |
| 26 |
@@ -3459,6 +3460,7 @@ |
| 27 |
else |
| 28 |
BUILD_STAX=YES |
| 29 |
AC_MSG_RESULT([yes]) |
| 30 |
+fi |
| 31 |
fi |
| 32 |
AC_SUBST(BUILD_STAX) |
| 33 |
|
| 34 |
--- stax/makefile.mk |
| 35 |
+++ stax/makefile.mk |
| 36 |
@@ -35,12 +35,13 @@ |
| 37 |
TARGET=stax |
| 38 |
USE_JAVAVER=TRUE |
| 39 |
|
| 40 |
+.IF "$(SOLAR_JAVA)" != "" |
| 41 |
+ |
| 42 |
# --- Settings ----------------------------------------------------- |
| 43 |
|
| 44 |
.INCLUDE : settings.mk |
| 45 |
.INCLUDE : antsettings.mk |
| 46 |
|
| 47 |
-.IF "$(SOLAR_JAVA)" != "" |
| 48 |
.IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj" |
| 49 |
all: |
| 50 |
@echo "Your java version already contains StAX" |
| 51 |
@@ -68,14 +69,20 @@ |
| 52 |
|
| 53 |
OUT2CLASS=jsr173_1.0_api.jar |
| 54 |
|
| 55 |
+.ENDIF # "$(BUILD_STAX)" != "YES" |
| 56 |
+ |
| 57 |
+.ELSE # $(SOLAR_JAVA)=="" |
| 58 |
+all: |
| 59 |
+ @echo "Nothing to do: SOLAR_JAVA not set" |
| 60 |
.ENDIF # $(SOLAR_JAVA)!= "" |
| 61 |
# --- Targets ------------------------------------------------------ |
| 62 |
|
| 63 |
+.IF "$(SOLAR_JAVA)" != "" |
| 64 |
.INCLUDE : set_ext.mk |
| 65 |
+.ENDIF |
| 66 |
.INCLUDE : target.mk |
| 67 |
.IF "$(SOLAR_JAVA)" != "" |
| 68 |
.INCLUDE : tg_ext.mk |
| 69 |
-.ENDIF |
| 70 |
|
| 71 |
.ENDIF # "$(BUILD_STAX)" != "YES" |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.1 app-office/openoffice/files/gentoo-3.0.0.diff |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.1&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.1&content-type=text/plain |
| 81 |
|
| 82 |
Index: gentoo-3.0.0.diff |
| 83 |
=================================================================== |
| 84 |
--- bin/package-ooo |
| 85 |
+++ bin/package-ooo |
| 86 |
@@ -33,6 +33,7 @@ |
| 87 |
{ |
| 88 |
cat <<EOT >$1 |
| 89 |
#!/bin/sh |
| 90 |
+unset PYTHONPATH |
| 91 |
$OOINSTBASE/program/soffice $2 "\$@" |
| 92 |
EOT |
| 93 |
chmod 755 $1 |
| 94 |
--- patches/dev300/apply |
| 95 |
+++ patches/dev300/apply |
| 96 |
@@ -1425,7 +1425,9 @@ |
| 97 |
SectionOwner => aprosky |
| 98 |
|
| 99 |
# system lucene classpath |
| 100 |
-gentoo-system-lucene.diff |
| 101 |
+#gentoo-system-lucene.diff |
| 102 |
+#No java build |
| 103 |
+nojavanostax.diff |
| 104 |
# Allow build to proceed with PaX enabled |
| 105 |
gentoo-pax-fix.diff, aprosky |
| 106 |
# support server-only versions of 64bit JDKs |
Archives