[ooo-build-commit] 4 commits - bin/piece bin/unpack distro-configs/SUSE-11.2.conf.in distro-configs/SUSE.conf.in patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Nov 11 07:50:24 PST 2009
bin/piece/file-list-sdk | 3 +++
bin/unpack | 2 --
distro-configs/SUSE-11.2.conf.in | 2 --
distro-configs/SUSE.conf.in | 2 --
patches/dev300/apply | 1 -
patches/dev300/piece-stax.diff | 12 ------------
patches/dev300/piece-writerfilter.diff | 16 ++++++++--------
7 files changed, 11 insertions(+), 27 deletions(-)
New commits:
commit 85988778c1baaa69beae97ff3b4b57ddfe81d9ba
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Nov 11 16:47:16 2009 +0100
Fix split build with the prebuilt stax
* bin/unpack: copy jsr173_1.0_api.jar even for the split build
to be processed by configure
* patches/dev300/piece-stax.diff:
* patches/dev300/apply: bin obsolete diff; extral project is available
in libs-extern piece
diff --git a/bin/unpack b/bin/unpack
index b24a890..332ae1c 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -362,12 +362,10 @@ fi
# copy in the prebuilt jsr173_1.0_api.jar if available
# allows to build with JDK 1.4
JSR_API_JAR=jsr173_1.0_api.jar
-if test "z$PIECE" = "z"; then
if test -f "$SRCDIR/$JSR_API_JAR"; then
mkdir -p $OOBUILDDIR/external/StAX
$GNUCP -f $SRCDIR/$JSR_API_JAR $OOBUILDDIR/external/StAX
fi
-fi
# copy in misc Mono related dlls if we need to
# we can't build them on Unix.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 53c3640..c1d68ae 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2931,7 +2931,6 @@ piece-cpputools.diff
piece-connectivity.diff
piece-bridges.diff
piece-saxon.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
deleted file mode 100644
index e9a461b..0000000
--- a/patches/dev300/piece-stax.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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"
-
commit f6ba7e908706bbb2c5bd64cb4e05008b22b2da5f
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Oct 15 17:17:51 2009 +0200
Switch back to the internal saxon on openSUSE (bnc#547157)
* distro-configs/SUSE-11.2.conf.in:
* distro-configs/SUSE.conf.in: do not use the system saxon8; it caused
several problems, e.g. bnc#547157; thanks Rene for hint
diff --git a/distro-configs/SUSE-11.2.conf.in b/distro-configs/SUSE-11.2.conf.in
index 5fa3d87..6c46634 100644
--- a/distro-configs/SUSE-11.2.conf.in
+++ b/distro-configs/SUSE-11.2.conf.in
@@ -18,7 +18,6 @@
--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
@@ -36,7 +35,6 @@
--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 5fa3d87..6c46634 100644
--- a/distro-configs/SUSE.conf.in
+++ b/distro-configs/SUSE.conf.in
@@ -18,7 +18,6 @@
--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
@@ -36,7 +35,6 @@
--with-system-neon
--with-system-odbc-headers
--with-system-sablot
---with-system-saxon
--with-system-xalan
--with-system-xerces
--with-system-xml-apis
commit 7f39b76a109d6be379ac791bc73c8b9c2b7d8c45
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Nov 11 14:39:02 2009 +0100
Update piece-writerfilter.diff for ooo320-m4
* patches/dev300/piece-writerfilter.diff: update for ooo320-m4
diff --git a/patches/dev300/piece-writerfilter.diff b/patches/dev300/piece-writerfilter.diff
index 8f3a73c..ab00dcd 100644
--- a/patches/dev300/piece-writerfilter.diff
+++ b/patches/dev300/piece-writerfilter.diff
@@ -1,5 +1,5 @@
---- writerfilter/source/ooxml/makefile.mk.old 2009-10-14 16:24:18.000000000 +0200
-+++ writerfilter/source/ooxml/makefile.mk 2009-10-14 16:33:36.000000000 +0200
+--- writerfilter/source/ooxml/makefile.mk.old 2009-11-11 14:11:08.000000000 +0100
++++ writerfilter/source/ooxml/makefile.mk 2009-11-11 14:35:37.000000000 +0100
@@ -183,8 +183,8 @@ GENERATEDFILES= \
$(TOKENXMLTMP) \
$(TOKENXML)
@@ -13,12 +13,12 @@
@$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
@@ -192,8 +192,8 @@ $(TOKENXML): tokenxmlheader $(TOKENXMLTM
$(MISC)$/$(OOXMLPREPROCESSXSL): $(OOXMLPREPROCESSXSL)
- $(COPY) $(PWD)$/$(OOXMLPREPROCESSXSL) $(MISC)
-
+ @$(COPY) $(PWD)$/$(OOXMLPREPROCESSXSL) $(MISC)
+
-$(NSXSL) : $(OOXMLMODEL) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt $(NSPROCESS)
-- $(PERL) $(NSPROCESS) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt > $@
+- $(COMMAND_ECHO)$(PERL) $(NSPROCESS) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt > $@
+$(NSXSL) : $(OOXMLMODEL) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt $(NSPROCESS)
-+ $(PERL) $(NSPROCESS) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt > $@
-
++ $(COMMAND_ECHO)$(PERL) $(NSPROCESS) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt > $@
+
+
$(MODELPROCESSED): $(NSXSL) $(MISC)$/$(OOXMLPREPROCESSXSL) $(OOXMLMODEL)
- @echo "Making: " $(@:f)
commit fa87ad407e18dfad4231d77a49991ef0c5b1b22c
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Nov 10 17:30:16 2009 +0100
Fixed permissions of the SDK stuff on openSUSE-11.0
* bin/piece/file-list-sdk: need to explicitely set 755 permission; it seems
that perl zip stuff does not set it correctly on openSUSE-11.0
diff --git a/bin/piece/file-list-sdk b/bin/piece/file-list-sdk
index 0e20807..52c2150 100755
--- a/bin/piece/file-list-sdk
+++ b/bin/piece/file-list-sdk
@@ -44,5 +44,8 @@ ln -sf $OO_INSTDIR/solver/idl "$DESTDIR$OO_INSTDIR/basis$VERSION/sdk/idl"
# fix permissions
find $DESTDIR$OO_DOCDIR/sdk -name "*.gif" -exec chmod a-x {} \;
+# FIXME: the following hack might be removed after openSUSE-11.0 is not longer supported
+# it looks like perl-(un)zip stuff does not preserve permissions on this old system :-(
+chmod 755 $DESTDIR$OO_INSTDIR/basis$VERSION/sdk/{config*,setsdkenv_unix,bin/*}
exit 0
More information about the ooo-build-commit
mailing list