[ooo-build-commit] Branch 'ooo-build-3-1-1' - 2 commits - bin/unopkg-regenerate-cache distro-configs/SUSE-11.2.conf.in distro-configs/SUSE.conf.in patches/dev300

[Petr Mladek]

 bin/unopkg-regenerate-cache      |    7 +++----
 distro-configs/SUSE-11.2.conf.in |    2 ++
 distro-configs/SUSE.conf.in      |    2 ++
 patches/dev300/apply             |    1 +
 patches/dev300/piece-stax.diff   |   12 ++++++++++++
 5 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit c0abf8565720e8635147bf31b4fc3fe9de18416c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Sep 25 14:41:06 2009 +0200

    unopkg-regenerate-cache should not print error on non-existing cache
    
    * bin/unopkg-regenerate-cache: do not print error when the cache does not
      exist; it might be called before the firts extension is installed

diff --git a/bin/unopkg-regenerate-cache b/bin/unopkg-regenerate-cache
index 27f5ff3..f5db7f6 100755
--- a/bin/unopkg-regenerate-cache
+++ b/bin/unopkg-regenerate-cache
@@ -23,10 +23,9 @@ shift;
 OOO_BROKEN_EXTENSIONS="$*"
 
 OOO_UNO_CACHE="$OOO_HOME/share/uno_packages/cache"
-if test ! -d "$OOO_UNO_CACHE" ; then
-    echo "Error: Can't find $OOO_UNO_CACHE"
-    exit 1;
-fi
+
+# nothing to do if the cache does not exist (fresh installation or so)
+test -d "$OOO_UNO_CACHE" || exit 0;
 
 # check for broken extensions
 found=
commit eff27381d199db58753242dbccba268a60b4a130
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Sep 25 14:34:27 2009 +0200

    Use system saxon on openSUSE-11.2 (bnc#527738, bnc#481242, bnc#473232)
    
    * distro-configs/SUSE-11.2.conf.in:
    * distro-configs/SUSE.conf.in: add --with-saxon-jar=/usr/share/java/saxon8.jar,
      and --with-system-saxon; note XHTML export does not work with the default
      saxon-6.5
    * patches/dev300/piece-stax.diff, patches/dev300/apply: allow to use the
      prebuilt jsr173_1.0_api.jar on SLED10; it can't be compiled with Java 1.4

diff --git a/distro-configs/SUSE-11.2.conf.in b/distro-configs/SUSE-11.2.conf.in
index 6c46634..5fa3d87 100644
--- a/distro-configs/SUSE-11.2.conf.in
+++ b/distro-configs/SUSE-11.2.conf.in
@@ -18,6 +18,7 @@
 --with-external-thes-dir=/usr/share/ooo/thesaurus
 --with-java-target-version=1.5
 --with-jdk-home=$JAVA_HOME
+--with-saxon-jar=/usr/share/java/saxon8.jar
 --with-system-boost
 --with-system-cairo
 --with-system-curl
@@ -35,6 +36,7 @@
 --with-system-neon
 --with-system-odbc-headers
 --with-system-sablot
+--with-system-saxon
 --with-system-xalan
 --with-system-xerces
 --with-system-xml-apis
diff --git a/distro-configs/SUSE.conf.in b/distro-configs/SUSE.conf.in
index 6c46634..5fa3d87 100644
--- a/distro-configs/SUSE.conf.in
+++ b/distro-configs/SUSE.conf.in
@@ -18,6 +18,7 @@
 --with-external-thes-dir=/usr/share/ooo/thesaurus
 --with-java-target-version=1.5
 --with-jdk-home=$JAVA_HOME
+--with-saxon-jar=/usr/share/java/saxon8.jar
 --with-system-boost
 --with-system-cairo
 --with-system-curl
@@ -35,6 +36,7 @@
 --with-system-neon
 --with-system-odbc-headers
 --with-system-sablot
+--with-system-saxon
 --with-system-xalan
 --with-system-xerces
 --with-system-xml-apis
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 105c3a3..6fc2ca3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2909,6 +2909,7 @@ piece-cppuhelper.diff
 piece-cpputools.diff
 piece-connectivity.diff
 piece-bridges.diff
+piece-stax.diff
 piece-stoc.diff
 piece-unoil.diff
 piece-javaunohelper.diff
diff --git a/patches/dev300/piece-stax.diff b/patches/dev300/piece-stax.diff
new file mode 100644
index 0000000..e9a461b
--- /dev/null
+++ b/patches/dev300/piece-stax.diff
@@ -0,0 +1,12 @@
+--- stax/makefile.mk.old	2009-09-23 10:11:52.000000000 +0200
++++ stax/makefile.mk	2009-09-24 21:27:33.000000000 +0200
+@@ -55,7 +55,7 @@ EXTERNAL_DIR=$(PRJ)$/..$/external/StAX
+ 
+ .IF "$(BUILD_STAX)" != "YES"
+ 
+-$(OUT)$/class$/jsr173_1.0_api.jar : $(EXTERNAL_DIR)$/jsr173_1.0_api.jar
++$(OUT)$/class$/jsr173_1.0_api.jar : $(PRJ)$/download$/jsr173_1.0_api.jar
+ 	+$(COPY) $< $@
+ 
+ .ELSE 			#  "$(BUILD_STAX)" != "YES"
+