[ooo-build-commit] .: bin/piece bin/unpack distro-configs/SUSE-11.1.conf.in patches/dev300 src/helpcontent2
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Jul 23 07:59:21 PDT 2010
bin/piece/build-bootstrap | 2
bin/piece/build-generic | 13 -
bin/piece/install-registry | 6
bin/piece/sys-setup.in | 3
bin/unpack | 2
distro-configs/SUSE-11.1.conf.in | 1
patches/dev300/apply | 13 +
patches/dev300/build-allow-system-cppunit-1.12.0.diff | 15 ++
patches/dev300/piece-build.diff | 2
patches/dev300/piece-cui.diff | 11 +
patches/dev300/piece-extensions.diff | 32 ----
patches/dev300/piece-qadevOOo.diff | 36 +++++
patches/dev300/piece-reportbuilder.diff | 113 -----------------
patches/dev300/piece-scripting-hack.diff | 62 +++++++++
patches/dev300/piece-sdext.diff | 11 -
patches/dev300/piece-sfx2.diff | 43 ++++++
patches/dev300/piece-swext.diff | 17 --
patches/dev300/piece-vbahelper.diff | 22 +--
patches/dev300/piece-vcl.diff | 119 ++++++++++++++++++
patches/dev300/piece-writerfilter.diff | 11 +
patches/dev300/solenv-dummy-localize-sdf.diff | 23 +++
src/helpcontent2/main_transform.xsl | 12 -
22 files changed, 366 insertions(+), 203 deletions(-)
New commits:
commit 0938c66efe7cd7326f1b57eb82fd2b402277b75f
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Fri Jul 23 15:33:59 2010 +0200
Split build fixes for dev300-m83
* bin/piece/build-bootstrap: make sure that stlport module is being built
* bin/piece/build-generic: vbahelper is in the upstream sources; transex3
module has been renamed to l10ntools
* bin/piece/sys-setup.in: set TARFILE_LOCATION for 3rd party tarballs
to "$SRC_ROOT/ooo-build/src"
* bin/unpack: do not need unowinreg.dll ib bootstrap
* src/helpcontent2/main_transform.xsl: update for the current sources
* distro-configs/SUSE-11.1.conf.in: use system cppunit
* patches/dev300/build-allow-system-cppunit-1.12.0.diff: enable build with
the system cppunit-1.12.0; 1.12.1 was allowed before
* patches/dev300/solenv-dummy-localize-sdf.diff: make the dummy localize.sdf
target actually working (i#113389)
* patches/dev300/piece-build.diff: make the build.pl working again
* patches/dev300/piece-cui.diff: find the prebuilt icons
* patches/dev300/piece-extensions.diff: bin obsolete
* patches/dev300/piece-qadevOOo.diff: find the jar files in system solver
* patches/dev300/piece-reportbuilder.diff: remove obsolete hunks
* patches/dev300/piece-sdext.diff: remove obsolete hunks
* patches/dev300/piece-sfx2.diff: find stuff in the system solver
* patches/dev300/piece-swext.diff: remove obsolete hunks
* patches/dev300/piece-vbahelper.diff: find stuff in the system solver
* patches/dev300/piece-vcl.diff: copy here kde_headers.h to avoid cyclic
build dependency
* patches/dev300/piece-writerfilter.diff: find the stuff in the piece solver
* patches/dev300/apply:
* add new diffs:
* piece-cui.diff
* piece-vcl.diff
* piece-sfx2.diff
* piece-qadevOOo.diff
* piece-scripting-hack.diff
* solenv-dummy-localize-sdf.diff
* build-allow-system-cppunit-1.12.0.diff
* remove obsolete:
* piece-extensions.diff
temporary hacks:
* bin/piece/install-registry: do not complain about missing registry files
for optinal subpackages
* patches/dev300/piece-scripting-hack.diff: remporary disable code causing
cycling build dependencies
diff --git a/bin/piece/build-bootstrap b/bin/piece/build-bootstrap
index b222ed5..5ae6fda 100755
--- a/bin/piece/build-bootstrap
+++ b/bin/piece/build-bootstrap
@@ -4,4 +4,4 @@
export ULFEX=$TOOLSDIR/bin/piece/noulf
export ULFCONV=$TOOLSDIR/bin/piece/noulfconv
-perl $SOLARENV/bin/build.pl --subdirs:soltools:scp2 $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+perl $SOLARENV/bin/build.pl --subdirs:soltools:scp2:stlport $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
diff --git a/bin/piece/build-generic b/bin/piece/build-generic
index 4f89941..e1e1e89 100755
--- a/bin/piece/build-generic
+++ b/bin/piece/build-generic
@@ -55,7 +55,6 @@ fi
$OO_TOOLSDIR/install-artwork $OO_TOOLSDIR/../src `pwd`
# new modules
-test "$piece" = "libs-core" && mkdir -p vbahelper
test "$piece" = "filters" && mkdir -p lotuswordpro
# apply flags
@@ -93,17 +92,17 @@ fi
# apply extra localization fixes in the libs-gui piece
if test "$piece" = "libs-gui" -o "$piece" = "libs_gui" ; then
- # do not build modules depending on transex3,l10n,vcl now
+ # do not build modules depending on transex3,l10n,l10ntools,vcl now
for dir in * ; do
test -f $dir/prj/build.lst && \
- head -n 1 $dir/prj/build.lst | grep -q -e transex3 -e l10n -e vcl && \
+ head -n 1 $dir/prj/build.lst | grep -q -e transex3 -e l10n -e l10ntools -e vcl && \
omit_dirs="$omit_dirs -e ^$dir\$"
- transex3_dirs=`/bin/ls | grep -v $omit_dirs | tr '\n' ':'`
- # actually build the transex3 module
- transex3_dirs="transex3:$transex3_dirs"
+ l10ntools_dirs=`/bin/ls | grep -v $omit_dirs | tr '\n' ':'`
+ # actually build the l10ntools module
+ l10ntools_dirs="l10ntools:$l10ntools_dirs"
done
# build the localize tool
- perl $SOLARENV/bin/build.pl --subdirs:$transex3_dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+ perl $SOLARENV/bin/build.pl --subdirs:$l10ntools_dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
unset nodep
# apply sdf files
$OO_TOOLSDIR/localize-ooo || exit 1;
diff --git a/bin/piece/install-registry b/bin/piece/install-registry
index 1d2c58b..24da7d1 100755
--- a/bin/piece/install-registry
+++ b/bin/piece/install-registry
@@ -18,7 +18,11 @@ filelist_final=files-$pack.txt
if test ! -f $registry_solver/$filelist_prebuilt ; then
echo "Error: cannot find prebuilt registry for $pack"
- exit 1;
+ # FIXME: the gistry files are generated in postscript instaqled of libs core
+ # it must be fixed and changed tobefore the final release !!!
+ # => temporary using exit 0;
+ # exit 1;
+ exit 0;
fi
# we wants to create even empty directories
diff --git a/bin/piece/sys-setup.in b/bin/piece/sys-setup.in
index 83facb1..d8ffe31 100755
--- a/bin/piece/sys-setup.in
+++ b/bin/piece/sys-setup.in
@@ -48,6 +48,9 @@ PATH=
# override / extend ones we need to adapt
SRC_ROOT=`pwd`
+# piece source dir for 3rd party stuff
+TARFILE_LOCATION="$SRC_ROOT/ooo-build/src"
+
# new local solver
export SOLARPIECEVERSION="$SRC_ROOT/solver"
export SOLARPIECE="$SOLARPIECEVERSION"
diff --git a/bin/unpack b/bin/unpack
index 8442a06..bc986e7 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -371,7 +371,7 @@ fi
# copy in unowinreg.dll if we need to
# it is necessary in ODK
# it can be built even on linux by mingw32, though
-if test "z$PIECE" = "z" -o "z$PIECE" = "zbootstrap" ; then
+if test "z$PIECE" = "z" ; then
if test "$USE_PREBUILD_UNOWINREG_DLL" = "YES" ; then
mkdir -p $OOBUILDDIR/external/unowinreg/ || exit 1;
$GNUCP -f $SRCDIR/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
diff --git a/distro-configs/SUSE-11.1.conf.in b/distro-configs/SUSE-11.1.conf.in
index a938f18..6cd100c 100644
--- a/distro-configs/SUSE-11.1.conf.in
+++ b/distro-configs/SUSE-11.1.conf.in
@@ -22,6 +22,7 @@
--with-jdk-home=$JAVA_HOME
--with-system-boost
--with-system-cairo
+--with-system-cppunit
--with-system-curl
--with-system-db
--with-system-dicts
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 90f6e4b..2614ae6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1052,6 +1052,9 @@ solenv-installer-cleaner-paths.diff, pmladek
# gid_Module_Langpack_Basis_es.es
solenv-installer-lang-filelist-names.diff, pmladek
+# make the dummy localize.sdf realy working
+solenv-dummy-localize-sdf.diff, i#113389, pmladek
+
# allow to get path also from ./file
# otherwise, it installed the license files into ugly subdirectories
# for example into <ooo-home>/LICENSE.html/LICENSE.html
@@ -1061,6 +1064,9 @@ installer-get-path-correctly.diff, pmladek
# allow to use the prebuilt jsr173_1.0_api.jar
build-prebuilt-stax.diff, i#93116, pmladek
+# 1.12.1 was allowed before; we have 1.12.0 on older SUSE distros
+build-allow-system-cppunit-1.12.0.diff, pmladek
+
# fix build with neon-0.24
ucb-neon-0.24.diff, pmladek
@@ -3278,9 +3284,13 @@ piece-target.diff
piece-icons.diff
piece-startup.diff
piece-basic.diff
+piece-sfx2.diff
piece-svx.diff
+piece-vcl.diff
# zipintro is not kind to us ...
piece-scripting.diff
+# FIXME!!!: temporary hack to avoid cyclic build dependency
+piece-scripting-hack.diff
piece-helpcontent2.diff
piece-sdext.diff
piece-swext.diff
@@ -3292,6 +3302,7 @@ piece-offuh.diff
piece-cppuhelper.diff
piece-cpputools.diff
piece-connectivity.diff
+piece-cui.diff
piece-bridges.diff
piece-saxon.diff
piece-stoc.diff
@@ -3306,7 +3317,6 @@ piece-scp2.diff
piece-solenv.diff
piece-services.diff
piece-ant.diff
-piece-extensions.diff
[ NLPSolverBits and PieceBits ]
piece-nlpsolver.diff
[ PieceBits ]
@@ -3320,6 +3330,7 @@ piece-sw.diff
piece-xmerge.diff
piece-packimages.diff
piece-automation.diff
+piece-qadevOOo.diff
piece-cli_ure.diff
piece-transex3.diff
piece-odk.diff
diff --git a/patches/dev300/build-allow-system-cppunit-1.12.0.diff b/patches/dev300/build-allow-system-cppunit-1.12.0.diff
new file mode 100644
index 0000000..69451ac
--- /dev/null
+++ b/patches/dev300/build-allow-system-cppunit-1.12.0.diff
@@ -0,0 +1,15 @@
+--- configure.in.old 2010-07-15 12:59:44.000000000 +0200
++++ configure.in 2010-07-15 13:03:35.000000000 +0200
+@@ -3797,10 +3797,8 @@ if test -n "$with_system_cppunit" -o -n
+ test "$with_system_cppunit" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_CPPUNIT=YES
+- # might work for earlier, too but go sure. We didn't have
+- # a system-cppunit before the first version using a proper cppunit
+- # (and that being 1.12.1) anyway
+- PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.1 )
++ # might work for earlier, too but go sure
++ PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 )
+ AC_MSG_CHECKING([STL compatibility])
+ if test "$WITH_STLPORT" != "no"; then
+ AC_MSG_ERROR([to use system cppunit you need to use --without-stlport])
diff --git a/patches/dev300/piece-build.diff b/patches/dev300/piece-build.diff
index 8a66f0d..bfb482b 100644
--- a/patches/dev300/piece-build.diff
+++ b/patches/dev300/piece-build.diff
@@ -37,7 +37,7 @@
and $build_all_cont = $1 and next;
$arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
and $build_all_cont = $1 and next;
-+ $arg =~ /^--subdirs:(.+)$/ and $BuildAllParents = 1
++ $arg =~ /^--subdirs:(.+)$/ and $build_all_parents = 1
+ and $build_all_dirs = $1 and next;
if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
$build_all_parents = 1;
diff --git a/patches/dev300/piece-cui.diff b/patches/dev300/piece-cui.diff
new file mode 100644
index 0000000..4ab4f03
--- /dev/null
+++ b/patches/dev300/piece-cui.diff
@@ -0,0 +1,11 @@
+--- cui/util/makefile.mk.old 2010-07-19 18:10:32.000000000 +0200
++++ cui/util/makefile.mk 2010-07-20 13:47:49.000000000 +0200
+@@ -97,7 +97,7 @@ SRSFILELIST=\
+
+
+ RESLIB1NAME=cui
+-RESLIB1IMAGES=$(SOLARSRC)/$(RSCDEFIMG)/svx/res
++RESLIB1IMAGES=$(SOLARVER)/$(RSCDEFIMG)/svx/res
+ RESLIB1SRSFILES= $(SRSFILELIST)
+
+ # --- Targets -------------------------------------------------------
diff --git a/patches/dev300/piece-extensions.diff b/patches/dev300/piece-extensions.diff
deleted file mode 100644
index 022f84e..0000000
--- a/patches/dev300/piece-extensions.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- extensions/source/oooimprovement/makefile.mk.old 2009-02-21 00:00:23.000000000 +0100
-+++ extensions/source/oooimprovement/makefile.mk 2009-03-02 12:35:34.000000000 +0100
-@@ -37,10 +37,10 @@ TARGET=oooimprovement
- ENABLE_EXCEPTIONS=TRUE
-
- PACKAGE=org.openoffice.Office
--ABSXCSROOT=$(SOLARXMLDIR)
-+ABSXCSROOT=$(SPLITINSTALLDIR)$/..$/share
- XCSROOT=..
--DTDDIR=$(ABSXCSROOT)
--XSLDIR=$(ABSXCSROOT)$/processing
-+DTDDIR=$(SOLARXMLDIR)
-+XSLDIR=$(SOLARXMLDIR)$/processing
- PROCESSOUT=$(MISC)$/$(TARGET)
- PROCESSORDIR=$(SOLARBINDIR)
-
---- extensions/source/update/check/makefile.mk
-+++ extensions/source/update/check/makefile.mk
-@@ -37,10 +37,10 @@
- LIBTARGET=NO
- ENABLE_EXCEPTIONS=TRUE
-
--ABSXCSROOT=$(SOLARXMLDIR)
-+ABSXCSROOT=$(SPLITINSTALLDIR)$/..$/share
- XCSROOT=..
--DTDDIR=$(ABSXCSROOT)
--XSLDIR=$(ABSXCSROOT)$/processing
-+DTDDIR=$(SOLARXMLDIR)
-+XSLDIR=$(SOLARXMLDIR)$/processing
- PROCESSOUT=$(MISC)$/$(TARGET)
- PROCESSORDIR=$(SOLARBINDIR)
-
diff --git a/patches/dev300/piece-qadevOOo.diff b/patches/dev300/piece-qadevOOo.diff
new file mode 100644
index 0000000..8b75204
--- /dev/null
+++ b/patches/dev300/piece-qadevOOo.diff
@@ -0,0 +1,36 @@
+--- qadevOOo/build.xml.old 2010-07-19 13:33:25.000000000 +0200
++++ qadevOOo/build.xml 2010-07-19 14:05:54.000000000 +0200
+@@ -8,7 +8,8 @@
+ <property name="qadevOOo.class" location="${qadevOOo.output}/class"/>
+ <property name="qadevOOo.runner" location="${prj}/runner"/>
+ <property name="qadevOOo.tests" location="${prj}/tests/java"/>
+- <property name="qadevOOo.office_jars" location="${solar.jar}"/>
++ <property name="qadevOOo.office_jars" location="${split.install}/classes"/>
++ <property name="qadevOOo.ure_jars" location="${split.ure}/share/java"/>
+
+ <!-- ================================================================================== -->
+
+@@ -23,8 +24,10 @@
+ <classpath>
+ <pathelement location="${qadevOOo.class}"/>
+ <fileset dir="${qadevOOo.office_jars}">
+- <include name="**/ridl.jar"/>
+ <include name="**/unoil.jar"/>
++ </fileset>
++ <fileset dir="${qadevOOo.ure_jars}">
++ <include name="**/ridl.jar"/>
+ <include name="**/jurt.jar"/>
+ <include name="**/juh.jar"/>
+ <include name="**/java_uno.jar"/>
+@@ -39,8 +42,10 @@
+ <classpath>
+ <pathelement location="${qadevOOo.class}"/>
+ <fileset dir="${qadevOOo.office_jars}">
+- <include name="**/ridl.jar"/>
+ <include name="**/unoil.jar"/>
++ </fileset>
++ <fileset dir="${qadevOOo.ure_jars}">
++ <include name="**/ridl.jar"/>
+ <include name="**/jurt.jar"/>
+ <include name="**/juh.jar"/>
+ <include name="**/java_uno.jar"/>
diff --git a/patches/dev300/piece-reportbuilder.diff b/patches/dev300/piece-reportbuilder.diff
index cc0b286..0e4cf7d 100644
--- a/patches/dev300/piece-reportbuilder.diff
+++ b/patches/dev300/piece-reportbuilder.diff
@@ -1,116 +1,3 @@
---- reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk 2010-03-12 17:11:54.000000000 +0100
-@@ -49,4 +49,8 @@ MODULEFILES=
-
- .INCLUDE : target.mk
-
--
-+ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs"
-+
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs
-+ @@-$(MKDIRHIER) $(@:d)
-+ $(COPY) $< $@
---- reportbuilder/registry/data/org/openoffice/Office/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/registry/data/org/openoffice/Office/makefile.mk 2010-03-12 17:11:54.000000000 +0100
-@@ -54,19 +54,19 @@ XCUFILES= \
-
- ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs"
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
---- reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk 2010-03-12 17:11:54.000000000 +0100
-@@ -50,10 +50,10 @@ XCUFILES= \
-
- ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs"
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
---- reportbuilder/registry/data/org/openoffice/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/registry/data/org/openoffice/makefile.mk 2010-03-12 17:11:54.000000000 +0100
-@@ -49,6 +49,6 @@ XCUFILES= \
-
- ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs"
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
---- reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk 2010-03-12 17:11:54.000000000 +0100
-@@ -42,21 +42,22 @@ XCSFILES= \
- ReportCommands.xcs \
- DbReportWindowState.xcs
-
-+XSLTPROC+= --stringparam root $(SPLITINSTALLDIR)$/..$/share$/registry$/schema
-+
- MODULEFILES=
-
- .INCLUDE : target.mk
-
- ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs"
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
--
---- reportbuilder/registry/schema/org/openoffice/Office/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/registry/schema/org/openoffice/Office/makefile.mk 2010-03-12 17:11:54.000000000 +0100
-@@ -45,6 +45,6 @@ XCSFILES= \
-
- ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs"
-
--"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs
-+"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
---- reportbuilder/util/makefile.pmk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/util/makefile.pmk 2010-03-12 17:11:54.000000000 +0100
-@@ -35,7 +35,7 @@ ABSXCSROOT=$(PWD)$/$(MISC)$/$(EXTNAME)
- XCSROOT=..
- # XCSROOT=$(SOLARXMLDIR)
- # ABSXCSROOT=$(SOLARXMLDIR)
--DTDDIR=$(SOLARXMLDIR)
-+DTDDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)
- PROCESSOUT=$(MISC)$/$(EXTNAME)
- PROCESSORDIR=$(SOLARBINDIR)
-
--- reportbuilder/util/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200
+++ reportbuilder/util/makefile.mk 2010-05-11 10:43:42.000000000 +0200
@@ -129,11 +129,15 @@ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$
diff --git a/patches/dev300/piece-scripting-hack.diff b/patches/dev300/piece-scripting-hack.diff
new file mode 100644
index 0000000..3413920
--- /dev/null
+++ b/patches/dev300/piece-scripting-hack.diff
@@ -0,0 +1,62 @@
+--- scripting/source/vbaevents/eventhelper.cxx.old 2010-07-19 15:16:09.000000000 +0200
++++ scripting/source/vbaevents/eventhelper.cxx 2010-07-19 16:11:49.000000000 +0200
+@@ -78,7 +78,7 @@
+ #include <basic/sbmeth.hxx>
+ #include <basic/sbmod.hxx>
+ #include <basic/sbx.hxx>
+-#include <filter/msfilter/msvbahelper.hxx>
++//#include <filter/msfilter/msvbahelper.hxx>
+
+
+
+@@ -1097,7 +1097,7 @@ EventListener::firing_Impl(const ScriptE
+
+ OSL_TRACE("*** trying to invoke %s ",
+ rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() );
+- ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
++/* ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
+ if ( aMacroResolvedInfo.IsResolved() )
+ {
+ //liuchen 2009-6-8
+@@ -1139,6 +1139,7 @@ EventListener::firing_Impl(const ScriptE
+ }
+ }
+ }
++*/
+ }
+ }
+ }
+--- scripting/source/vbaevents/makefile.mk.old 2010-07-19 15:16:20.000000000 +0200
++++ scripting/source/vbaevents/makefile.mk 2010-07-19 16:12:53.000000000 +0200
+@@ -69,7 +69,6 @@ SHL1STDLIBS= \
+ $(BASICLIB) \
+ $(COMPHELPERLIB) \
+ $(SFXLIB) \
+- $(MSFILTERLIB) \
+ $(CPPULIB) \
+ $(TOOLSLIB) \
+ $(SALLIB)
+--- scripting/source/dlgprov/dlgevtatt.cxx.old 2010-07-19 17:22:49.000000000 +0200
++++ scripting/source/dlgprov/dlgevtatt.cxx 2010-07-19 17:24:06.000000000 +0200
+@@ -53,7 +53,7 @@
+
+ #include <ooo/vba/XVBAToOOEventDescGen.hpp>
+ #include <com/sun/star/lang/XUnoTunnel.hpp>
+-#include <vbahelper/vbaaccesshelper.hxx>
++//#include <vbahelper/vbaaccesshelper.hxx>
+
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::awt;
+@@ -186,9 +186,9 @@ namespace dlgprov
+ uno::Reference< lang::XUnoTunnel > xObjShellTunnel( rxModel, uno::UNO_QUERY );
+ if ( xObjShellTunnel.is() )
+ {
+- pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
+- if ( pFoundShell )
+- mbUseFakeVBAEvents = ooo::vba::isAlienExcelDoc( *pFoundShell ) || ooo::vba::isAlienWordDoc( *pFoundShell ) ;
++// pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
++// if ( pFoundShell )
++// mbUseFakeVBAEvents = ooo::vba::isAlienExcelDoc( *pFoundShell ) || ooo::vba::isAlienWordDoc( *pFoundShell ) ;
+ }
+ }
+ if ( mbUseFakeVBAEvents )
diff --git a/patches/dev300/piece-sdext.diff b/patches/dev300/piece-sdext.diff
index a8baf91..b073bb7 100644
--- a/patches/dev300/piece-sdext.diff
+++ b/patches/dev300/piece-sdext.diff
@@ -36,14 +36,3 @@
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
---- sdext/util/makefile.pmk.old 2010-04-28 11:35:17.000000000 +0200
-+++ sdext/util/makefile.pmk 2010-05-11 10:48:41.000000000 +0200
-@@ -27,7 +27,7 @@
-
- XSLDIR=$(SOLARXMLDIR)$/processing
- XCSROOT=$(SOLARXMLDIR)
--ABSXCSROOT=$(SOLARXMLDIR)
-+ABSXCSROOT=$(SPLITINSTALLDIR)$/..$/share
- DTDDIR=$(SOLARXMLDIR)
- PROCESSOUT=$(MISC)$/$(EXTNAME)
- PROCESSORDIR=$(SOLARBINDIR)
diff --git a/patches/dev300/piece-sfx2.diff b/patches/dev300/piece-sfx2.diff
new file mode 100644
index 0000000..c23fd2a
--- /dev/null
+++ b/patches/dev300/piece-sfx2.diff
@@ -0,0 +1,43 @@
+--- solenv/inc/extension_post.mk.old 2010-07-19 11:41:49.000000000 +0200
++++ solenv/inc/extension_post.mk 2010-07-19 11:43:56.000000000 +0200
+@@ -30,6 +30,8 @@ EXTENSION_TARGET:=$(ZIP9TARGETN)
+ .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
+ .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
+
++SOLARLICENSEDIR*=$(SOLARBINDIR)/osl
++
+ fixme=$(MISC)/$(EXTNAME)/merge/$(MISC)
+ fixme2=$(fixme:n)
+
+@@ -145,9 +147,9 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPT
+ # may not fit...
+ .IF "$(CUSTOM_LICENSE)"==""
+ .IF "$(GUI)" == "WNT"
+-PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
++PACKLICDEPS=$(SOLARLICENSEDIR)/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+ .ELSE # "$(GUI)" == "WNT"
+-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
++PACKLICDEPS=$(SOLARLICENSEDIR)/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+ .ENDIF # "$(GUI)" == "WNT"
+ .ELSE # "$(CUSTOM_LICENSE)" == ""
+ PACKLICDEPS=$(CUSTOM_LICENSE)
+--- sfx2/workben/custompanel/makefile.mk.old 2010-06-18 10:32:12.000000000 +0200
++++ sfx2/workben/custompanel/makefile.mk 2010-07-19 11:52:10.000000000 +0200
+@@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS=TRUE
+ LIBTARGET=NO
+ EXTENSIONNAME:=custom-tool-panel
+
++SOLARLICENSEDIR=$(SOLARPIECE)$/$(INPATH)$/bin$/osl
++
+ # --- Settings -----------------------------------------------------
+
+ .INCLUDE : settings.mk
+@@ -67,7 +69,7 @@ SHL1STDLIBS= \
+ $(SALHELPERLIB) \
+ $(CPPUHELPERLIB)
+
+-SHL1VERSIONMAP=$(SOLARSRC)/solenv/src/component.map
++SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+ SHL1LIBS= $(LIB1TARGET)
+ SHL1DEF= $(MISC)/$(SHL1TARGET).def
+ SHL1RPATH= OXT
diff --git a/patches/dev300/piece-swext.diff b/patches/dev300/piece-swext.diff
index 5e910ff..a512ac5 100644
--- a/patches/dev300/piece-swext.diff
+++ b/patches/dev300/piece-swext.diff
@@ -1,20 +1,3 @@
---- swext/makefile.pmk.old 2008-04-11 12:04:48.000000000 +0200
-+++ swext/makefile.pmk 2008-09-26 15:45:44.000000000 +0200
-@@ -29,10 +29,10 @@
- #
- #*************************************************************************
-
--XSLDIR=$(SOLARXMLDIR)$/processing
--XCSROOT=$(SOLARXMLDIR)
--ABSXCSROOT=$(SOLARXMLDIR)
--DTDDIR=$(SOLARXMLDIR)
-+XSLDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)$/processing
-+XCSROOT=$(SPLITINSTALLDIR)$/../share
-+ABSXCSROOT=$(XCSROOT)
-+DTDDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)
- PROCESSOUT=$(MISC)$/$(CUSTID)
- PROCESSORDIR=$(SOLARBINDIR)
-
--- swext/mediawiki/makefile.mk.old 2008-04-11 12:05:18.000000000 +0200
+++ swext/mediawiki/makefile.mk 2008-09-26 15:46:35.000000000 +0200
@@ -37,10 +37,10 @@ TARGET=mediawiki
diff --git a/patches/dev300/piece-vbahelper.diff b/patches/dev300/piece-vbahelper.diff
index fd14cf4..99f4e89 100644
--- a/patches/dev300/piece-vbahelper.diff
+++ b/patches/dev300/piece-vbahelper.diff
@@ -1,26 +1,24 @@
---- vbahelper/source/msforms/makefile.mk.old 2009-03-02 17:28:50.000000000 +0100
-+++ vbahelper/source/msforms/makefile.mk 2009-03-02 18:05:51.000000000 +0100
-@@ -72,7 +72,8 @@ ALLTAR : \
+--- vbahelper/source/vbahelper/makefile.mk.old 2010-07-20 14:46:30.000000000 +0200
++++ vbahelper/source/vbahelper/makefile.mk 2010-07-20 15:42:35.000000000 +0200
+@@ -71,7 +71,7 @@ ALLTAR : \
$(SLOFILES) : $(MISC)$/$(TARGET).don
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
- +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
-+$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
-+ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++$(MISC)$/$(TARGET).don : $(SPLITINSTALLDIR)$/oovbaapi.rdb
++ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SPLITINSTALLDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
echo $@
---- vbahelper/source/vbahelper/makefile.mk.old 2009-03-02 17:28:50.000000000 +0100
-+++ vbahelper/source/vbahelper/makefile.mk 2009-03-02 18:07:40.000000000 +0100
-@@ -60,7 +60,8 @@ ALLTAR : \
+--- vbahelper/source/msforms/makefile.mk.old 2010-07-20 14:46:30.000000000 +0200
++++ vbahelper/source/msforms/makefile.mk 2010-07-20 15:40:44.000000000 +0200
+@@ -71,7 +71,7 @@ ALLTAR : \
$(SLOFILES) : $(MISC)$/$(TARGET).don
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
- +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
-+$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
-+ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++$(MISC)$/$(TARGET).don : $(SPLITINSTALLDIR)$/oovbaapi.rdb
++ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SPLITINSTALLDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
echo $@
diff --git a/patches/dev300/piece-vcl.diff b/patches/dev300/piece-vcl.diff
new file mode 100644
index 0000000..2b7f857
--- /dev/null
+++ b/patches/dev300/piece-vcl.diff
@@ -0,0 +1,119 @@
+--- vcl/unx/kde/kdedata.cxx.old 2010-06-18 10:32:12.000000000 +0200
++++ vcl/unx/kde/kdedata.cxx 2010-07-16 11:54:16.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include "precompiled_vcl.hxx"
+
+ #define _SV_SALDATA_CXX
+-#include <shell/kde_headers.h>
++#include <vcl/kde_headers.h>
+
+ #include <unistd.h>
+ #include <fcntl.h>
+--- vcl/unx/kde/salnativewidgets-kde.cxx.old 2010-07-15 21:09:28.000000000 +0200
++++ vcl/unx/kde/salnativewidgets-kde.cxx 2010-07-16 11:56:01.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include "precompiled_vcl.hxx"
+
+ #define _SV_SALNATIVEWIDGETS_KDE_CXX
+-#include <shell/kde_headers.h>
++#include <vcl/kde_headers.h>
+
+ #include <salunx.h>
+ #include <saldata.hxx>
+--- vcl/inc/vcl/kde_headers.h.old 2010-07-16 11:55:34.000000000 +0200
++++ vcl/inc/vcl/kde_headers.h 2010-06-18 10:32:12.000000000 +0200
+@@ -0,0 +1,94 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2000, 2010 Oracle and/or its affiliates.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef INCLUDED_VCL_KDE_HEADERS_H
++#define INCLUDED_VCL_KDE_HEADERS_H
++
++/* ********* Suppress warnings if needed */
++#include "sal/config.h"
++
++#if defined __GNUC__
++#pragma GCC system_header
++#endif
++
++
++/* ********* Hack, but needed because of conflicting types... */
++#define Region QtXRegion
++
++
++/* ********* Qt headers */
++#include <qaccessible.h>
++#include <qcheckbox.h>
++#include <qcombobox.h>
++#include <qfont.h>
++#include <qframe.h>
++#include <qlineedit.h>
++#include <qlistview.h>
++#include <qmainwindow.h>
++#include <qmenudata.h>
++#include <qpaintdevice.h>
++#include <qpainter.h>
++#include <qpushbutton.h>
++#include <qradiobutton.h>
++#include <qrangecontrol.h>
++#include <qstring.h>
++#include <qtabbar.h>
++#include <qtabwidget.h>
++#include <qtoolbar.h>
++#include <qtoolbutton.h>
++#include <qwidget.h>
++#include <qprogressbar.h>
++
++/* ********* See hack on top of this file */
++#undef Region
++
++
++/* ********* KDE base headers */
++#include <kaboutdata.h>
++#include <kapplication.h>
++#include <kcmdlineargs.h>
++#include <kconfig.h>
++#include <kdeversion.h>
++#include <kemailsettings.h>
++#include <kglobal.h>
++#include <kglobalsettings.h>
++#include <klocale.h>
++#include <kmainwindow.h>
++#include <kmenubar.h>
++#include <kprotocolmanager.h>
++#include <kstartupinfo.h>
++#include <kstyle.h>
++
++
++/* ********* KDE address book connectivity headers */
++#include <kabc/addressbook.h>
++#include <kabc/addressee.h>
++#include <kabc/field.h>
++#include <kabc/stdaddressbook.h>
++
++
++#endif
diff --git a/patches/dev300/piece-writerfilter.diff b/patches/dev300/piece-writerfilter.diff
index 89f9746..4b38bf6 100644
--- a/patches/dev300/piece-writerfilter.diff
+++ b/patches/dev300/piece-writerfilter.diff
@@ -11,3 +11,14 @@
$(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
@$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
+--- writerfilter/source/resourcemodel/makefile.mk.old 2010-07-20 14:46:24.000000000 +0200
++++ writerfilter/source/resourcemodel/makefile.mk 2010-07-20 15:52:06.000000000 +0200
+@@ -132,7 +132,7 @@ SPRMIDSHXX=$(DOCTOKHXXOUTDIR)$/sprmids.h
+ OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx
+
+ NSXSL=$(MISC)$/namespacesmap.xsl
+-NAMESPACESTXT=$(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt
++NAMESPACESTXT=$(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt
+
+ GENERATEDHEADERS=$(DOCTOKRESOURCEIDSHXX) $(OOXMLRESOURCEIDSHXX) $(SPRMIDSHXX)
+ GENERATEDFILES= \
diff --git a/patches/dev300/solenv-dummy-localize-sdf.diff b/patches/dev300/solenv-dummy-localize-sdf.diff
new file mode 100644
index 0000000..dad8009
--- /dev/null
+++ b/patches/dev300/solenv-dummy-localize-sdf.diff
@@ -0,0 +1,23 @@
+--- solenv/inc/settings.mk.old 2010-07-21 19:58:19.000000000 +0200
++++ solenv/inc/settings.mk 2010-07-23 16:03:29.000000000 +0200
+@@ -835,6 +835,9 @@ LOCALIZESDF:=$(strip $(shell @+$(IFEXIST
+ # dummy target to keep the build happy.
+ .IF "$(LOCALIZESDF)"==""
+ LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
++DUMMYLOCALIZESDF:="YES"
++.ELSE
++DUMMYLOCALIZESDF:="NO"
+ .ENDIF # "$(LOCALIZESDF)"==""
+ .ENDIF # "$(WITH_LANG)"!=""
+
+--- solenv/inc/target.mk.old 2010-07-23 16:06:29.000000000 +0200
++++ solenv/inc/target.mk 2010-07-23 16:06:04.000000000 +0200
+@@ -1390,7 +1390,7 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
+ $(TOUCH) $@
+
+ .IF "$(LOCALIZATION_FOUND)"==""
+-.IF "$(LOCALSDFFILE)"!=""
++.IF "$(LOCALSDFFILE)"!="" && "$(DUMMYLOCALIZESDF)"!="YES"
+ "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
+ @@-$(MKDIRHIER) $(@:d)
+ @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
diff --git a/src/helpcontent2/main_transform.xsl b/src/helpcontent2/main_transform.xsl
index 1b197f3..d9b6c32 100644
--- a/src/helpcontent2/main_transform.xsl
+++ b/src/helpcontent2/main_transform.xsl
@@ -31,23 +31,23 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
+
Copyright 2000, 2010 Oracle and/or its affiliates.
-
+
OpenOffice.org - a multi-platform office productivity suite
-
+
This file is part of OpenOffice.org.
-
+
OpenOffice.org is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License version 3
only, as published by the Free Software Foundation.
-
+
OpenOffice.org is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License version 3 for more details
(a copy is included in the LICENSE file that accompanied this code).
-
+
You should have received a copy of the GNU Lesser General Public License
version 3 along with OpenOffice.org. If not, see
<http://www.openoffice.org/license.html>
More information about the ooo-build-commit
mailing list