Package: openoffice.org
Version: 1.0.99+1.1rc3-1.2pre1
Severity: wishlist
Tags: patch
With the attached patches, OpenOffice.org will build without a JDK
installed. These patches add checks for SOLAR_JAVA to various
makefiles, source files, and setup lists. They use xsltproc to replace
the java xml manipulations in readlicense_oo and officecfg. The patches
apply to the latest CVS versions of the debian and ooo-build directories
based on version 1.1rc3.
Changes:
* ooo-build/patches/OOO_1_1_RC3/apply - Added new patches with
descriptions.
+ allow-no-jdk.diff - If java is disabled with --disable-java,
don't abort the configure script if a JDK is not found.
+ solenv-set-solar-java-only-if-unset.diff - Set the SOLAR_JAVA
variable conditionally with "*=".
+ readlicense-oo-xsltproc.diff - Use xsltproc to replace java
for xml transforms in readlicense_oo.
+ officecfg-xsltproc.diff - Use xsltproc to replace java for xml
transforms in officecfg.
+ berkeleydb-handle-no-solar-java.diff - If SOLAR_JAVA is not set,
don't pass --enable-java to the configure script, and don't
expect the jar when finished.
+ ridljar-handle-no-solar-java.diff - If SOLAR_JAVA is not set,
don't attempt to zip up the compiled java files, since they
will not be built.
+ jurt-handle-no-solar-java.diff - Don't build jpipe with
SOLAR_JAVA not set.
+ jvmaccess-handle-no-solar-java.diff - Don't build jvmaccess
with SOLAR_JAVA not set.
+ jni-uno-handle-no-solar-java.diff - Don't build jni_uno with
SOLAR_JAVA not set.
+ javaunohelper-handle-no-solar-java.diff - Don't build
javaunohelper with SOLAR_JAVA not set
+ psprint-handle-no-solar-java.diff - Don't use jvmaccess to get
JDK font path with SOLAR_JAVA not set.
+ sj2-handle-no-solar-java.diff - When SOLAR_JAVA is not set,
replace java applet support with stubs that throw an exception.
+ setup2-handle-no-solar-java.diff - Don't build jvmsetup or use
jvmaccess for java-related setup with SOLAR_JAVA not set.
+ scp-handle-no-solar-java.diff - Don't ship various java-related
files that will no longer be built, but ship the stubbed out
libj from sj2 because setup fails without it.
+ svg-handle-no-solar-java.diff - Disable SVG import support
with SOLAR_JAVA not set, since it depends on compile-time and
run-time java support.
+ xsltvalidate-handle-no-solar-java.diff - Disable java components
with SOLAR_JAVA not set.
+ xsltfilter-handle-no-solar-java.diff - Disable java components
with SOLAR_JAVA not set.
+ desktop-handle-no-solar-java.diff - Don't build javaldx with
SOLAR_JAVA not set, and check for javaldx in soffice.sh before
using it.
* debian/rules
+ Removed --with-jdkhome and added --disable-java in configure
invocation.
+ Don't look for jdkhome in DEB_BUILD_OPTIONS.
+ Removed classpath from BUILDCMD.
+ Don't set JDK_HOME or test for javac in JDK_HOME.
* debian/scripts/detect_java.sh - Deleted.
* debian/setperms - Removed chmod of detect_java.sh.
* debian/control, debian/control.in - Removed JDK and lib*-java
packages from Build-Depends, and added xsltproc. Moved from contrib
to main.
* README - Removed JDK information.
* MANIFEST.i386, MANIFEST.powerpc, MANIFEST.s390 - Updated.
* openoffice.org.install, openoffice.org-bin.install - Updated.
- Josh Triplett
diff -Naur -x CVS debian.orig/MANIFEST.i386 debian/MANIFEST.i386
--- debian.orig/MANIFEST.i386 2003-09-14 19:16:22.000000000 -0700
+++ debian/MANIFEST.i386 2003-09-14 18:13:46.000000000 -0700
@@ -109,25 +109,6 @@
usr/lib/openoffice/program/acceptor.uno.so
usr/lib/openoffice/program/bootstraprc
usr/lib/openoffice/program/bridgefac.uno.so
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/officebean.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/component.reg
usr/lib/openoffice/program/components/libaddrbook.so
usr/lib/openoffice/program/components/libmork.so
@@ -207,11 +188,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645li.so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645li.so
@@ -235,7 +211,6 @@
usr/lib/openoffice/program/libdate645li.so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645li.so
usr/lib/openoffice/program/libdbase645li.so
usr/lib/openoffice/program/libdbi645li.so
@@ -279,15 +254,6 @@
usr/lib/openoffice/program/libicuuc.so.22
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645li_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645li.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/libldap50.so
usr/lib/openoffice/program/liblng645li.so
usr/lib/openoffice/program/liblocaledata_en.so
@@ -307,7 +273,6 @@
usr/lib/openoffice/program/libodbcbase2.so
usr/lib/openoffice/program/libofa645li.so
usr/lib/openoffice/program/liboffacc645li.so
-usr/lib/openoffice/program/libofficebean.so
usr/lib/openoffice/program/libpackage2.so
usr/lib/openoffice/program/libpcr645li.so
usr/lib/openoffice/program/libpdffilter645li.so
@@ -383,8 +348,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645li.so
usr/lib/openoffice/program/libxcr645li.so
-usr/lib/openoffice/program/libxmlfa645li.so
-usr/lib/openoffice/program/libxmlfd645li.so
usr/lib/openoffice/program/libxmx645li.so
usr/lib/openoffice/program/libxo645li.so
usr/lib/openoffice/program/libxpcom.so
@@ -435,7 +398,6 @@
usr/lib/openoffice/program/resource/gal64501.res
usr/lib/openoffice/program/resource/imp64501.res
usr/lib/openoffice/program/resource/iso64501.res
-usr/lib/openoffice/program/resource/jvm64501.res
usr/lib/openoffice/program/resource/lgd64501.res
usr/lib/openoffice/program/resource/ofa64501.res
usr/lib/openoffice/program/resource/ooo64501.res
@@ -2003,7 +1965,6 @@
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/vnd.sun.xml.writer.global.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.fp
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
usr/lib/openoffice/share/config/symbol/sc05300.bmp
diff -Naur -x CVS debian.orig/MANIFEST.powerpc debian/MANIFEST.powerpc
--- debian.orig/MANIFEST.powerpc 2003-09-14 19:16:23.000000000 -0700
+++ debian/MANIFEST.powerpc 2003-09-14 18:13:47.000000000 -0700
@@ -109,25 +109,6 @@
usr/lib/openoffice/program/acceptor.uno.so
usr/lib/openoffice/program/bootstraprc
usr/lib/openoffice/program/bridgefac.uno.so
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/officebean.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/component.reg
usr/lib/openoffice/program/components/libabsyncsvc.so
usr/lib/openoffice/program/components/libaddrbook.so
@@ -208,11 +189,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645lp.so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645lp.so
@@ -236,7 +212,6 @@
usr/lib/openoffice/program/libdate645lp.so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645lp.so
usr/lib/openoffice/program/libdbase645lp.so
usr/lib/openoffice/program/libdbi645lp.so
@@ -279,15 +254,6 @@
usr/lib/openoffice/program/libicuuc.so.22
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645lp_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645lp.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/libldap50.so
usr/lib/openoffice/program/liblng645lp.so
usr/lib/openoffice/program/liblocaledata_en.so
@@ -307,7 +273,6 @@
usr/lib/openoffice/program/libodbcbase2.so
usr/lib/openoffice/program/libofa645lp.so
usr/lib/openoffice/program/liboffacc645lp.so
-usr/lib/openoffice/program/libofficebean.so
usr/lib/openoffice/program/libpackage2.so
usr/lib/openoffice/program/libpcr645lp.so
usr/lib/openoffice/program/libpdffilter645lp.so
@@ -383,8 +348,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645lp.so
usr/lib/openoffice/program/libxcr645lp.so
-usr/lib/openoffice/program/libxmlfa645lp.so
-usr/lib/openoffice/program/libxmlfd645lp.so
usr/lib/openoffice/program/libxmx645lp.so
usr/lib/openoffice/program/libxo645lp.so
usr/lib/openoffice/program/libxpcom.so
@@ -428,7 +391,6 @@
usr/lib/openoffice/program/resource/gal64501.res
usr/lib/openoffice/program/resource/imp64501.res
usr/lib/openoffice/program/resource/iso64501.res
-usr/lib/openoffice/program/resource/jvm64501.res
usr/lib/openoffice/program/resource/lgd64501.res
usr/lib/openoffice/program/resource/ofa64501.res
usr/lib/openoffice/program/resource/ooo64501.res
@@ -2047,7 +2009,6 @@
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/vnd.sun.xml.writer.global.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.fp
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
usr/lib/openoffice/share/config/symbol/sc05300.bmp
diff -Naur -x CVS debian.orig/MANIFEST.s390 debian/MANIFEST.s390
--- debian.orig/MANIFEST.s390 2003-09-14 19:16:23.000000000 -0700
+++ debian/MANIFEST.s390 2003-09-14 18:51:47.000000000 -0700
@@ -109,25 +109,6 @@
usr/lib/openoffice/program/acceptor.uno.so
usr/lib/openoffice/program/bootstraprc
usr/lib/openoffice/program/bridgefac.uno.so
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/officebean.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/component.reg
usr/lib/openoffice/program/components/libabsyncsvc.so
usr/lib/openoffice/program/components/libaddrbook.so
@@ -208,11 +189,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645l3.so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645l3.so
@@ -236,7 +212,6 @@
usr/lib/openoffice/program/libdate645l3.so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645l3.so
usr/lib/openoffice/program/libdbase645l3.so
usr/lib/openoffice/program/libdbi645l3.so
@@ -280,15 +255,6 @@
usr/lib/openoffice/program/libicuuc.so.22
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645l3_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645l3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/libldap50.so
usr/lib/openoffice/program/liblng645l3.so
usr/lib/openoffice/program/liblocaledata_en.so
@@ -308,7 +274,6 @@
usr/lib/openoffice/program/libodbcbase2.so
usr/lib/openoffice/program/libofa645l3.so
usr/lib/openoffice/program/liboffacc645l3.so
-usr/lib/openoffice/program/libofficebean.so
usr/lib/openoffice/program/libpackage2.so
usr/lib/openoffice/program/libpcr645l3.so
usr/lib/openoffice/program/libpdffilter645l3.so
@@ -384,8 +349,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645l3.so
usr/lib/openoffice/program/libxcr645l3.so
-usr/lib/openoffice/program/libxmlfa645l3.so
-usr/lib/openoffice/program/libxmlfd645l3.so
usr/lib/openoffice/program/libxmx645l3.so
usr/lib/openoffice/program/libxo645l3.so
usr/lib/openoffice/program/libxpcom.so
@@ -436,7 +399,6 @@
usr/lib/openoffice/program/resource/gal64501.res
usr/lib/openoffice/program/resource/imp64501.res
usr/lib/openoffice/program/resource/iso64501.res
-usr/lib/openoffice/program/resource/jvm64501.res
usr/lib/openoffice/program/resource/lgd64501.res
usr/lib/openoffice/program/resource/ofa64501.res
usr/lib/openoffice/program/resource/ooo64501.res
@@ -2006,7 +1968,6 @@
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.fp
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/symbol/sc05300.bmp
usr/lib/openoffice/share/config/symbol/sc05301.bmp
usr/lib/openoffice/share/config/symbol/sc05302.bmp
diff -Naur -x CVS debian.orig/README debian/README
--- debian.orig/README 2003-09-14 19:16:23.000000000 -0700
+++ debian/README 2003-08-18 21:31:36.000000000 -0700
@@ -7,7 +7,6 @@
=================================
Overview:
apt-get source openoffice.org
- [install a jdk if needed]
[install moz zips if building for powerpc, s390 or sparc]
apt-get build-dep openoffice.org (to install build dependencies)
cd openoffice.org-1.0.99+1.1rc
@@ -51,23 +50,8 @@
cache the object files using ccache (needs about 200mb in total)
but remove all other files.
- jdkhome=/absolute/path/to/jdk - use the JDK installed in this path.
-
-Installing a JDK
-----------------
-OpenOffice.org still needs a non-free JDK. You can find a suitable JDK here:
-
--i386, powerpc and sparc-
- deb http://ftp.gwdg.de/pub/languages/java/linux/debian unstable main non-free
-
--s390-
- https://www6.software.ibm.com/dl/lxdk/lxdk-p (unpack tarball under /usr/local)
-
-If you a building on a machine without a JDK and have no root access to install
-one, you can install the JDK to your home directory and specify the path using
-DEB_BUILD_OPTIONS=jdkhome=/absolute/path/to/jdk
-
-Hint: use dpkg-buildpackage -d to skip the build dependencies check.
+JDK Support
+-----------
We are working on adding support for other JDKs to OOo. See this issue for
progress:
http://www.openoffice.org/issues/show_bug.cgi?id=10477
diff -Naur -x CVS debian.orig/control debian/control
--- debian.orig/control 2003-09-14 19:16:23.000000000 -0700
+++ debian/control 2003-09-14 18:32:50.000000000 -0700
@@ -1,9 +1,9 @@
Source: openoffice.org
-Section: contrib/editors
+Section: editors
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), bzip2, debhelper
(>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), j2sdk1.3 [!s390], sharutils, libcrimson-java,
libxalan-java, libxalan2-java, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13),
imagemagick, xutils
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), bzip2, debhelper
(>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), sharutils, libgtk2.0-dev, pkg-config,
libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>=
2.3.13), xsltproc, imagemagick, xutils
Build-Conflicts: libc6 (<< 2.2.5-13) [powerpc]
Standards-Version: 3.5.6
@@ -72,7 +72,7 @@
KDE and KOffice.
Package: openoffice.org-crashrep
-Section: contrib/utils
+Section: utils
Architecture: any
Recommends: openoffice.org
Enhances: openoffice.org
@@ -85,7 +85,7 @@
Package: openoffice.org-gnome
Architecture: any
-Section: contrib/gnome
+Section: gnome
Depends: openoffice.org (>> 1.0.99+1.1rc), ${shlibs:Depends}
Suggests: gnome
Description: GNOME desktop integration for OpenOffice.org
diff -Naur -x CVS debian.orig/control.in debian/control.in
--- debian.orig/control.in 2003-09-14 19:16:23.000000000 -0700
+++ debian/control.in 2003-09-14 18:27:46.000000000 -0700
@@ -1,9 +1,9 @@
Source: openoffice.org
-Section: contrib/editors
+Section: editors
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), bzip2, debhelper
(>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), j2sdk1.3 [!s390], sharutils, libcrimson-java,
libxalan-java, libxalan2-java, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13),
imagemagick, xutils
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), bzip2, debhelper
(>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), sharutils, libgtk2.0-dev, pkg-config,
libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>=
2.3.13), xsltproc, imagemagick, xutils
Build-Conflicts: libc6 (<< 2.2.5-13) [powerpc]
Standards-Version: 3.5.6
@@ -72,7 +72,7 @@
KDE and KOffice.
Package: openoffice.org-crashrep
-Section: contrib/utils
+Section: utils
Architecture: any
Recommends: openoffice.org
Enhances: openoffice.org
@@ -85,7 +85,7 @@
Package: openoffice.org-gnome
Architecture: any
-Section: contrib/gnome
+Section: gnome
Depends: openoffice.org (>> 1.0.99+1.1rc), ${shlibs:Depends}
Suggests: gnome
Description: GNOME desktop integration for OpenOffice.org
diff -Naur -x CVS debian.orig/openoffice.org-bin.install
debian/openoffice.org-bin.install
--- debian.orig/openoffice.org-bin.install 2003-09-14 19:16:23.000000000
-0700
+++ debian/openoffice.org-bin.install 2003-09-14 18:28:34.000000000 -0700
@@ -32,10 +32,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645l[ip3].so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645l[ip3].so
@@ -54,7 +50,6 @@
usr/lib/openoffice/program/libdate645l[ip3].so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645l[ip3].so
usr/lib/openoffice/program/libdbase645l[ip3].so
usr/lib/openoffice/program/libdbi645l[ip3].so
@@ -89,13 +84,6 @@
usr/lib/openoffice/program/libicule.so.22.0
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645l[ip3]_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645l[ip3].so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/liblng645l[ip3].so
usr/lib/openoffice/program/liblocaledata_en.so
usr/lib/openoffice/program/liblocaledata_es.so
@@ -108,7 +96,6 @@
usr/lib/openoffice/program/libodbcbase2.so
usr/lib/openoffice/program/libofa645l[ip3].so
usr/lib/openoffice/program/liboffacc645l[ip3].so
-usr/lib/openoffice/program/libofficebean.so
usr/lib/openoffice/program/libpackage2.so
usr/lib/openoffice/program/libpcr645l[ip3].so
usr/lib/openoffice/program/libpdffilter645l[ip3].so
@@ -169,8 +156,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645l[ip3].so
usr/lib/openoffice/program/libxcr645l[ip3].so
-usr/lib/openoffice/program/libxmlfa645l[ip3].so
-usr/lib/openoffice/program/libxmlfd645l[ip3].so
usr/lib/openoffice/program/libxmx645l[ip3].so
usr/lib/openoffice/program/libxo645l[ip3].so
usr/lib/openoffice/program/libxsltdlg645l[ip3].so
diff -Naur -x CVS debian.orig/openoffice.org.install
debian/openoffice.org.install
--- debian.orig/openoffice.org.install 2003-09-14 19:16:23.000000000 -0700
+++ debian/openoffice.org.install 2003-09-14 18:13:47.000000000 -0700
@@ -5,28 +5,8 @@
usr/lib/openoffice/THIRDPARTYLICENSEREADME.html
usr/lib/openoffice/help/main_transform.xsl
usr/lib/openoffice/program/bootstraprc
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/officebean.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/configmgrrc
usr/lib/openoffice/program/fromtemplate
-usr/lib/openoffice/program/jvmsetup
usr/lib/openoffice/program/libcppu.so
usr/lib/openoffice/program/libcppu.so.3
usr/lib/openoffice/program/libcppuhelper3gcc3.so
@@ -40,8 +20,6 @@
usr/lib/openoffice/program/libicule.so.22
usr/lib/openoffice/program/libicuuc.so
usr/lib/openoffice/program/libicuuc.so.22
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
usr/lib/openoffice/program/libreg.so
usr/lib/openoffice/program/libreg.so.3
usr/lib/openoffice/program/librmcxt.so
@@ -176,7 +154,6 @@
usr/lib/openoffice/share/basic/WebWizard/WebWzrd.xdl
usr/lib/openoffice/share/basic/WebWizard/dialog.xlb
usr/lib/openoffice/share/basic/WebWizard/script.xlb
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
usr/lib/openoffice/share/config/symbol/*.bmp
diff -Naur -x CVS debian.orig/rules debian/rules
--- debian.orig/rules 2003-09-14 19:16:23.000000000 -0700
+++ debian/rules 2003-09-14 18:34:16.000000000 -0700
@@ -43,11 +43,11 @@
include debian/scripts/vars.$(ARCH)
# include variable -- where is Java? ;)
-ifneq (jdkhome=,$(findstring jdkhome=,$(DEB_BUILD_OPTIONS)))
- JDK_HOME := $(shell /bin/sh debian/scripts/detect_java.sh)
-else
- JDK_HOME:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*jdkhome=\([^,]*\),.*/\1/p')
-endif
+#ifneq (jdkhome=,$(findstring jdkhome=,$(DEB_BUILD_OPTIONS)))
+# JDK_HOME := $(shell /bin/sh debian/scripts/detect_java.sh)
+#else
+# JDK_HOME:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*jdkhome=\([^,]*\),.*/\1/p')
+#endif
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
# Build langpacks for all known languages
@@ -216,8 +216,9 @@
# Add parallel build flags and always hard link into the solver
#command to use to build OOo
-BUILDCMD:=XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar
PRODUCT="FULL" \
- $(CURDIR)/$(SOURCE_TREE)/solenv/bin/build.pl
+#BUILDCMD:=XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar
PRODUCT="FULL" \
+# $(CURDIR)/$(SOURCE_TREE)/solenv/bin/build.pl
+BUILDCMD:=PRODUCT="FULL" $(CURDIR)/$(SOURCE_TREE)/solenv/bin/build.pl
# Because of the stampdir magic, when you actually want to run a rule
# over, you would have to remove the stamp manually. Now, just do
@@ -484,7 +485,7 @@
# Make sure we have a valid JDK. If this test fails, please install
the JDK
# package (j2sdk1.3), or add the path to debian/scripts/detect_java.sh,
# or specify a JDK location with
DEB_BUILD_OPTIONS=jdkhome=/absolute/path/to/jdk
- test -x /$(JDK_HOME)/bin/javac
+ #test -x /$(JDK_HOME)/bin/javac
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
@@ -495,7 +496,7 @@
cd $(SOURCE_TREE)/config_office && autoconf && \
CC="$(_CC)" CXX="$(CXX)" sh ./configure \
--with-lang=ALL \
- --with-jdk-home=$(JDK_HOME) \
+ --disable-java \
--enable-libart \
--disable-rpath \
--enable-crashdump \
@@ -505,6 +506,8 @@
< /dev/null
touch $@
+# --with-jdk-home=$(JDK_HOME) \
+# --without-fonts \
# --with-python \
# Build step 3 - bootstrap
diff -Naur -x CVS debian.orig/scripts/detect_java.sh
debian/scripts/detect_java.sh
--- debian.orig/scripts/detect_java.sh 2003-09-14 19:16:23.000000000 -0700
+++ debian/scripts/detect_java.sh 1969-12-31 16:00:00.000000000 -0800
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# where is Java? ;)
-if [ -x /usr/lib/j2sdk1.3/bin/javac ]; then
- JDK_HOME=/usr/lib/j2sdk1.3
-elif [ -x /usr/lib/j2se/1.3/bin/javac ]; then
- JDK_HOME=/usr/lib/j2se/1.3
-elif [ -x /usr/local/IBMJava2-s390-131/bin/javac ]; then
- JDK_HOME=/usr/local/IBMJava2-s390-131
-else
- # uh oh, this isn't supposed to happen :)
- JDK_HOME=JDK_HOME_NOT_FOUND
-fi
-
-# write found value to stdout
-echo $JDK_HOME
diff -Naur -x CVS debian.orig/setperms debian/setperms
--- debian.orig/setperms 2003-09-14 19:16:23.000000000 -0700
+++ debian/setperms 2003-08-22 10:10:34.000000000 -0700
@@ -12,7 +12,6 @@
scripts/source.patch \
scripts/source.unpack \
scripts/unfix.source.patch \
- scripts/detect_java.sh \
scripts/vars* \
scripts/installoverrides \
local/scripts/oo-xvfb-run \
diff -Naur -x CVS ooo-build.orig/patches/OOO_1_1_RC3/apply
ooo-build/patches/OOO_1_1_RC3/apply
--- ooo-build.orig/patches/OOO_1_1_RC3/apply 2003-09-14 22:00:47.000000000
-0700
+++ ooo-build/patches/OOO_1_1_RC3/apply 2003-09-14 19:08:03.000000000 -0700
@@ -290,6 +290,72 @@
# compile msgbox-gnome every time (we have to support ppc, s390, ... too)
compile-msgbox-gnome.diff
+# If java is disabled with --disable-java, don't abort the configure script if
+# a JDK is not found.
+allow-no-jdk.diff
+
+# Set the SOLAR_JAVA variable conditionally with "*=".
+solenv-set-solar-java-only-if-unset.diff
+
+# Use xsltproc to replace java for xml transforms in readlicense_oo.
+readlicense-oo-xsltproc.diff
+
+# Use xsltproc to replace java for xml transforms in officecfg.
+officecfg-xsltproc.diff
+
+# If SOLAR_JAVA is not set, don't pass --enable-java to the configure script,
+# and don't expect the jar when finished.
+berkeleydb-handle-no-solar-java.diff
+
+# If SOLAR_JAVA is not set, don't attempt to zip up the compiled java files,
+# since they will not be built.
+ridljar-handle-no-solar-java.diff
+
+# Don't build jpipe with SOLAR_JAVA not set.
+jurt-handle-no-solar-java.diff
+
+# Don't build jvmaccess with SOLAR_JAVA not set.
+jvmaccess-handle-no-solar-java.diff
+
+# Don't build jni_uno with SOLAR_JAVA not set.
+jni-uno-handle-no-solar-java.diff
+
+# Don't build javaunohelper with SOLAR_JAVA not set
+javaunohelper-handle-no-solar-java.diff
+
+# Don't use jvmaccess to get JDK font path with SOLAR_JAVA not set.
+psprint-handle-no-solar-java.diff
+
+# When SOLAR_JAVA is not set, replace java applet support with stubs that
+# throw an exception.
+sj2-handle-no-solar-java.diff
+
+# Don't build jvmsetup or use jvmaccess for java-related setup with SOLAR_JAVA
+# not set.
+setup2-handle-no-solar-java.diff
+
+# Don't ship various java-related files that will no longer be built, but ship
+# the stubbed out libj from sj2 because setup fails without it.
+scp-handle-no-solar-java.diff
+
+# Disable SVG import support with SOLAR_JAVA not set, since it depends on
+# compile-time and run-time java support.
+svg-handle-no-solar-java.diff
+
+# Disable java components with SOLAR_JAVA not set.
+xsltvalidate-handle-no-solar-java.diff
+
+# Disable java components with SOLAR_JAVA not set.
+xsltfilter-handle-no-solar-java.diff
+
+# Don't build javaldx with SOLAR_JAVA not set, and check for javaldx in
+# soffice.sh before using it.
+desktop-handle-no-solar-java.diff
+
+# Disable java components and documentation of java jars with SOLAR_JAVA not
+# set.
+odk-handle-no-solar-java.diff
+
# so far Ximian only, controversial patches etc.
[ Ximian ]
diff -Naur -x CVS ooo-build.orig/patches/RC3/allow-no-jdk.diff
ooo-build/patches/RC3/allow-no-jdk.diff
--- ooo-build.orig/patches/RC3/allow-no-jdk.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/allow-no-jdk.diff 2003-08-18 21:53:37.000000000
-0700
@@ -0,0 +1,13 @@
+--- config_office/configure.in.orig 2003-08-11 09:57:16.000000000 -0700
++++ config_office/configure.in 2003-08-18 21:52:37.000000000 -0700
+@@ -1180,7 +1180,9 @@
+ fi
+ JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
+ else
+- AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
++ if test "$enable_java" != "no"; then
++ AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
++ fi
+ fi
+ AC_SUBST(JAVA_HOME)
+ AC_SUBST(JDK)
diff -Naur -x CVS
ooo-build.orig/patches/RC3/berkeleydb-handle-no-solar-java.diff
ooo-build/patches/RC3/berkeleydb-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/berkeleydb-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/berkeleydb-handle-no-solar-java.diff 2003-08-18
23:12:08.000000000 -0700
@@ -0,0 +1,34 @@
+--- berkeleydb/makefile.mk.orig 2003-08-07 20:01:59.000000000 -0700
++++ berkeleydb/makefile.mk 2003-08-07 20:04:49.000000000 -0700
+@@ -80,7 +80,10 @@
+ CONFIGURE_DIR=out
+ #relative to CONFIGURE_DIR
+ CONFIGURE_ACTION=..$/dist$/configure
+-CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared
++CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared
++.IF "$(SOLAR_JAVA)"!=""
++CONFIGURE_FLAGS+=--enable-java
++.ENDIF
+
+ BUILD_DIR=$(CONFIGURE_DIR)
+ .IF "$(OS)"=="IRIX"
+@@ -92,7 +95,9 @@
+
+ OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
+
++.IF "$(SOLAR_JAVA)"!=""
+ OUT2BIN=java$/classes$/db.jar
++.ENDIF
+
+ .ENDIF # "$(GUI)"=="UNX"
+
+@@ -129,7 +134,9 @@
+ include$/db_185.h \
+ include$/db_cxx.h
+
++.IF "$(SOLAR_JAVA)"!=""
+ OUT2CLASS=java$/classes$/db.jar
++.ENDIF
+
+ # --- Targets ------------------------------------------------------
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/desktop-handle-no-solar-java.diff
ooo-build/patches/RC3/desktop-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/desktop-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/desktop-handle-no-solar-java.diff 2003-08-19
00:29:27.000000000 -0700
@@ -0,0 +1,67 @@
+--- desktop/scripts/soffice.sh.orig 2003-08-11 11:47:34.000000000 -0700
++++ desktop/scripts/soffice.sh 2003-08-11 11:48:10.000000000 -0700
+@@ -144,25 +144,27 @@
+ esac
+
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+-java_ld_library_path=`"$sd_prog/javaldx"`
+-if [ "$java_ld_library_path" != "" ] ; then
+- case $sd_platform in
+- AIX)
+- LIBPATH=${java_ld_library_path}:${LIBPATH}
+- ;;
+- Darwin)
+- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+- ;;
+- HP-UX)
+- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
+- ;;
+- IRIX*)
+- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
+- ;;
+- *)
+- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+- ;;
+- esac
++if [ -x "$sd_prog/javaldx" ] ; then
++ java_ld_library_path=`"$sd_prog/javaldx"`
++ if [ "$java_ld_library_path" != "" ] ; then
++ case $sd_platform in
++ AIX)
++ LIBPATH=${java_ld_library_path}:${LIBPATH}
++ ;;
++ Darwin)
++ DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
++ ;;
++ HP-UX)
++ SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
++ ;;
++ IRIX*)
++
LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
++ ;;
++ *)
++ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
++ ;;
++ esac
++ fi
+ fi
+
+ # set java environment variables
+--- desktop/source/javaldx/makefile.mk.orig 2003-08-11 11:45:05.000000000
-0700
++++ desktop/source/javaldx/makefile.mk 2003-08-11 11:46:06.000000000 -0700
+@@ -60,6 +60,7 @@
+ #
+ #*************************************************************************
+
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ=..$/..
+
+ PRJNAME=javaldx
+@@ -89,3 +90,7 @@
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
++.ELSE
++dummy:
++ @echo "Not building desktop/source/javaldx with SOLAR_JAVA not set"
++.ENDIF
diff -Naur -x CVS
ooo-build.orig/patches/RC3/javaunohelper-handle-no-solar-java.diff
ooo-build/patches/RC3/javaunohelper-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/javaunohelper-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/javaunohelper-handle-no-solar-java.diff
2003-08-18 23:39:10.000000000 -0700
@@ -0,0 +1,20 @@
+--- javaunohelper/source/makefile.mk.orig 2003-08-08 08:17:31.000000000
-0700
++++ javaunohelper/source/makefile.mk 2003-08-08 08:24:59.000000000 -0700
+@@ -59,6 +59,8 @@
+ #
+ #
+ #*************************************************************************
++
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ=..
+
+ PRJNAME=javaunohelper
+@@ -156,3 +158,8 @@
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
++
++.ELSE
++dummy:
++ @echo "Not building javaunohelper with SOLAR_JAVA not set"
++.ENDIF
diff -Naur -x CVS ooo-build.orig/patches/RC3/jni-uno-handle-no-solar-java.diff
ooo-build/patches/RC3/jni-uno-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/jni-uno-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/jni-uno-handle-no-solar-java.diff 2003-08-18
23:38:30.000000000 -0700
@@ -0,0 +1,19 @@
+--- bridges/source/jni_uno/makefile.mk.orig 2003-08-07 21:54:04.000000000
-0700
++++ bridges/source/jni_uno/makefile.mk 2003-08-07 21:54:37.000000000 -0700
+@@ -59,6 +59,8 @@
+ #
+ #
+ #*************************************************************************
++
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ=..$/..
+
+ PRJNAME=bridges
+@@ -103,3 +105,7 @@
+
+ .INCLUDE : target.mk
+
++.ELSE
++dummy:
++ @echo "Not building jni_uno with SOLAR_JAVA not set"
++.ENDIF
diff -Naur -x CVS ooo-build.orig/patches/RC3/jurt-handle-no-solar-java.diff
ooo-build/patches/RC3/jurt-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/jurt-handle-no-solar-java.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/jurt-handle-no-solar-java.diff 2003-08-18
23:18:26.000000000 -0700
@@ -0,0 +1,15 @@
+--- jurt/source/pipe/makefile.mk.orig 2003-08-07 21:30:08.000000000 -0700
++++ jurt/source/pipe/makefile.mk 2003-08-07 21:35:10.000000000 -0700
+@@ -1,3 +1,4 @@
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ=..$/..
+
+ PRJNAME=jurt
+@@ -33,3 +34,7 @@
+
+ .INCLUDE : target.mk
+
++.ELSE
++dummy:
++ @echo "Not building jpipe with SOLAR_JAVA not set"
++.ENDIF
diff -Naur -x CVS
ooo-build.orig/patches/RC3/jvmaccess-handle-no-solar-java.diff
ooo-build/patches/RC3/jvmaccess-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/jvmaccess-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/jvmaccess-handle-no-solar-java.diff 2003-08-18
23:34:03.000000000 -0700
@@ -0,0 +1,36 @@
+--- jvmaccess/source/makefile.mk.orig 2003-08-07 21:42:07.000000000 -0700
++++ jvmaccess/source/makefile.mk 2003-08-07 21:42:57.000000000 -0700
+@@ -59,6 +59,7 @@
+ #
+ #*************************************************************************
+
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ = ..
+ PRJNAME = jvmaccess
+ TARGET = $(PRJNAME)
+@@ -81,3 +82,7 @@
+ $(SLO)$/windows.obj
+
+ .INCLUDE: target.mk
++.ELSE
++dummy:
++ @echo "Not building jvmaccess/source with SOLAR_JAVA not set"
++.ENDIF
+--- jvmaccess/util/makefile.mk.orig 2003-08-07 21:47:35.000000000 -0700
++++ jvmaccess/util/makefile.mk 2003-08-07 21:47:49.000000000 -0700
+@@ -59,6 +59,7 @@
+ #
+ #*************************************************************************
+
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ = ..
+ PRJNAME = jvmaccess
+ TARGET = $(PRJNAME)
+@@ -97,3 +98,7 @@
+ DEF1NAME = $(SHL1TARGET)
+
+ .INCLUDE: target.mk
++.ELSE
++dummy:
++ @echo "Not building jvmaccess/util with SOLAR_JAVA not set"
++.ENDIF
diff -Naur -x CVS ooo-build.orig/patches/RC3/odk-handle-no-solar-java.diff
ooo-build/patches/RC3/odk-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/odk-handle-no-solar-java.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/odk-handle-no-solar-java.diff 2003-08-19
00:31:07.000000000 -0700
@@ -0,0 +1,76 @@
+--- odk/source/OOSupport/makefile.mk.orig 2003-08-11 11:51:39.000000000
-0700
++++ odk/source/OOSupport/makefile.mk 2003-08-11 11:54:56.000000000 -0700
+@@ -60,6 +60,7 @@
+ #
+ #*************************************************************************
+
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ = ..$/..
+ PRJNAME = oosupport
+ PACKAGE = org$/netbeans$/modules$/openoffice
+@@ -348,3 +349,7 @@
+ +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
+
+ .ENDIF
++.ELSE
++dummy:
++ @echo "Not building odk/source/OOSupport with SOLAR_JAVA not set"
++.ENDIF
+--- odk/source/bean/native/unix/makefile.mk.orig 2003-08-11
11:53:28.000000000 -0700
++++ odk/source/bean/native/unix/makefile.mk 2003-08-11 11:55:04.000000000
-0700
+@@ -1,3 +1,4 @@
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ=..$/..$/..$/..
+
+ PRJNAME=odk
+@@ -41,3 +42,7 @@
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
++.ELSE
++dummy:
++ @echo "Not building odk/source/bean/native/unix with SOLAR_JAVA not set"
++.ENDIF
+--- odk/pack/gendocu/makefile.mk.orig 2003-08-10 13:11:12.000000000 -0700
++++ odk/pack/gendocu/makefile.mk 2003-08-10 14:06:57.000000000 -0700
+@@ -117,9 +117,13 @@
+
+ MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc
+
++.IF "$(SOLAR_JAVA)"!=""
+ all: \
+ $(CPP_DOCU_INDEX_FILE) \
+ $(JAVA_DOCU_INDEX_FILE)
++.ELSE
++all: $(CPP_DOCU_INDEX_FILE)
++.ENDIF
+
+ $(CPP_DOCU_INDEX_FILE) : $(INCLUDELIST)
+ +-$(MKDIRHIER) $(@:d)
+@@ -140,6 +144,8 @@
+ # +$(MY_COPY) $< $@
+
+ #$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES)
+ +-$(MKDIRHIER) $(@:d)
+ +javadoc -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
++.ENDIF
+--- odk/util/check.pl.orig 2003-08-10 14:25:24.000000000 -0700
++++ odk/util/check.pl 2003-08-10 14:30:32.000000000 -0700
+@@ -214,6 +214,7 @@
+
+ #check java docu, it is only a first and simple check
+ # improvement required
++if ($ENV["SOLAR_JAVA"] ne "") {
+ print "check java docu: ";
+ if (-d "$StartDir/docs/java/ref") {
+ if (! -e "$StartDir/docs/java/ref/index.html") {
+@@ -246,6 +247,7 @@
+ $return++;
+ }
+ print "\n";
++}
+
+ #check examples, it is only a first and simple check
+ # improvement required
diff -Naur -x CVS ooo-build.orig/patches/RC3/officecfg-xsltproc.diff
ooo-build/patches/RC3/officecfg-xsltproc.diff
--- ooo-build.orig/patches/RC3/officecfg-xsltproc.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/officecfg-xsltproc.diff 2003-08-18
23:06:32.000000000 -0700
@@ -0,0 +1,89 @@
+--- officecfg/util/makefile.pmk.orig 2003-08-07 16:01:14.000000000 -0700
++++ officecfg/util/makefile.pmk 2003-08-07 17:39:01.000000000 -0700
+@@ -67,34 +67,86 @@
+ $(MISC)$/registry$/schema$/%.xcs : %.xcs
+ @+echo -------------+ validating and stripping schema files
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath
$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar
-Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl
org.openoffice.configuration.Inspector $<
+ $(JAVA) -classpath
$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver
$< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b)
pathSeparator=$/
+ $(JAVA) -classpath
$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver
$< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/
+ $(JAVA) -classpath
$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver
$< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp
+ $(JAVA) -classpath
$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar
-Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl
org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
++.ELSE
++# FIXME: replace org.openoffice.configuration.Inspector
++ xsltproc -o $(@:d)$(<:b).val \
++ --stringparam file $(<:d)$(<:b) \
++ --stringparam pathSeparator $/ \
++ $(PRJ)$/util$/schema_val.xsl $<
++ xsltproc -o $(@:d)$(<:b).san \
++ --stringparam file $(<:d)$(<:b) \
++ --stringparam pathSeparator $/ \
++ $(PRJ)$/util$/sanity.xsl $<
++ xsltproc -o $(@:d)$(<:b).tmp \
++ $(PRJ)$/util$/schema_trim.xsl $<
++# FIXME: replace org.openoffice.helper.PrettyPrinter
++ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
++.ENDIF
+ +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
+ +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
+
+ $(MISC)$/registry$/res$/{$(alliso)}$/%.properties :| %.xcs
+ @+echo -------------+ creating locale dependent resource bundles
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath
$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver
$< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<,
$(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}
++.ELSE
++ xsltproc -o $(@:d)$(<:b).properties \
++ --stringparam locale {$(subst,$/$<,
$(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \
++ $(PRJ)$/util$/resource.xsl $<
++.ENDIF
+
+ # --- XCU ---
+
+ $(MISC)$/registry$/data$/%.xcu : %.xcu
+ @+echo -------------+ validating and creating a locale independent file
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath
$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar
-Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl
org.openoffice.configuration.Inspector $<
+ $(JAVA) -classpath
$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser
com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val
xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs
schemaRoot=$(PRJ)$/registry$/schema
+ $(JAVA) -classpath
$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser
com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp
xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs
schemaRoot=$(PRJ)$/registry$/schema
+ $(JAVA) -classpath
$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar
-Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl
org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++.ELSE
++# FIXME: replace org.openoffice.configuration.Inspector
++ sed
's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper";||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|'
< $(PRJ)$/util$/data_val.xsl > $(PRJ)$/util$/dataval2.xsl
++ sed
's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper";||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|'
< $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
++ xsltproc -o $(@:d)$(<:b).val \
++ --stringparam xcs
$(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
++ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
++ $(PRJ)$/util$/dataval2.xsl $<
++ xsltproc -o $(@:d)$(<:b).tmp \
++ --stringparam xcs
$(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
++ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
++ $(PRJ)$/util$/alllang2.xsl $<
++# FIXME: replace org.openoffice.helper.PrettyPrinter
++ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++ +$(RM) $(PRJ)$/util$/dataval2.xsl > $(NULLDEV)
++ +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
++.ENDIF
+ +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
+ +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
+
+ $(MISC)$/registry$/res$/{$(alliso)}$/%.xcu :| %.xcu
+ @+echo -------------+ creating locale dependent entries
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath
$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser
com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp
xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs
schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<,
$(subst,$(MISC)$/registry$/res$/, $@))}
+ $(JAVA) -classpath
$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar
-Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl
org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++.ELSE
++ sed
's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper";||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|'
< $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
++ xsltproc -o $(@:d)$(<:b).tmp \
++ --stringparam xcs
$(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
++ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
++ --stringparam locale {$(subst,$/$<,
$(subst,$(MISC)$/registry$/res$/, $@))} \
++ $(PRJ)$/util$/alllang2.xsl $<
++# FIXME: replace org.openoffice.helper.PrettyPrinter
++ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++ +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
++.ENDIF
+ +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
diff -Naur -x CVS ooo-build.orig/patches/RC3/psprint-handle-no-solar-java.diff
ooo-build/patches/RC3/psprint-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/psprint-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/psprint-handle-no-solar-java.diff 2003-08-18
23:40:42.000000000 -0700
@@ -0,0 +1,43 @@
+--- psprint/source/helper/helper.cxx.orig 2003-08-08 08:41:05.000000000
-0700
++++ psprint/source/helper/helper.cxx 2003-08-08 08:43:33.000000000 -0700
+@@ -72,7 +72,9 @@
+ #include <tools/config.hxx>
+ #include <rtl/bootstrap.hxx>
+ #include <sal/config.h>
++#ifdef SOLAR_JAVA
+ #include "jvmaccess/javainfo.hxx"
++#endif // SOLAR_JAVA
+
+ using namespace rtl;
+
+@@ -263,6 +265,7 @@
+ }
+ }
+
++#ifdef SOLAR_JAVA
+ // if no javarc (e.g. in setup) exists or it failed try the UDK method
+ if( ! aJREpath.getLength() )
+ {
+@@ -299,6 +302,7 @@
+ }
+ }
+ }
++#endif // SOLAR_JAVA
+
+ if( aJREpath.getLength() )
+ {
+--- psprint/util/makefile.mk.orig 2003-08-08 08:43:55.000000000 -0700
++++ psprint/util/makefile.mk 2003-08-08 08:44:52.000000000 -0700
+@@ -95,9 +95,11 @@
+
+ SHL1STDLIBS=$(UNOTOOLSLIB) \
+ $(TOOLSLIB) \
+- $(JVMACCESSLIB) \
+ $(SALLIB) \
+ -lX11
++.IF "$(SOLAR_JAVA)"!=""
++SHL1STDLIBS+=$(JVMACCESSLIB)
++.ENDIF
+
+ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/readlicense-oo-xsltproc.diff
ooo-build/patches/RC3/readlicense-oo-xsltproc.diff
--- ooo-build.orig/patches/RC3/readlicense-oo-xsltproc.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/readlicense-oo-xsltproc.diff 2003-08-18
22:03:56.000000000 -0700
@@ -0,0 +1,39 @@
+--- readlicense_oo/util/makefile.pmk.orig 2003-04-28 10:18:28.000000000
-0700
++++ readlicense_oo/util/makefile.pmk 2003-08-18 22:02:57.000000000 -0700
+@@ -73,7 +73,36 @@
+
+ $(MISC)$/%.html :
+ @+-$(MKDIR) $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath
$(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver
$(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI)
cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=html file=$@
++.ELSE
++ sed
's|xmlns:xt="http://www.jclark.com/xt";||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output
method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output
method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl >
..$/readme2.xsl
++ xsltproc -o $@ \
++ --stringparam os1 $(OS) \
++ --stringparam gui1 $(GUI) \
++ --stringparam cp1 $(CPUNAME) \
++ --stringparam com1 $(COM) \
++ --stringparam lang1 $(iso_$(@:d:d:b)) \
++ --stringparam type html \
++ ..$/readme2.xsl \
++ $(subst,$(@::d:d:b), $(@:b).xrm)
++ rm ..$/readme2.xsl
++.ENDIF
++
+ $(MISC)$/%.txt :
+ @+-$(MKDIR) $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath
$(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar
-Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver
$(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI)
cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=text file=$@
++.ELSE
++ sed
's|xmlns:xt="http://www.jclark.com/xt";||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output
method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output
method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl
++ xsltproc -o $@ \
++ --stringparam os1 $(OS) \
++ --stringparam gui1 $(GUI) \
++ --stringparam cp1 $(CPUNAME) \
++ --stringparam com1 $(COM) \
++ --stringparam lang1 $(iso_$(@:d:d:b)) \
++ --stringparam type text \
++ ..$/readme2.xsl \
++ $(subst,$(@::d:d:b), $(@:b).xrm)
++ rm ..$/readme2.xsl
++.ENDIF
diff -Naur -x CVS ooo-build.orig/patches/RC3/ridljar-handle-no-solar-java.diff
ooo-build/patches/RC3/ridljar-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/ridljar-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/ridljar-handle-no-solar-java.diff 2003-08-18
23:14:33.000000000 -0700
@@ -0,0 +1,15 @@
+--- ridljar/util/makefile.mk.orig 2003-08-10 13:12:20.000000000 -0700
++++ ridljar/util/makefile.mk 2003-08-10 13:12:36.000000000 -0700
+@@ -84,10 +84,12 @@
+ ZIP1DIR=$(PRJ)
+ ZIP1LIST=com -x "*makefile.mk"
+
++.IF "$(SOLAR_JAVA)"!=""
+ ZIP2TARGET=$(TARGET)2_src
+ ZIP2FLAGS=-u -r
+ ZIP2DIR=$(MISC)$/java
+ ZIP2LIST=com
++.ENDIF
+
+ # --- Targets ------------------------------------------------------
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/scp-handle-no-solar-java.diff
ooo-build/patches/RC3/scp-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/scp-handle-no-solar-java.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/scp-handle-no-solar-java.diff 2003-08-19
00:22:18.000000000 -0700
@@ -0,0 +1,146 @@
+--- scp/source/global/udk_base.scp.orig 2003-08-11 11:22:39.000000000
-0700
++++ scp/source/global/udk_base.scp 2003-08-11 11:38:05.000000000 -0700
+@@ -342,6 +342,7 @@
+ #endif
+ End
+
++#ifdef SOLAR_JAVA
+ File gid_File_Lib_Jvmaccess
+ TXT_FILE_BODY;
+ Dir = GCFG_BINARY_DIR;
+@@ -368,3 +369,4 @@
+ Styles = (NETWORK,RELATIVE);
+ End
+ #endif
++#endif
+--- scp/source/global/setupzip.scp.orig 2003-08-11 11:23:38.000000000
-0700
++++ scp/source/global/setupzip.scp 2003-08-11 11:28:02.000000000 -0700
+@@ -393,8 +393,6 @@
+
+ #if !defined(IPL_PRODUCT) && !defined(OPL_PRODUCT) || defined(UNX)
+
+-#ifdef SOLAR_JAVA
+-
+ File GID_FILE_LIB_J
+ TXT_FILE_BODY;
+ #ifdef UNX
+@@ -408,8 +406,6 @@
+
+ #endif
+
+-#endif
+-
+ File GID_FILE_LIB_COMPHELPER2
+ TXT_FILE_BODY;
+ #ifdef UNX
+@@ -527,12 +523,14 @@
+
+ #endif
+
++#ifdef SOLAR_JAVA
+ File GID_FILE_JAR_UNOIL
+ TXT_FILE_BODY;
+ Name = "unoil.jar";
+ Dir = GCFG_CLASSES_DIR;
+ Styles = (PACKED,DONT_OVERWRITE,SETUPZIP);
+ End
++#endif
+
+ #ifdef INCLUDE_JAVA_ACCESSBRIDGE
+
+@@ -546,14 +544,14 @@
+ #endif
+
+ #ifdef UNX
+-
++#ifdef SOLAR_JAVA
+ File GID_FILE_BIN_JAVALDX
+ BIN_FILE_BODY;
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+ Name = EXENAME(javaldx);
+ End
+-
++#endif
+ #endif
+
+ #ifdef UNX
+--- scp/source/global/udk_complete.scp.orig 2003-08-11 11:28:16.000000000
-0700
++++ scp/source/global/udk_complete.scp 2003-08-11 11:29:30.000000000 -0700
+@@ -75,6 +75,7 @@
+ #endif
+ End
+
++#ifdef SOLAR_JAVA
+ #ifndef MACOSX
+ File gid_File_Lib_OfficeBean
+ TXT_FILE_BODY;
+@@ -94,6 +95,8 @@
+ Styles = (PACKED);
+ End
+ #endif
++#endif
++
+ /*
+ File gid_File_Lib_Stm
+ TXT_FILE_BODY;
+--- scp/source/office/files.scp.orig 2003-08-11 11:29:45.000000000 -0700
++++ scp/source/office/files.scp 2003-08-11 11:30:15.000000000 -0700
+@@ -715,6 +715,7 @@
+
+ #endif
+
++#ifdef SOLAR_JAVA
+ File GID_FILE_LIB_JDBC_2
+ TXT_FILE_BODY;
+ Styles = (PACKED,UNO_COMPONENT);
+@@ -726,6 +727,7 @@
+ Name = "jdbc2.dll";
+ #endif
+ End
++#endif
+
+ File GID_FILE_LIB_ODBC_2
+ TXT_FILE_BODY;
+--- scp/util/makefile.mk.orig 2003-08-11 11:30:57.000000000 -0700
++++ scp/util/makefile.mk 2003-08-11 11:34:00.000000000 -0700
+@@ -88,7 +88,6 @@
+ module_math.par \
+ module_grafik.par \
+ module_lingu.par \
+- module_javafilter.par \
+ profile.par \
+ profile_calc.par \
+ profile_impress.par \
+@@ -96,13 +95,10 @@
+ profile_math.par \
+ profile_chart.par \
+ profile_grafik.par \
+- profile_javafilter.par \
+ setupzip.par \
+ readme.par \
+ udk_base.par \
+ udk_bridges.par \
+- udk_java.par \
+- udk_pure_java.par \
+ udk_remote.par \
+ udk_complete.par \
+ files.par \
+@@ -113,10 +109,15 @@
+ files_chart.par \
+ files_grafik.par \
+ files_lingu.par \
+- files_javafilter.par \
+ dir.par \
+ python.par
+-
++.IF "$(SOLAR_JAVA)"!=""
++SCP1FILES += module_javafilter.par \
++ profile_javafilter.par \
++ files_javafilter.par \
++ udk_java.par \
++ udk_pure_java.par
++.ENDIF
+
+ #python.par
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/setup2-handle-no-solar-java.diff
ooo-build/patches/RC3/setup2-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/setup2-handle-no-solar-java.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/setup2-handle-no-solar-java.diff 2003-08-19
00:20:38.000000000 -0700
@@ -0,0 +1,87 @@
+--- setup2/source/custom/jvmsetup/loader/makefile.mk.orig 2003-08-09
10:07:11.000000000 -0700
++++ setup2/source/custom/jvmsetup/loader/makefile.mk 2003-08-09
10:08:51.000000000 -0700
+@@ -60,6 +60,7 @@
+ #
+ #*************************************************************************
+
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ=..$/..$/..$/..
+ PRJNAME=setup2
+ TARGET=jvmsetup
+@@ -151,3 +152,8 @@
+ echo HEAPSIZE 16384 >>$@
+ echo STACKSIZE 524288 >>$@
+ .ENDIF
++
++.ELSE
++dummy:
++ @echo "Not building jvmsetup/loader with SOLAR_JAVA not set"
++.ENDIF
+--- setup2/source/custom/jvmsetup/makefile.mk.orig 2003-08-09
10:04:57.000000000 -0700
++++ setup2/source/custom/jvmsetup/makefile.mk 2003-08-09 10:05:55.000000000
-0700
+@@ -60,6 +60,7 @@
+ #
+ #*************************************************************************
+
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ=..$/..$/..
+ PRJNAME=setup2
+ TARGET=jvm
+@@ -119,3 +120,7 @@
+
+ # -------------------------------------------------------------------------
+
++.ELSE
++dummy:
++ @echo "Not building jvmsetup with SOLAR_JAVA not set"
++.ENDIF
+--- setup2/source/ui/main.cxx.orig 2003-08-11 11:08:35.000000000 -0700
++++ setup2/source/ui/main.cxx 2003-08-11 11:11:59.000000000 -0700
+@@ -78,7 +78,9 @@
+ #include <sal/main.h>
+ #endif
+
++#ifdef SOLAR_JAVA
+ #include "jvmaccess/javainfo.hxx"
++#endif
+
+ #ifndef _SV_HELP_HXX //autogen
+ #include <vcl/help.hxx>
+@@ -2523,6 +2525,7 @@
+ static sal_Bool hasJavarc();
+ void prepareJava(const char * szStartPath)
+ {
++#ifdef SOLAR_JAVA
+ if(szStartPath)
+ {
+ //check if we are started from an installation. This is done by
looking for the classes
+@@ -2656,6 +2659,7 @@
+ #endif
+ }
+ }
++#endif // SOLAR_JAVA
+ }
+
+ static sal_Bool hasJavarc()
+--- setup2/util/makefile.mk.orig 2003-08-11 11:14:51.000000000 -0700
++++ setup2/util/makefile.mk 2003-08-11 11:15:23.000000000 -0700
+@@ -186,7 +186,6 @@
+ $(SVTOOLLIB) \
+ $(VCLLIB) \
+ $(TOOLSLIB) \
+- $(JVMACCESSLIB) \
+ $(COMPHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+@@ -195,7 +194,10 @@
+ $(SALHELPERLIB) \
+ $(UNOTOOLSLIB) \
+ $(SALLIB)
+-
++.IF "$(SOLAR_JAVA)"!=""
++APP2STDLIBS+=\
++ $(JVMACCESSLIB)
++.ENDIF
+
+ .IF "$(GUI)"=="WNT"
+ APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib
uuid.lib version.lib \
diff -Naur -x CVS ooo-build.orig/patches/RC3/sj2-handle-no-solar-java.diff
ooo-build/patches/RC3/sj2-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/sj2-handle-no-solar-java.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/sj2-handle-no-solar-java.diff 2003-08-19
00:05:18.000000000 -0700
@@ -0,0 +1,274 @@
+--- sj2/source/java/jnihelp.cxx.orig 2003-08-08 20:54:39.000000000 -0700
++++ sj2/source/java/jnihelp.cxx 2003-08-08 20:55:41.000000000 -0700
+@@ -59,6 +59,7 @@
+ *
+ ************************************************************************/
+
++#ifdef SOLAR_JAVA
+ #include <cstdarg>
+ #include <tools/debug.hxx>
+ #include <jni.h> /* where everything is defined */
+@@ -99,3 +100,5 @@
+ _xJavaThreadRegister_11->revokeThread();
+ }
+ }
++
++#endif // SOLAR_JAVA
+--- sj2/source/jscpp/sjapplet.cxx.orig 2003-08-08 20:58:19.000000000 -0700
++++ sj2/source/jscpp/sjapplet.cxx 2003-08-08 21:01:41.000000000 -0700
+@@ -60,7 +60,9 @@
+ ************************************************************************/
+
+ #include <cstdarg>
++#ifdef SOLAR_JAVA
+ #include <jnihelp.hxx>
++#endif // SOLAR_JAVA
+
+ #include <sjapplet.hxx>
+
+@@ -79,11 +81,15 @@
+
+ using namespace ::rtl;
+ using namespace ::utl;
++#ifdef SOLAR_JAVA
+ using namespace ::sj2;
++#endif // SOLAR_JAVA
+
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
++#ifdef SOLAR_JAVA
+ using namespace ::com::sun::star::java;
++#endif // SOLAR_JAVA
+
+ SjApplet2::SjApplet2()
+ : _pImpl(new SjApplet2_Impl())
+@@ -346,7 +352,7 @@
+ /*
+ * Java init function to invoke Java runtime using JNI invocation API.
+ */
+-
++#ifdef SOLAR_JAVA
+ void JRE_PropertyChanged( JNIEnv * env, const SvCommandList & rCmdList )
+ {
+ jclass pClass = env->FindClass("java/util/Properties");
+@@ -389,6 +395,7 @@
+ env->DeleteLocalRef( pProps );
+ env->DeleteLocalRef( pClass );
+ }
++#endif // SOLAR_JAVA
+
+ // Settings are detected by the JavaVM service
+ // This function is not necessary anymore
+--- sj2/source/jscpp/sjapplet_impl.cxx.orig 2003-08-08 21:06:04.000000000
-0700
++++ sj2/source/jscpp/sjapplet_impl.cxx 2003-08-08 21:24:29.000000000 -0700
+@@ -78,18 +78,24 @@
+ #include <vcl/syschild.hxx>
+ #include <vcl/sysdata.hxx>
+
++#ifdef SOLAR_JAVA
+ #include <jnihelp.hxx>
++#endif // SOLAR_JAVA
+
+ using namespace ::rtl;
+ using namespace ::osl;
++#ifdef SOLAR_JAVA
+ using namespace ::sj2;
++#endif // SOLAR_JAVA
+ using namespace ::utl;
+
++#ifdef SOLAR_JAVA
+ using namespace ::com::sun::star::java;
++#endif // SOLAR_JAVA
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
+
+-
++#ifdef SOLAR_JAVA
+ static void testJavaException(JNIEnv * pEnv)
throw(com::sun::star::uno::RuntimeException)
+ {
+ jthrowable jtThrowable = pEnv->ExceptionOccurred();
+@@ -114,7 +120,14 @@
+ throw RuntimeException(ouMessage, Reference<XInterface>());
+ }
+ }
++#else // !SOLAR_JAVA
++static void throwException() throw(com::sun::star::uno::RuntimeException)
++{
++ throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("Java
applets not supported.")), Reference<XInterface>());
++}
++#endif
+
++#ifdef SOLAR_JAVA
+ #ifdef UNX
+ struct EmbeddedWindow {
+ jobject _joWindow;
+@@ -210,17 +223,22 @@
+
+ _joWindow = 0;
+ }
++#endif // SOLAR_JAVA
+
+-
+-
++#ifdef SOLAR_JAVA
+ SjApplet2_Impl::SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException)
+ : _pJVM(NULL),
+ _joAppletExecutionContext(0),
+ _jcAppletExecutionContext(0)
+
+ {}
++#else // !SOLAR_JAVA
++SjApplet2_Impl::SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException)
++{}
++#endif
+
+ SjApplet2_Impl::~SjApplet2_Impl() throw() {
++#ifdef SOLAR_JAVA
+ if (_joAppletExecutionContext) {
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+@@ -230,6 +248,7 @@
+ jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
+ jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
+ }
++#endif
+ }
+
+ void SjApplet2_Impl::init(Window * pParentWin,
+@@ -238,6 +257,7 @@
+ const SvCommandList &
rCmdList)
+ throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ _pParentWin = pParentWin;
+
+
+@@ -338,11 +358,14 @@
+ joDocBase,
joParameters, _pEmbeddedWindow->_joWindow, (jlong)0);
testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext,
jmAppletExecutionContext_init);
testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext,
jmAppletExecutionContext_startUp);
testJavaException(jenv.pEnv);
+-
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::setSize(const Size & rSize)
throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ _pParentWin->SetSizePixel(rSize);
+@@ -350,42 +373,62 @@
+ jmethodID jmAppletExecutionContext_resize =
jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "appletResize", "(II)V");
testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext,
jmAppletExecutionContext_resize, (jint)rSize.Width(),
+
(jint)rSize.Height());
testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::restart() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_restart =
jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "restart", "()V");
testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext,
jmAppletExecutionContext_restart);
testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::reload() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_reload =
jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "reload", "()V");
testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext,
jmAppletExecutionContext_reload);
testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::start() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_sendStart =
jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "sendStart", "()V");
testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext,
jmAppletExecutionContext_sendStart);
testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::stop() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_sendStop =
jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "sendStop", "()V");
testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext,
jmAppletExecutionContext_sendStop);
testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::close() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_shutdown =
jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "shutdown", "()V");
testJavaException(jenv.pEnv);
+@@ -416,5 +459,8 @@
+ }
+ }
+ }
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+--- sj2/source/jscpp/sjapplet_impl.hxx.orig 2003-08-08 21:24:48.000000000
-0700
++++ sj2/source/jscpp/sjapplet_impl.hxx 2003-08-08 21:35:45.000000000 -0700
+@@ -1,13 +1,15 @@
+ #include <cstdarg>
+
+-
++#ifdef SOLAR_JAVA
+ #include <jni.h>
+-
++#endif // SOLAR_JAVA
+
+ #include <unotools/processfactory.hxx>
+
++#ifdef SOLAR_JAVA
+ #include <com/sun/star/java/XJavaVM.hpp>
+ #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
++#endif // SOLAR_JAVA
+
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+@@ -16,9 +18,12 @@
+ class SvCommandList;
+ class Size;
+
++#ifdef SOLAR_JAVA
+ struct EmbeddedWindow;
++#endif // SOLAR_JAVA
+
+ struct SjApplet2_Impl {
++#ifdef SOLAR_JAVA
+ Window * _pParentWin;
+
+ JavaVM * _pJVM;
+@@ -29,6 +34,7 @@
+
+ com::sun::star::uno::Reference<com::sun::star::java::XJavaVM>
_xJavaVM;
+
com::sun::star::uno::Reference<com::sun::star::java::XJavaThreadRegister_11>
_xJavaThreadRegister_11;
++#endif // SOLAR_JAVA
+
+ SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException);
+ ~SjApplet2_Impl() throw();
diff -Naur -x CVS
ooo-build.orig/patches/RC3/solenv-set-solar-java-only-if-unset.diff
ooo-build/patches/RC3/solenv-set-solar-java-only-if-unset.diff
--- ooo-build.orig/patches/RC3/solenv-set-solar-java-only-if-unset.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/solenv-set-solar-java-only-if-unset.diff
2003-08-18 22:12:30.000000000 -0700
@@ -0,0 +1,66 @@
+--- solenv/inc/unxlngi3.mk.orig 2003-04-28 09:46:48.000000000 -0700
++++ solenv/inc/unxlngi3.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi4.mk.orig 2003-07-31 01:32:41.000000000 -0700
++++ solenv/inc/unxlngi4.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi5.mk.orig 2003-07-31 01:32:41.000000000 -0700
++++ solenv/inc/unxlngi5.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngppc.mk.orig 2003-04-28 09:47:14.000000000 -0700
++++ solenv/inc/unxlngppc.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -65,7 +65,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngppc4.mk.orig 2003-06-12 03:02:32.000000000 -0700
++++ solenv/inc/unxlngppc4.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngs3904.mk.orig 2003-06-12 03:02:43.000000000 -0700
++++ solenv/inc/unxlngs3904.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
diff -Naur -x CVS ooo-build.orig/patches/RC3/svg-handle-no-solar-java.diff
ooo-build/patches/RC3/svg-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/svg-handle-no-solar-java.diff 1969-12-31
16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/svg-handle-no-solar-java.diff 2003-08-19
00:25:35.000000000 -0700
@@ -0,0 +1,155 @@
+--- filter/source/svg/svgfilter.hxx.orig 2003-08-09 19:28:05.000000000
-0700
++++ filter/source/svg/svgfilter.hxx 2003-08-09 21:45:14.000000000 -0700
+@@ -83,9 +83,11 @@
+ #ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
+ #include <com/sun/star/document/XFilter.hpp>
+ #endif
++#ifdef SOLAR_JAVA
+ #ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
+ #include <com/sun/star/document/XImporter.hpp>
+ #endif
++#endif // SOLAR_JAVA
+ #ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_
+ #include <com/sun/star/document/XExporter.hpp>
+ #endif
+@@ -104,9 +106,15 @@
+ #ifndef _CPPUHELPER_IMPLBASE1_HXX_
+ #include <cppuhelper/implbase1.hxx>
+ #endif
++#ifdef SOLAR_JAVA
+ #ifndef _CPPUHELPER_IMPLBASE5_HXX_
+ #include <cppuhelper/implbase5.hxx>
+ #endif
++#else // !SOLAR_JAVA
++#ifndef _CPPUHELPER_IMPLBASE4_HXX_
++#include <cppuhelper/implbase4.hxx>
++#endif
++#endif
+ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #endif
+@@ -152,7 +160,9 @@
+ #include <svx/svdxcgv.hxx>
+ #include <svx/svdobj.hxx>
+ #include <xmloff/xmlexp.hxx>
++#ifdef SOLAR_JAVA
+ #include <sj2/jnihelp.hxx>
++#endif
+ #include "svgfilter.hxx"
+ #include "svgscript.hxx"
+
+@@ -238,11 +248,18 @@
+ class SVGFontExport;
+ class SVGActionWriter;
+
++#ifdef SOLAR_JAVA
+ class SVGFilter : public cppu::WeakImplHelper5 < XFilter,
+
XImporter,
+ XExporter,
+
XInitialization,
+
XServiceInfo >
++#else // !SOLAR_JAVA
++class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
++ XExporter,
++ XInitialization,
++ XServiceInfo >
++#endif
+ {
+ typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation,
HashReferenceXInterface > ObjectMap;
+
+@@ -251,14 +268,18 @@
+ ObjectMap*
mpObjects;
+ Reference< XMultiServiceFactory > mxMSF;
+ Reference< XComponent > mxSrcDoc;
++#ifdef SOLAR_JAVA
+ Reference< XComponent > mxDstDoc;
++#endif
+ SvXMLElementExport* mpSVGDoc;
+ SVGExport*
mpSVGExport;
+ SVGFontExport* mpSVGFontExport;
+ SVGActionWriter* mpSVGWriter;
+ sal_Bool mbPresentation;
+
++#ifdef SOLAR_JAVA
+ sal_Bool implImport( const Sequence<
PropertyValue >& rDescriptor ) throw (RuntimeException);
++#endif
+
+ sal_Bool implExport( const Sequence<
PropertyValue >& rDescriptor ) throw (RuntimeException);
+ Reference< XDocumentHandler > implCreateExportDocumentHandler(
const Reference< XOutputStream >& rxOStm );
+@@ -292,8 +313,10 @@
+ virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >&
rDescriptor ) throw(RuntimeException);
+ virtual void SAL_CALL cancel( ) throw (RuntimeException);
+
++#ifdef SOLAR_JAVA
+ // XImporter
+ virtual void SAL_CALL setTargetDocument( const Reference< XComponent >&
xDoc ) throw(IllegalArgumentException, RuntimeException);
++#endif
+
+ // XExporter
+ virtual void SAL_CALL setSourceDocument( const Reference< XComponent >&
xDoc ) throw(IllegalArgumentException, RuntimeException);
+--- filter/source/svg/makefile.mk.orig 2003-08-09 20:06:22.000000000 -0700
++++ filter/source/svg/makefile.mk 2003-08-09 20:07:54.000000000 -0700
+@@ -99,10 +99,12 @@
+
+ SLOFILES= $(SLO)$/svguno.obj \
+ $(SLO)$/svgfilter.obj \
+- $(SLO)$/svgimport.obj \
+ $(SLO)$/svgexport.obj \
+ $(SLO)$/svgfontexport.obj \
+ $(SLO)$/svgwriter.obj
++.IF "$(SOLAR_JAVA)"!=""
++SLOFILES+= $(SLO)$/svgimport.obj
++.ENDIF
+
+ # --- Library -----------------------------------
+
+@@ -112,7 +114,6 @@
+ $(SVXLIB) \
+ $(XMLOFFLIB) \
+ $(GOODIESLIB) \
+- $(SJLIB) \
+ $(VCLLIB) \
+ $(UNOTOOLSLIB) \
+ $(TOOLSLIB) \
+@@ -120,7 +121,10 @@
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(SALLIB)
+-
++.IF "$(SOLAR_JAVA)"!=""
++SHL1STDLIBS+=\
++ $(SJLIB)
++.ENDIF
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(SHL1TARGET)
+--- filter/source/svg/svgfilter.cxx.orig 2003-08-09 20:03:37.000000000
-0700
++++ filter/source/svg/svgfilter.cxx 2003-08-09 21:46:50.000000000 -0700
+@@ -97,9 +97,12 @@
+ if( pFocusWindow )
+ pFocusWindow->EnterWait();
+
++#ifdef SOLAR_JAVA
+ if( mxDstDoc.is() )
+ bRet = implImport( rDescriptor );
+- else if( mxSrcDoc.is() )
++ else
++#endif
++ if( mxSrcDoc.is() )
+ bRet = implExport( rDescriptor );
+ else
+ bRet = sal_False;
+@@ -126,11 +129,13 @@
+
+ //
-----------------------------------------------------------------------------
+
++#ifdef SOLAR_JAVA
+ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >&
xDoc )
+ throw (::com::sun::star::lang::IllegalArgumentException,
RuntimeException)
+ {
+ mxDstDoc = xDoc;
+ }
++#endif
+
+ //
-----------------------------------------------------------------------------
+
diff -Naur -x CVS
ooo-build.orig/patches/RC3/xsltfilter-handle-no-solar-java.diff
ooo-build/patches/RC3/xsltfilter-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/xsltfilter-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/xsltfilter-handle-no-solar-java.diff 2003-08-19
00:27:30.000000000 -0700
@@ -0,0 +1,12 @@
+--- filter/source/xsltfilter/makefile.mk.orig 2003-08-09 22:21:10.000000000
-0700
++++ filter/source/xsltfilter/makefile.mk 2003-08-09 22:21:31.000000000
-0700
+@@ -90,7 +90,9 @@
+ # + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/XSLTFilter$/META-INF
+ # --- Targets ------------------------------------------------------
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVACLASSFILES) : $(CLASSDIR)
++.ENDIF
+
+ $(CLASSDIR) :
+ $(MKDIR) $(CLASSDIR)
diff -Naur -x CVS
ooo-build.orig/patches/RC3/xsltvalidate-handle-no-solar-java.diff
ooo-build/patches/RC3/xsltvalidate-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/xsltvalidate-handle-no-solar-java.diff
1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/xsltvalidate-handle-no-solar-java.diff
2003-08-19 00:27:17.000000000 -0700
@@ -0,0 +1,12 @@
+--- filter/source/xsltvalidate/makefile.mk.orig 2003-08-09
22:07:10.000000000 -0700
++++ filter/source/xsltvalidate/makefile.mk 2003-08-09 22:07:23.000000000
-0700
+@@ -87,7 +87,9 @@
+ # + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/META-INF
+ # --- Targets ------------------------------------------------------
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVACLASSFILES) : $(CLASSDIR)
++.ENDIF
+
+ $(CLASSDIR) :
+ $(MKDIR) $(CLASSDIR)
