From 4c6816a5cfc876da48d92a2df9f16f1d7a4546bc Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Thu, 3 Oct 2019 15:18:37 +0200 Subject: [PATCH] Remove OpenOffice.org and its dependencies The git source doesn't exist anymore (freedesktop.org now hosts the fork LibreOffice) and some dependencies cannot be downloaded because the host surfnet.dl.sourceforge.net is not available. --- GNUmakefile | 5 +- README | 78 - bin/gub | 2 - gub/build.py | 2 +- gub/installer.py | 2 - gub/mirrors.py | 3 - gub/specs/cppunit.py | 5 - gub/specs/gtk_doc.py | 6 - gub/specs/hunspell.py | 19 - gub/specs/libicu.py | 76 - gub/specs/liblpsolve.py | 28 - gub/specs/libpcre.py | 21 - gub/specs/openoffice.py | 797 ---- gub/specs/raptor.py | 40 - gub/specs/rasqal.py | 10 - gub/specs/rebase.py | 43 - gub/specs/redland.py | 49 - gub/specs/saxon-java.py | 16 - gub/specs/xerces-c.py | 53 - openoffice.make | 42 - patches/libicu-3.8.1-cross-mingw.patch | 30 - patches/libicu-3.8.1-cross.patch | 309 -- patches/libicu-3.8.1-mingw.patch | 11 - patches/libicu-3.8.1-uintptr-t.patch | 10 - patches/lpsolve-5.5.0.13-mingw.patch | 11 - patches/openoffice-accessibility-nojava.patch | 17 - patches/openoffice-basegfx-no-cppunit.patch | 8 - patches/openoffice-config_office-cross.patch | 216 - patches/openoffice-config_office-mingw.patch | 72 - patches/openoffice-connectivity-mingw.patch | 51 - patches/openoffice-cppuhelper-mingw.patch | 64 - patches/openoffice-cppunit-mingw.patch | 36 - patches/openoffice-dbaccess-mingw.patch | 50 - patches/openoffice-desktop-mingw.patch | 130 - patches/openoffice-dtrans-mingw.patch | 333 -- patches/openoffice-embeddedobj-mingw.patch | 259 -- .../openoffice-external-mingwheaders.patch | 71 - patches/openoffice-fpicker-mingw.patch | 261 -- patches/openoffice-funit-char-line.patch | 23 - patches/openoffice-goodies-mingw.patch | 11 - patches/openoffice-helpcontent2-mingw.patch | 18 - patches/openoffice-i18npool-cross.patch | 103 - patches/openoffice-i18npool-mingw.patch | 16 - patches/openoffice-icc-cross.patch | 16 - .../openoffice-instsetoo_native-mingw.patch | 11 - patches/openoffice-lingucomponent-mingw.patch | 11 - patches/openoffice-o3tl-no-cppunit.patch | 8 - patches/openoffice-postprocess-mingw.patch | 26 - patches/openoffice-pyuno-mingw.patch | 10 - patches/openoffice-sal-cross.patch | 16 - patches/openoffice-sal-mingw-c.patch | 108 - patches/openoffice-sal-mingw.patch | 120 - patches/openoffice-sccomp-mingw.patch | 26 - patches/openoffice-scp2-mingw.patch | 283 -- patches/openoffice-scripting-mingw.patch | 12 - patches/openoffice-setup_native-mingw.patch | 30 - patches/openoffice-shell-mingw.patch | 355 -- patches/openoffice-solenv-cross.patch | 208 - .../openoffice-solenv-mingw-installer.patch | 65 - patches/openoffice-solenv-mingw.patch | 207 - patches/openoffice-solenv.patch | 11 - patches/openoffice-soltools-cross.patch | 13 - patches/openoffice-soltools-mingw.patch | 22 - patches/openoffice-srcdir-build.patch | 957 ---- patches/openoffice-store-core.patch | 4118 ----------------- patches/openoffice-store-registry.patch | 174 - patches/openoffice-svtools-minimal.patch | 84 - patches/openoffice-svx-mingw.patch | 24 - ...penoffice-sw-disable-vba-consistency.patch | 17 - patches/openoffice-sysui-mingw.patch | 10 - patches/openoffice-tools-mingw.patch | 28 - patches/openoffice-transex3-mingw.patch | 100 - patches/openoffice-unotools-mingw.patch | 10 - patches/openoffice-vbahelper-mingw.patch | 13 - patches/openoffice-vcl-mingw.patch | 424 -- patches/raptor-1.4.18-cross.patch | 111 - patches/rasqal-0.9.16-mingw.patch | 11 - patches/rebase-2.4.2-1.patch | 60 - patches/redland-1.0.8-mingw.patch | 11 - web/applications.html | 14 - web/history.html | 4 +- web/index.html | 7 - web/oo.o.html | 110 - 83 files changed, 4 insertions(+), 11248 deletions(-) delete mode 100644 gub/specs/cppunit.py delete mode 100644 gub/specs/gtk_doc.py delete mode 100644 gub/specs/hunspell.py delete mode 100644 gub/specs/libicu.py delete mode 100644 gub/specs/liblpsolve.py delete mode 100644 gub/specs/libpcre.py delete mode 100644 gub/specs/openoffice.py delete mode 100644 gub/specs/raptor.py delete mode 100644 gub/specs/rasqal.py delete mode 100644 gub/specs/rebase.py delete mode 100644 gub/specs/redland.py delete mode 100644 gub/specs/saxon-java.py delete mode 100644 gub/specs/xerces-c.py delete mode 100644 openoffice.make delete mode 100644 patches/libicu-3.8.1-cross-mingw.patch delete mode 100644 patches/libicu-3.8.1-cross.patch delete mode 100644 patches/libicu-3.8.1-mingw.patch delete mode 100644 patches/libicu-3.8.1-uintptr-t.patch delete mode 100644 patches/lpsolve-5.5.0.13-mingw.patch delete mode 100644 patches/openoffice-accessibility-nojava.patch delete mode 100644 patches/openoffice-basegfx-no-cppunit.patch delete mode 100644 patches/openoffice-config_office-cross.patch delete mode 100644 patches/openoffice-config_office-mingw.patch delete mode 100644 patches/openoffice-connectivity-mingw.patch delete mode 100644 patches/openoffice-cppuhelper-mingw.patch delete mode 100644 patches/openoffice-cppunit-mingw.patch delete mode 100644 patches/openoffice-dbaccess-mingw.patch delete mode 100644 patches/openoffice-desktop-mingw.patch delete mode 100644 patches/openoffice-dtrans-mingw.patch delete mode 100644 patches/openoffice-embeddedobj-mingw.patch delete mode 100644 patches/openoffice-external-mingwheaders.patch delete mode 100644 patches/openoffice-fpicker-mingw.patch delete mode 100644 patches/openoffice-funit-char-line.patch delete mode 100644 patches/openoffice-goodies-mingw.patch delete mode 100644 patches/openoffice-helpcontent2-mingw.patch delete mode 100644 patches/openoffice-i18npool-cross.patch delete mode 100644 patches/openoffice-i18npool-mingw.patch delete mode 100644 patches/openoffice-icc-cross.patch delete mode 100644 patches/openoffice-instsetoo_native-mingw.patch delete mode 100644 patches/openoffice-lingucomponent-mingw.patch delete mode 100644 patches/openoffice-o3tl-no-cppunit.patch delete mode 100644 patches/openoffice-postprocess-mingw.patch delete mode 100644 patches/openoffice-pyuno-mingw.patch delete mode 100644 patches/openoffice-sal-cross.patch delete mode 100644 patches/openoffice-sal-mingw-c.patch delete mode 100644 patches/openoffice-sal-mingw.patch delete mode 100644 patches/openoffice-sccomp-mingw.patch delete mode 100644 patches/openoffice-scp2-mingw.patch delete mode 100644 patches/openoffice-scripting-mingw.patch delete mode 100644 patches/openoffice-setup_native-mingw.patch delete mode 100644 patches/openoffice-shell-mingw.patch delete mode 100644 patches/openoffice-solenv-cross.patch delete mode 100644 patches/openoffice-solenv-mingw-installer.patch delete mode 100644 patches/openoffice-solenv-mingw.patch delete mode 100644 patches/openoffice-solenv.patch delete mode 100644 patches/openoffice-soltools-cross.patch delete mode 100644 patches/openoffice-soltools-mingw.patch delete mode 100644 patches/openoffice-srcdir-build.patch delete mode 100644 patches/openoffice-store-core.patch delete mode 100644 patches/openoffice-store-registry.patch delete mode 100644 patches/openoffice-svtools-minimal.patch delete mode 100644 patches/openoffice-svx-mingw.patch delete mode 100644 patches/openoffice-sw-disable-vba-consistency.patch delete mode 100644 patches/openoffice-sysui-mingw.patch delete mode 100644 patches/openoffice-tools-mingw.patch delete mode 100644 patches/openoffice-transex3-mingw.patch delete mode 100644 patches/openoffice-unotools-mingw.patch delete mode 100644 patches/openoffice-vbahelper-mingw.patch delete mode 100644 patches/openoffice-vcl-mingw.patch delete mode 100644 patches/raptor-1.4.18-cross.patch delete mode 100644 patches/rasqal-0.9.16-mingw.patch delete mode 100644 patches/rebase-2.4.2-1.patch delete mode 100644 patches/redland-1.0.8-mingw.patch delete mode 100644 web/oo.o.html diff --git a/GNUmakefile b/GNUmakefile index ec2434591..5946d7044 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,15 +34,12 @@ denemo-%: inkscape-%: $(MAKE) -f inkscape.make $@ -openoffice-%: - $(MAKE) -f openoffice.make $@ - test: rm -rf target make -f lilypond.make tools LOCAL_GUB_OPTIONS=-vvv bin/gub -p $(BUILD_PLATFORM) --branch=lilypond=master:master lilypond -vvv -README: web/index.html web/basics.html web/lilypond.html web/denemo.html web/inkscape.html web/oo.o.html web/history.html web/links.html +README: web/index.html web/basics.html web/lilypond.html web/denemo.html web/inkscape.html web/history.html web/links.html w3m -dump $^ | sed 's/website by.*$..//' > $@ web: README diff --git a/README b/README index 5d5c4e80c..89d277674 100644 --- a/README +++ b/README @@ -45,7 +45,6 @@ Supported installer packages GNU Denemo Inkscape GNU LilyPond -OpenOffice.org with all essential dependencies. Currently, 207 package build specifications are included in GUB. @@ -144,12 +143,6 @@ Examples this leaves the installer in uploads/ - * Cross build OpenOffice (go-oo.org) for Windows (mingw32) - - make openoffice - - this leaves the Windows installer in uploads/ - * Cross build Denemo (http://denemo.org) for Windows (mingw32) make denemo @@ -661,77 +654,6 @@ More examples -GUB -- OpenOffice.org - -INSTALLING - -Get GUB - - git clone git://github.com/gperciva/gub.git -or - wget https://github.com/gperciva/gub/tarball/master - -In addition to the requirements for GUB, you need - - • wine: to run regcomp.exe and lngconvex.exe and possibly other cross-build - ignorant build tools that are compile-time tied to the build platform - -Ongoing work - -The cross building of OpenOffice.org for mingw32 is still a work in progress -(WIP). The build in GUB will succeeed and an installer can be created, but -services.rdb may not build correctly. - -GSoC 2009 - -Luckily, Jesús Corrius has accepted the challenge to make this mingw32 Go-Oo -OpenOffice.org almost-prove-concept hack into a real port, provide clean -solutions for all the hackweek mess leftovers, make it work as expected, in -other words: actually usable and run on Windows. - -Jesús is working together with Fridrich Strba to clean up and update some of -the cross build and mingw32 patches, while implementing and porting the missing -bits of the mingw32 cross build to openSUSE's osc build system. - -When jcorrius announces it works, his fixes will be incorporated in GUB to -provide turnkey OpenOffice.org Windows binaries and installers. - -Build everything - - make openoffice - -this produces a windows installer in - - uploads/openoffice-COMMITTISH.mingw.exe - -More examples - - * Cross build OpenOffice for Windows: - - bin/gub mingw::openoffice - - * Make the nsis installer - - bin/gib mingw::openoffice - - * Optional: Prepare build environment - - make -f lilypond.make bootstrap - -The package - - bin/gub tools::openoffice - -is a work in progress and attempts to build a tiny fraction of openoffice for -the build tools. - -See also - -https://github.com/gperciva/gub/tree/master/patches -http://lilypond.org/blog/janneke/gub3-ooo-mingw-cross-build - - - GUB the Grand Unified Builder • Home diff --git a/bin/gub b/bin/gub index 011eee181..c16aea6ae 100755 --- a/bin/gub +++ b/bin/gub @@ -67,8 +67,6 @@ Examples: gub darwin-x86::lilypond gub freebsd-64::ftp://ftp.gnu.org/pub/gnu/bison/bison-2.3.tar.gz - - gub mingw::openoffice ''' misc.optparse_epilog (p, examples) diff --git a/gub/build.py b/gub/build.py index 0b5a42172..8cd329bb2 100644 --- a/gub/build.py +++ b/gub/build.py @@ -645,7 +645,7 @@ def disable_la (logger, file_name): loggedos.rename (logger, file_name, file_name + '-') self.map_find_files (disable_la, '%(install_prefix)s', 'lib' + pattern + '.la') - # Used in mingw python and liblpsolve. Better replace this by + # Used in mingw python. Better replace this by # fixing the gcc linking command? def generate_dll_a_and_la (self, libname, depend=''): # ugh, atexit, _onexit mutliply defined in crt2.o diff --git a/gub/installer.py b/gub/installer.py index 708bbdfc9..08c6ec830 100644 --- a/gub/installer.py +++ b/gub/installer.py @@ -20,8 +20,6 @@ 'denemo': 'GNU_Denemo', 'git': 'Git', 'lilypond': 'LilyPond', - 'openoffice': 'Go-Oo_OpenOffice.org', - 'ooo-build': 'Go-Oo_OpenOffice.org', } class ChecksumShortCircuit (Exception): diff --git a/gub/mirrors.py b/gub/mirrors.py index 6307b3e8c..585cc77f0 100644 --- a/gub/mirrors.py +++ b/gub/mirrors.py @@ -93,6 +93,3 @@ glibc_2_3_snapshots = lilypondorg berlios = 'http://download.berlios.de/%(name)s/%(name)s-%(version)s.tar.%(format)s' - -xerces_c_2 = 'http://www.apache.org/dist/xerces/c/2/sources/%(name)s-src_%(version)s.tar.%(format)s' -xerces_c_3 = 'http://www.apache.org/dist/xerces/c/3/sources/%(name)s-src_%(version)s.tar.%(format)s' diff --git a/gub/specs/cppunit.py b/gub/specs/cppunit.py deleted file mode 100644 index bc49c7c4a..000000000 --- a/gub/specs/cppunit.py +++ /dev/null @@ -1,5 +0,0 @@ -from gub import target - -class Cppunit (target.AutoBuild): -# source = 'http://surfnet.dl.sourceforge.net/sourceforge/cppunit/cppunit-1.10.2.tar.gz' - source = 'http://surfnet.dl.sourceforge.net/sourceforge/cppunit/cppunit-1.12.1.tar.gz' diff --git a/gub/specs/gtk_doc.py b/gub/specs/gtk_doc.py deleted file mode 100644 index ed593a9dc..000000000 --- a/gub/specs/gtk_doc.py +++ /dev/null @@ -1,6 +0,0 @@ -from gub import tools - -class Gtk_doc__tools (tools.AutoBuild): - source = 'ftp://ftp.gtk.org/pub/gtk-doc/gtk-doc-1.1.tar.gz' - # Ugh, ugh: avoid [zlib: gzopen64] trouble - dependencies = ['libxml2'] diff --git a/gub/specs/hunspell.py b/gub/specs/hunspell.py deleted file mode 100644 index 19bb17bb0..000000000 --- a/gub/specs/hunspell.py +++ /dev/null @@ -1,19 +0,0 @@ -from gub import target - -class Hunspell (target.AutoBuild): - source = 'http://surfnet.dl.sourceforge.net/sourceforge/hunspell/hunspell-1.2.8.tar.gz' - -class Hunspell__mingw (Hunspell): - dependencies = ['libiconv-devel'] - configure_flags = (Hunspell.configure_flags - + ' --disable-nls') - def patch (self): - Hunspell.patch (self) - self.file_sub ([('(chmorph_LDADD.*)', - r'\1 ../hunspell/libhunspell-1.2.la')], - '%(srcdir)s/src/tools/Makefile.am') - self.file_sub ([('(chmorph_LDADD.*)', - r'\1 ../hunspell/libhunspell-1.2.la'), - ('( ../parsers/libparsers.a .*@READLINELIB@)', - r'\1 ../hunspell/libhunspell-1.2.la -liconv')], - '%(srcdir)s/src/tools/Makefile.in') diff --git a/gub/specs/libicu.py b/gub/specs/libicu.py deleted file mode 100644 index d253edcea..000000000 --- a/gub/specs/libicu.py +++ /dev/null @@ -1,76 +0,0 @@ -from gub import context -from gub import loggedos -from gub import misc -from gub import octal -from gub import target -from gub import tools - -class Libicu (target.AutoBuild): - source = 'http://download.icu-project.org/files/icu4c/3.8.1/icu4c-3_8_1-src.tgz' - #http://download.icu-project.org/files/icu4c/4.0/icu4c-4_0-src.tgz - patches = ['libicu-3.8.1-cross.patch'] - autodir = '%(srcdir)s/source' - make_flags = misc.join_lines (''' -BINDIR_FOR_BUILD='$(BINDIR)-native' -LIBDIR_FOR_BUILD='$(LIBDIR)-native' -PKGDATA_INVOKE_OPTS="TARGET='lib\$\$(LIBNAME).so' BINDIR_FOR_BUILD='\$\$(BINDIR)-native' LIBDIR_FOR_BUILD='\$\$(LIBDIR)-native'" -''') - compile_flags_native = misc.join_lines (''' -BINDIR='$(top_builddir)/bin-native' -LIBDIR='$(top_builddir)/lib-native' -PKGDATA_INVOKE_OPTS="BINDIR='\$\$(top_builddir)/bin-native' LIBDIR='\$\$(top_builddir)/lib-native'" -''') - def __init__ (self, settings, source): - target.AutoBuild.__init__ (self, settings, source) - source._version = '3.8.1' - def stages (self): - return misc.list_insert_before (target.AutoBuild.stages (self), - 'configure', - ['configure_native', 'compile_native']) - def compile_native (self): - target.AutoBuild.compile_native (self) - def rm (logger, file): - loggedos.system (logger, 'rm -f %(file)s' % locals ()) - # ugh, should add misc.find () as map_find () to context interface - # self.map_locate (rm, '%(builddir)s', '*.so.*') - # self.map_locate (rm, '%(builddir)s', '*.so') - self.map_locate (rm, '%(builddir)s', '*.o') - self.get_substitution_dict = misc.bind_method (target.AutoBuild.get_substitution_dict, self) - -class Libicu__mingw (Libicu): - patches = Libicu.patches + ['libicu-3.8.1-uintptr-t.patch', 'libicu-3.8.1-cross-mingw.patch', 'libicu-3.8.1-mingw.patch'] - configure_flags = (Libicu.configure_flags - + misc.join_lines (''' ---disable-threads -''')) - def configure (self): - Libicu.configure (self) - self.dump (''' -#define S_IROTH S_IREAD -#define S_IXOTH S_IXUSR -''', - '%(builddir)s/common/unicode/platform.h', mode='a') - def compile_native (self): - Libicu.compile_native (self) - self.system ('cd %(builddir)s/bin-native && mv pkgdata pkgdata.bin') - self.dump ('''\ -#! /bin/sh -dir=$(dirname $0) -if test "$dir" = "."; then - dir=$(dirname $(which $0)) -fi -$dir/$(basename $0).bin "$@" | sed -e 's/lib$(LIBNAME).so/$(LIBNAME).dll/g' -''', - '%(builddir)s/bin-native/pkgdata', - permissions=octal.o755) - -class Libicu__tools (tools.AutoBuild, Libicu): - source = 'http://download.icu-project.org/files/icu4c/4.1/icu4c-4_1_3-src.tgz' - #source = 'http://download.icu-project.org/files/icu4c/4.0/icu4c-4_0-src.tgz' - patches = [] - def __init__ (self, settings, source): - target.AutoBuild.__init__ (self, settings, source) - source._version = '4.1.3' - #source._version = '4.0' - def stages (self): - return tools.AutoBuild.stages (self) diff --git a/gub/specs/liblpsolve.py b/gub/specs/liblpsolve.py deleted file mode 100644 index 247447ee6..000000000 --- a/gub/specs/liblpsolve.py +++ /dev/null @@ -1,28 +0,0 @@ -from gub import misc -from gub import target - -class Liblpsolve (target.AutoBuild): - source = 'http://surfnet.dl.sourceforge.net/lpsolve/lp_solve_5.5.0.13_source.tar.gz' - parallel_build_broken = True - srcdir_build_broken = True - dependencies = ['tools::automake'] - make_flags = misc.join_lines (''' -AR=%(toolchain_prefix)sar -LIBS= -RANLIB=%(toolchain_prefix)sranlib -''') - destdir_install_broken = True - install_flags_destdir_broken = (target.AutoBuild.install_flags_destdir_broken - .replace ('includedir=%(install_prefix)s/include', 'includedir=%(install_prefix)s/include/lpsolve')) - def autoupdate (self): - # install install-sh - self.system ('cd %(srcdir)s && automake --add-missing --copy --force --foreign || :') - -class Liblpsolve__mingw (Liblpsolve): - patches = ['lpsolve-5.5.0.13-mingw.patch'] - def install (self): - Liblpsolve.install (self) - self.system ('mkdir -p %(install_prefix)s/bin') - self.system ('mv %(install_prefix)s/lib/liblpsolve55.so %(install_prefix)s/bin/liblpsolve55.dll') - self.generate_dll_a_and_la ('lpsolve55') - diff --git a/gub/specs/libpcre.py b/gub/specs/libpcre.py deleted file mode 100644 index 1e10e5b51..000000000 --- a/gub/specs/libpcre.py +++ /dev/null @@ -1,21 +0,0 @@ -from gub import loggedos -from gub import target - -class Libpcre (target.AutoBuild): - source = 'http://surfnet.dl.sourceforge.net/sourceforge/prce/pcre-7.8.tar.bz2' - def name (self): - return 'libpcre' - -class Libpcre__mingw (Libpcre): - def configure (self): - Libpcre.configure (self) - # c&p from libxslt - def fix_allow_undefined (logger, file): - loggedos.file_sub (logger, - [ - # libtool: link: warning: undefined symbols not allowed in i686-pc-mingw32 shared libraries - ('^(allow_undefined_flag=.*)unsupported', '\\1'), - # libtool: install: error: cannot install `libexslt.la' to a directory not ending in /home/janneke/vc/gub/target/mingw/build/libxslt-1.1.24/libexslt/.libs - (r'if test "\$inst_prefix_dir" = "\$destdir";', 'if false;'),], - file) - self.map_locate (fix_allow_undefined, '%(builddir)s', 'libtool') diff --git a/gub/specs/openoffice.py b/gub/specs/openoffice.py deleted file mode 100644 index bb8618e20..000000000 --- a/gub/specs/openoffice.py +++ /dev/null @@ -1,797 +0,0 @@ -import operator -import os -import re -import sys -if sys.version.startswith ('3'): - from functools import reduce -# -from gub.syntax import printf -from gub import context -from gub import loggedos -from gub import misc -from gub import octal -from gub import repository -from gub import target -from gub import tools - -class OpenOffice (target.AutoBuild): - source = 'git://anongit.freedesktop.org/git/ooo-build/ooo-build&revision=207309ec6d428c6a6698db061efb670b36d5df5a' - - patches = ['openoffice-srcdir-build.patch'] - upstream_patches = [ - 'openoffice-config_office-cross.patch', - 'openoffice-solenv-cross.patch', - 'openoffice-solenv.patch', - 'openoffice-sal-cross.patch', - 'openoffice-soltools-cross.patch', - 'openoffice-icc-cross.patch', - 'openoffice-i18npool-cross.patch', - 'openoffice-lingucomponent-mingw.patch', - 'openoffice-accessibility-nojava.patch', - 'openoffice-sw-disable-vba-consistency.patch' - ] - dependencies = [ - 'cross/gcc-c++-runtime', - 'tools::autoconf', - 'tools::rebase', - 'tools::openoffice', - 'boost-devel', - 'curl-devel', - 'cppunit-devel', - 'db-devel', - 'expat-devel', - 'fontconfig-devel', - 'hunspell-devel', - 'libicu-devel', - 'libjpeg-devel', - 'libpng-devel', - 'liblpsolve-devel', - 'python-devel', - 'redland-devel', - 'saxon-java', - 'xerces-c', - 'zlib-devel'] - config_cache_overrides = target.AutoBuild.config_cache_overrides + ''' -ac_cv_file__usr_share_java_saxon9_jar=${ac_cv_file__usr_share_java_saxon9_jar=yes} -ac_cv_file__usr_share_java_saxon_jar=${ac_cv_file__usr_share_java_saxon_jar=yes} -ac_cv_db_version_minor=${ac_cv_db_version_minor=7} -ac_cv_icu_version_minor=${ac_cv_icu_version_minor=3.81} -''' - openoffice_configure_flags = misc.join_lines (''' ---with-vendor=\"GUB -- http://lilypond.org/gub\" ---disable-Xaw ---disable-access ---disable-activex ---disable-activex-component ---disable-atl ---disable-binfilter ---disable-build-mozilla ---disable-cairo ---disable-crypt-link ---disable-cups ---disable-dbus ---disable-directx ---disable-epm ---disable-evolution2 ---disable-extensions ---disable-fontooo ---disable-gconf ---disable-gio ---disable-gnome-vfs ---disable-gstreamer ---disable-gtk ---disable-kde ---disable-kdeab ---disable-largefile ---disable-layout ---disable-ldap ---disable-ldap ---disable-libsn ---disable-lockdown ---disable-mathmldtd ---disable-mono ---disable-mozilla ---disable-neon ---disable-odk ---disable-opengl ---disable-pam ---disable-pasf ---disable-pch ---disable-qadevooo ---disable-randr ---disable-rpath ---disable-scsolver ---disable-systray ---disable-vba ---disable-xrender-link ---disable-atl - ---enable-fontconfig ---enable-verbose - ---without-gpc ---without-agg ---without-java ---without-myspell-dicts - ---with-system-boost ---with-system-cairo ---with-system-curl ---with-system-db ---with-system-expat ---with-system-hunspell ---with-system-icu ---with-system-jpeg ---with-system-libxslt ---with-system-lpsolve ---with-system-neon ---with-system-odbc-headers ---with-system-portaudio ---with-system-redland ---with-system-sablot ---with-system-saxon ---with-system-sndfile ---with-system-xalan ---with-system-xerces ---with-system-xml-apis ---with-system-xrender-headers ---without-system-mozilla ---with-ant-home=/usr/share/ant - ---with-saxon-jar=%(system_prefix)s/share/java/saxon9.jar ---cache-file=%(builddir)s/config.cache ---with-tools-dir=%(tools_prefix)s/bin ---with-additional-sections=MinGW -''') -# TODO: -# --with-system-libwpd -# --with-system-libwps -# --with-system-libwpg - configure_command = (target.AutoBuild.configure_command - + openoffice_configure_flags) - subpackage_names = [''] - def __init__ (self, settings, source): - # Ugh, mingw::openoffice install complains about this... - os.environ['DISPLAY'] = 'localhost:0.0' - target.AutoBuild.__init__ (self, settings, source) - # let's keep source tree around - def tracking (self): - return True - self.source.is_tracking = misc.bind_method (tracking, self.source) - def stages (self): - return misc.list_insert_before (target.AutoBuild.stages (self), - 'compile', - ['dotslash_download', 'make_unpack', 'patch_upstream']) - def dotslash_download (self): - self.system ('mkdir -p %(downloads)s/openoffice-src') - self.system ('cd %(builddir)s && ln %(downloads)s/openoffice-src/* src || :') - self.system ('cd %(builddir)s && ./download') - self.system ('cd %(builddir)s && ln src/* %(downloads)s/openoffice-src || :') - @context.subst_method - def bran (self): - return 'ooo' - @context.subst_method - def ver (self): - return '310' - @context.subst_method - def milestone (self): - return 'm8' - @context.subst_method - def cvs_tag (self): - return '%(bran)s%(ver)s-%(milestone)s' - @context.subst_method - def upstream_dir (self): - return '%(builddir)s/build/%(cvs_tag)s' - @context.subst_method - def LD_LIBRARY_PATH (self): - return '%(tools_prefix)s/lib' + misc.append_path (os.environ.get ('LD_LIBRARY_PATH', '')) - def autoupdate (self): - self.system ('cd %(srcdir)s && NOCONFIGURE=1 ./autogen.sh --noconfigure') - def make_unpack (self): - # FIXME: python detection is utterly broken, should use python-config - self.system ('cd %(builddir)s && make unpack') - self.system ('cd %(builddir)s && make patch.apply') - def apply_upstream_patch (self, name, strip_component=0): - patch_strip_component = str (strip_component) - self.system (''' -cd %(builddir)s/build/%(cvs_tag)s && patch -p%(patch_strip_component)s < %(patchdir)s/%(name)s -''', locals ()) - def upstream_patched_files (self): - def files_in_patch (patch): - string = file (self.expand ('%(patchdir)s/%(patch)s', locals ())).read () - def file_name (chunk): - if chunk.find ('\n+++ ') >= 0: - return re.search ('\n[+]{3}\s+([.]/)?([^\s]+)', chunk).group (2) - return '' - return list (map (file_name, ('\n' + string).split ('\n---')[1:])) - files_with_patches = list (map (files_in_patch, self.upstream_patches)) - return reduce (operator.__add__, files_with_patches) - def upstream_patch_reset (self): - upstream_dir = self.upstream_dir () - for f in self.upstream_patched_files (): - self.system ('cp -p %(upstream_dir)s/%(f)s %(upstream_dir)s/%(f)s.patched' % locals ()) - self.system ('cp -p %(upstream_dir)s/%(f)s.pristine %(upstream_dir)s/%(f)s || cp -p %(upstream_dir)s/%(f)s %(upstream_dir)s/%(f)s.pristine' % locals ()) - def upstream_patched_unchanged_preserve_mtime (self): - upstream_dir = self.upstream_dir () - for f in self.upstream_patched_files (): - self.system ('cmp %(upstream_dir)s/%(f)s.patched %(upstream_dir)s/%(f)s && cp -p %(upstream_dir)s/%(f)s.patched %(upstream_dir)s/%(f)s || true' % locals ()) - def patch_upstream (self): - # config_office is gone? but avoid rewriting everything for - # now -- how's upstream? - self.system ('cd %(upstream_dir)s && rm -f config_office && ln -s . config_office') - self.upstream_patch_reset () - list (map (self.apply_upstream_patch, self.upstream_patches)) - self.upstream_patched_unchanged_preserve_mtime () - - # configure blindly adds /usr includes, even when not necessary - self.system ('sed -i -e "s@=/usr/include@=%(system_prefix)s/include@" %(upstream_dir)s/config_office/configure.in') - - # configure.in uses AC_CHECK_FILE, which simply assert-fails - # when cross compiling slated for removal in ~2000 - # http://www.mail-archive.com/autoconf@gnu.org/msg02857.html - self.system ('sed -i -e "s@AC_CHECK_FILE(@AC_CHECK_FILE_CROSS(@" %(upstream_dir)s/config_office/configure.in') - - # TODO: ASM is handled in individual solenv/inc/*mk - self.system (misc.join_lines ('''sed -i.guborig --e 's@\@$(AR)@g' --e 's@\@$(DLLTOOL)@g' --e 's@\\([^-]\|$\)@$(LD)\\1@g' --e 's@\@$(NM)@g' --e 's@\@$(RANLIB)@g' --e 's@\@$(WINDRES)@g' -%(upstream_dir)s/solenv/inc/*mk''')) - - self.system ('chmod +x %(upstream_dir)s/solenv/bin/build.pl %(upstream_dir)s/solenv/bin/deliver.pl') - - have_wine = True - disable_modules = [ - 'bean', # com_sun_star_comp_beans_LocalOfficeWindow.c:39:18: error: jawt.h: No such file or directory - 'embedserv', # uses ATL http://article.gmane.org/gmane.comp.gnu.mingw.user/18483 - ] - disable_modules += ['testtools'] - # ~/.wine/system.reg - # "PATH"=str(2):"C:/windows/system32;C:/windows;z:/home/janneke/vc/gub/target/mingw/build/openoffice-trunk/build/ooo300-m9/solver/300/bin/wntgcci.pro/bin;z:/home/janneke/vc/gub/target/mingw/root/usr/bin;z:/home/janneke/vc/gub/target/mingw/root/usr/lib;" - wine_modules = [ - 'testtools', - 'goodies', - # Hmmm - # wine ../../../solver/300/wntgcci.pro/bin/regcomp.exe -register -r applicat.rdb -c i18npool.uno.dll - ] - - for module in disable_modules: - self.file_sub ([('(^[^#].*[ \t](all|n|w|w,vc[0-9])[ \t])', r'#\1')], '%(upstream_dir)s/%(module)s/prj/build.lst', env=locals ()) - - module = 'setup_native' - self.file_sub ([('^(pk.*customactions.*)', r'#\1')], '%(upstream_dir)s/%(module)s/prj/build.lst', env=locals ()) - - # uses oledb.h from psdk - module = 'connectivity' - self.file_sub ([(r'^([^#].*drivers.ado.*[ \t]w[ \t])', r'#\1')], '%(upstream_dir)s/%(module)s/prj/build.lst', env=locals ()) - - make_flags = misc.join_lines (''' -NASM=nasm -CC_FOR_BUILD=cc -CXX_FOR_BUILD=c++ -LDFLAGS_FOR_BUILD= -C_INCLUDE_PATH= -LIBRARY_PATH= -EXECPOST= -LD_LIBRARY_PATH=%(LD_LIBRARY_PATH)s -''') -##main configure barfs -##CPPFLAGS= - def install (self): - # build cppuhelper with debug -- try to squeeze more info out - # of the failing regcomp than - # terminate called after throwing an instance of 'com::sun::star::registry::CannotRegisterImplementationException' - # terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' - self.system (''' -cd %(upstream_dir)s/cppuhelper && rm -rf wntgcci.pro- -cd %(upstream_dir)s/cppuhelper && mv wntgcci.pro wntgcci.pro- -cd %(upstream_dir)s/cppuhelper && . ../*Env.Set.sh && perl $SOLARENV/bin/build.pl debug=true && perl $SOLARENV/bin/deliver.pl -''') - regcomp_just_do_not_fail = True - if regcomp_just_do_not_fail: - # Well, that does not help. Make non-failing regcomp wrapper... - self.system ('cd %(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin && mv regcomp.exe regcomp-bin.exe') - self.dump ('''#! /bin/sh -%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin/regcomp-bin.exe "$@" -exit 0 -''', - '%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin/regcomp.exe', - permissions=octal.o755) - target.AutoBuild.install (self) - self.system ('rm -f %(install_prefix)s/bin/soffice3.1') - if regcomp_just_do_not_fail: - self.system ('cd %(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin && mv regcomp-bin.exe regcomp.exe') - self.system ('cd "%(install_prefix)s/lib/ooo-3.1/OpenOffice.org 3" && /bin/tar -xzvf %(downloads)s/rdb/rdb.tar.gz || true') - -class OpenOffice__mingw (OpenOffice): - upstream_patches = OpenOffice.upstream_patches + [ - 'openoffice-config_office-mingw.patch', - 'openoffice-solenv-mingw.patch', - 'openoffice-sal-mingw.patch', - 'openoffice-external-mingwheaders.patch', - 'openoffice-cppunit-mingw.patch', - 'openoffice-cppuhelper-mingw.patch', - 'openoffice-i18npool-mingw.patch', - 'openoffice-tools-mingw.patch', - 'openoffice-setup_native-mingw.patch', - 'openoffice-pyuno-mingw.patch', - 'openoffice-sysui-mingw.patch', - 'openoffice-dtrans-mingw.patch', - 'openoffice-fpicker-mingw.patch', - 'openoffice-sccomp-mingw.patch', - 'openoffice-vcl-mingw.patch', - 'openoffice-connectivity-mingw.patch', - 'openoffice-unotools-mingw.patch', - 'openoffice-goodies-mingw.patch', - 'openoffice-embeddedobj-mingw.patch', - 'openoffice-shell-mingw.patch', - 'openoffice-svx-mingw.patch', - 'openoffice-dbaccess-mingw.patch', - 'openoffice-desktop-mingw.patch', - 'openoffice-vbahelper-mingw.patch', - 'openoffice-scripting-mingw.patch', - 'openoffice-postprocess-mingw.patch', - 'openoffice-instsetoo_native-mingw.patch', - 'openoffice-solenv-mingw-installer.patch', - 'openoffice-scp2-mingw.patch', - 'openoffice-helpcontent2-mingw.patch', - ] - # I do not understand external/mingwheaders. It patches header - # files and is thus strictly tied to a gcc version; that can never - # build. How can patching header files ever work, when not - # patching the corresponding libraries? Some patches remove - # #ifdef checks that can be enabled by setting a #define. Other - # patches only affect OO.o client code already inside __MINGW32__ - # defines. Why not fix OO.o makefiles and client code? - upstream_patches += ['openoffice-sal-mingw-c.patch'] - # Kendy's MinGW patches are already applied - kendy = [ - 'openoffice-transex3-mingw.patch', - 'openoffice-soltools-mingw.patch' - ] - dependencies = (OpenOffice.dependencies - + [ - 'libunicows-devel', - 'tools::pytt' - ]) - def patch (self): - self.system ('cd %(srcdir)s && git clean -f') - self.system ('cd %(srcdir)s && rm -f patches/dev300/layout-simple-dialogs-svx-no-gtk.diff') - OpenOffice.patch (self) - # disable Kendy's patch for Cygwin version of mingw - self.file_sub ([('^(mingw-build-without-stlport-stlport.diff)', r'#\1'), - ('^(mingw-thread-wait-instead-of-sleep.diff)', r'#\1'), - ('^(redirect-extensions.diff)', r'#\1'), - ('^(slideshow-effect-rewind.diff)', r'#\1'), - ('^(layout-simple-dialogs-svx).diff', r'\1-no-gtk.diff')], - '%(srcdir)s/patches/dev300/apply') - # setup wine hack -- TODO: CC_FOR_BUILD + SAL_DLL* for - # cpputools/source/registercomponent/registercomponent.cxx - wine_userdef = os.path.join (os.environ['HOME'], '.wine/user.reg') - s = file (wine_userdef).read () -# if not self.expand ('%(upstream_dir)s/solver/%(ver)s') in s: - if not 'CPLD_ACCESSPATH' in s: - # Huh? > taking path: "file:///home/janneke/vc/gub/target/mingw/build/openoffice-anongit.freedesktop.org--git-ooo-build-ooo-build-/build/ooo310-m8/solver/310/wntgcci.pro/bin/canvasfactory.uno.dll" ...does not match given path "/home/janneke/vc/gub/target/mingw/build/openoffice-anongit.freedesktop.org--git-ooo-build-ooo-build-/build/ooo310-m8/solver/310/wntgcci.pro/bin/". - # Even more strange: someone's eaten the space, but the directories - # are the same!? > taking path: "file:///C:/ProgrammaBestanden/openoffice/usr/lib/ooo-3.1/OpenOffice.org/URE/bin/bootstrap.uno.dll" ...does not match given path "file:///C:/ProgrammaBestanden/openoffice/usr/lib/ooo-3.1/OpenOffice.org/URE/bin/". - #(14:06:06) erAck: janneke: 'jsc' or 'sb' may know details. Not in irc though. I suggest dev@udk mailing list. - self.dump (''' -[Environment] -"DISPLAY"="localhost:0.0" -"PATH"="%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin;%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/lib;%(system_prefix)s/bin;%(system_prefix)s/lib;Z:%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin;%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/lib;Z:%(system_prefix)s/bin;Z:%(system_prefix)s/lib;" -"CPLD_ACCESSPATH"="Z:%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin/;%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin/;.;C:/Programma Bestanden/openoffice/usr/lib/ooo-3.1/OpenOffice.org 3/Basis/program/;C:/Programma Bestanden/openoffice/usr/lib/ooo-3.1/OpenOffice.org 3/URE/bin;C:/Program Files/openoffice/usr/lib/ooo-3.1/OpenOffice.org 3/Basis/program/;C:/Program Files/openoffice/usr/lib/ooo-3.1/OpenOffice.org 3/URE/bin;%(install_prefix)s/bin/;%(install_prefix)s/lib/;%(system_prefix)s/bin/;%(system_prefix)s/lib/;Z:%(install_prefix)s/bin/;Z:%(install_prefix)s/lib/;Z:%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/bin/;Z:%(upstream_dir)s/solver/%(ver)s/wntgcci.pro/lib/;Z:%(system_prefix)s/lib/;Z:%(system_prefix)s/lib/" -''', - wine_userdef, mode='a') - openoffice_configure_flags = (OpenOffice.openoffice_configure_flags - .replace ('--with-system-xrender-headers', '') - + ' --disable-xrender-link' - + ' --with-distro=Win32') - def patch_upstream (self): - self.system ('chmod -R ugo+w %(upstream_dir)s/dtrans %(upstream_dir)s/fpicker %(upstream_dir)s/dbaccess') - OpenOffice.patch_upstream (self) - # avoid juggling of names for windows-nt - self.system ('sed -i -e "s@WINNT@WNT@" %(upstream_dir)s/config_office/configure.in') - self.file_sub ([ - ('( [.](type|size))', r'//\1'), - ('( [.]note.*)', ''), - ('(,@.*)', '')], - '%(upstream_dir)s/bridges/source/cpp_uno/mingw_intel/call.s') - - self.system ('chmod +x %(upstream_dir)s/solenv/bin/addsym-mingw.sh') - - self.system ('cp -f %(upstream_dir)s/sal/osl/w32/MAKEFILE.MK %(upstream_dir)s/sal/osl/w32/makefile.mk') - - self.dump ('''\ -#! /bin/sh -set -e -in=$(eval echo '$'$#) -dir=$(dirname $in) -/usr/bin/wrc "$@" -if test "$dir" != "." -a -e $(basename $in .rc).res; then - mv $(basename $in .rc).res $dir -fi -''', - '%(upstream_dir)s/solenv/bin/wrc', - permissions=octal.o755) - self.system ('mkdir -p %(upstream_dir)s/solver/%(ver)s/wntgcci.pro/inc') - self.system ('cp -pv %(sourcefiledir)s/mingw-headers/*.h %(upstream_dir)s/solver/%(ver)s/wntgcci.pro/inc') - - -# Build a `tiny fraction' of openoffice for essential native binary -# build tools. - -# The dependencies for some OO.o build tools are rather crude, the -# whole module (eg: shell, svtools) the tool is built in may depend on -# toolkit/vcl, but tool itself (eg: langconvex.EXE, HelpLinker) really -# doesn't? I may hope... - -# Build tools provided by OpenOffice__tools - -# MODULE --> BINARY TOOL: TOOL's MODULE[, DEPENDENCIES] -# */pyuno --> regcomp: cpputools -# * --> gen_makefile: sal -# sccomp --> rsc: rsc -# sfx2 --> svidl: idl -# udkapi --> idlc: idlc, registry -# udkapi --> regmerge: cpputools -# officecfg --> cfgex: transex3 -# scp2 --> ulfconv: setup_native -# i18npool --> gendict: i18npool - -# Build tools not yet provided by OpenOffice__tools [expensive] - -# MODULE --> BINARY TOOL: TOOL's MODULE[, DEPENDENCIES] -# regcomp --windows: a cross unix regcomp that registers .DLLs -# shell --> lngconvex.EXE: shell (but: huh, windows only?), VCL -# helpcontent2 --> HelpLinker: svtools, VCL - -module_deps = { - 'cpputools' : ['salhelper', 'cppuhelper', 'cppu'], - 'salhelper' : ['sal'], - 'cppuhelper' : ['codemaker', 'cppu', 'offuh'], - 'codemaker' : ['udkapi'], - 'offuh' : ['offapi'], - 'generic_build' : ['dmake', 'solenv'], - 'udkapi' : ['idlc'], - 'idlc' : ['registry'], - 'sal' : ['xml2cmp'], - 'registry' : ['store'], - 'xml2cmp' : ['soltools', 'stlport'], - 'tools' : ['vos', 'basegfx', 'comphelper', 'i18npool'], - 'transex3' : ['tools'], - 'i18npool' : ['bridges', 'sax', 'stoc', 'comphelper', 'i18nutil', 'regexp'], - 'basegfx' : ['o3tl', 'sal', 'offuh', 'cppuhelper', 'cppu'], - 'comphelper' : ['cppuhelper', 'ucbhelper', 'offuh', 'vos', 'salhelper'], - 'stoc' : ['rdbmaker', 'cppuhelper', 'cppu', - #'jvmaccess', - 'sal', 'salhelper'], - 'icc' : ['solenv'], - 'pyuno': ['stoc', 'cpputools', 'cppuhelper', 'bridges', 'tools'], - 'rsc': ['tools'], - 'setup_native': ['soltools', 'xml2cmp', 'sal', 'officecfg', 'unoil'], - 'unoil': ['offapi', 'ridljar', 'solenv', 'cli_ure'], - - # This is getting ridiculous, we need a graphical toolkit, almost - # all of office for getting at a HelpLinker tool? - 'xmlhelp': ['ucbhelper', 'unoil', 'svtools', 'unotools', - #'javaunohelper' - ], - 'svtools': ['vcl'], # try minimal... - 'unotools': ['comphelper', 'cppuhelper', 'offuh', 'tools', 'ucbhelper'], - 'vcl': ['psprint', 'rsc', 'sot', 'ucbhelper', 'unotools', 'i18npool', 'i18nutil', 'unoil', 'ridljar', 'offuh', 'basegfx', 'tools', 'transex3', 'icc'], - 'idl': ['tools'], - } - -def ooo_deps (deps): - lst = deps[:] - for d in deps: - lst += ooo_deps (module_deps.get (d, [])) - return lst - -class OpenOffice__tools (tools.AutoBuild, OpenOffice): - source = 'svn://svn@svn.services.openoffice.org/&module=ooo&branch=tags/OOO310_m8&depth=files' - patches = [ - 'openoffice-o3tl-no-cppunit.patch', - 'openoffice-basegfx-no-cppunit.patch', - 'openoffice-store-core.patch', - 'openoffice-store-registry.patch', - 'openoffice-funit-char-line.patch', -# 'openoffice-svtools-minimal.patch', - ] - generic_build = ['dmake', 'solenv', 'pyuno'] - regcomp = 'cpputools' - gen_makefile = 'sal' - svidl = 'idl' - ulfconv = 'setup_native' - gendict = 'i18npool' - tool_modules = ['icc', regcomp, gen_makefile, 'transex3', 'rsc', ulfconv, 'idl', gendict] - toplevel_modules = generic_build + tool_modules - modules = misc.uniq (ooo_deps (toplevel_modules)) - def __init__ (self, settings, source): - tools.AutoBuild.__init__ (self, settings, source) - # Let's keep source tree around - def tracking (self): - return True - self.source.is_tracking = misc.bind_method (tracking, self.source) - self.source.dir = self.settings.downloads + '/openoffice-tools' - if not os.path.isdir (self.source.dir): - os.system ('mkdir -p ' + self.source.dir) - dependencies = [ - 'boost', - 'db', - 'expat', - 'libicu', - 'libxslt', - 'python', - 'zlib', - ] - def stages (self): - return tools.AutoBuild.stages (self) - def autoupdate (self): - tools.AutoBuild.autoupdate (self) - def module_repo (self, module): - repo = repository.get_repository_proxy (self.settings.downloads + '/openoffice-tools', - OpenOffice__tools.source.replace ('depth=files', 'branchmodule=' + module)) - def tracking (self): - return True - repo.is_tracking = misc.bind_method (tracking, repo) - return repo - def download_module (self, module): - self.module_repo (module).download () - def download (self): - tools.AutoBuild.download (self) - list (map (self.download_module, self.modules)) - def untar_module (self, module): - def defer (logger): - self.module_repo (module).update_workdir (self.expand ('%(srcdir)s/' + module)) - self.func (defer) - def untar (self): - tools.AutoBuild.untar (self) - list (map (self.untar_module, self.modules)) - @context.subst_method - def ver (self): - return '310' - def patch (self): - OpenOffice.patch (self) - # Make a handy fake toplevel GUB module to build everything. - self.system ('''mkdir -p %(srcdir)s/gub/prj''') - tool_modules_str = ' '.join (self.tool_modules) - toplevel_modules_str = ' '.join (self.toplevel_modules) - self.dump ('''gub gub : %(toplevel_modules_str)s NULL''', '%(srcdir)s/gub/prj/build.lst', env=locals ()) - self.dump (''' -.PHONY: all install -DESTDIR= -prefix=@prefix@ -bin=solver/%(ver)s/unxlngx*.pro/bin -lib=solver/%(ver)s/unxlngx*.pro/lib -out=unxlngx*.pro -tool_modules = %(tool_modules_str)s - -all: - . ./*Env.Set.sh && ./bootstrap && (cd gub && ../solenv/bin/build.pl --all) -install: - $(foreach m,$(tool_modules),cp -pv $(m)/$(out)/bin/* $(bin) &&) true - install -d $(DESTDIR)$(prefix) - rm -rf $(bin)/ure $(bin)/install $(bin)/uninstall - cp -prv $(bin) $(DESTDIR)$(prefix) - cp -prv $(lib) $(DESTDIR)$(prefix) -''', '%(srcdir)s/Makefile.in', env=locals ()) - configure_command = ('x_libraries=no_x_libraries x_includes=no_x_includes ' - + OpenOffice.configure_command) - openoffice_configure_flags = ( - re.sub ('--with-system-[^ ]*', '', - OpenOffice.openoffice_configure_flags) - .replace ('--disable-crypt-link', '--enable-crypt-link') - + ' --with-system-db ' - + ' --with-system-expat ' - + ' --with-system-icu ' - + ' --with-system-libxml ' - + ' --with-system-python ' - + ' --with-system-zlib ' - + ' --with-x=no') - def configure (self): - self.shadow_tree ('%(srcdir)s', '%(builddir)s', soft=True) - tools.AutoBuild.configure (self) - # OO.o's configure script manages to ignore CFLAGS/LDFLAGS but - # will happily add -L/usr/lib nonsense. - def add_CFLAGS_LDFLAGS_already (logger, file): - loggedos.file_sub (logger, [ - ('-L(NONE|no_x_libraries|/usr/lib)', self.expand ('-L%(system_prefix)s/lib')), - ('-I(NONE|no_x_includes|/usr/include)', self.expand ('-I%(system_prefix)s/include')), - ('(LD_LIBRARY_PATH=.*)', self.expand (r'\1:%(system_prefix)s/lib')) - ], file) - self.map_locate (add_CFLAGS_LDFLAGS_already, '%(builddir)s', '*Env.Set.sh') - -Openoffice = OpenOffice -Openoffice__mingw = OpenOffice__mingw -Openoffice__tools = OpenOffice__tools - - - -''' -Module 'solenv' delivered successfully. 0 files copied, 1 files unchanged -Module 'stlport' delivered successfully. 0 files copied, 8 files unchanged -Module 'soltools' delivered successfully. 0 files copied, 14 files unchanged -Module 'external' delivered successfully. 0 files copied, 30 files unchanged -Module 'libwpd' delivered successfully. 0 files copied, 12 files unchanged -Module 'xml2cmp' delivered successfully. 0 files copied, 5 files unchanged -Module 'sal' delivered successfully. 11 files copied, 99 files unchanged -Module 'vos' delivered successfully. 0 files copied, 31 files unchanged -Module 'sandbox' delivered successfully. 0 files copied, 2 files unchanged -Module 'afms' delivered successfully. 0 files copied, 2 files unchanged -Module 'beanshell' delivered successfully. 0 files copied, 2 files unchanged -Module 'cppunit' delivered successfully. 4 files copied, 65 files unchanged -Module 'testshl2' delivered successfully. 0 files copied, 12 files unchanged -Module 'salhelper' delivered successfully. 0 files copied, 12 files unchanged -Module 'extras' delivered successfully. 0 files copied, 70 files unchanged -Module 'fondu' delivered successfully. 0 files copied, 2 files unchanged -Module 'hsqldb' delivered successfully. 0 files copied, 2 files unchanged -Module 'hunspell' delivered successfully. 0 files copied, 15 files unchanged -Module 'hyphen' delivered successfully. 0 files copied, 5 files unchanged -Module 'icc' delivered successfully. 0 files copied, 2 files unchanged -Module 'libtextcat' delivered successfully. 0 files copied, 81 files unchanged -Module 'libwpg' delivered successfully. 0 files copied, 16 files unchanged -Module 'libwps' delivered successfully. 0 files copied, 6 files unchanged -Module 'libxmlsec' delivered successfully. 0 files copied, 1 files unchanged -Module 'lucene' delivered successfully. 0 files copied, 1 files unchanged -Module 'np_sdk' delivered successfully. 0 files copied, 9 files unchanged -Module 'o3tl' delivered successfully. 0 files copied, 5 files unchanged -Module 'psprint_config' delivered successfully. 0 files copied, 1 files unchanged -Module 'rhino' delivered successfully. 0 files copied, 2 files unchanged -Module 'sane' delivered successfully. 0 files copied, 2 files unchanged -Module 'store' delivered successfully. 0 files copied, 8 files unchanged -Module 'registry' delivered successfully. 0 files copied, 23 files unchanged -Module 'idlc' delivered successfully. 0 files copied, 7 files unchanged -Module 'udkapi' delivered successfully. 1 files copied, 417 files unchanged -Module 'offapi' delivered successfully. 3 files copied, 3518 files unchanged -Module 'codemaker' delivered successfully. 0 files copied, 23 files unchanged -Module 'offuh' delivered successfully. 0 files copied, 5518 files unchanged -Module 'cppu' delivered successfully. 0 files copied, 47 files unchanged -Module 'cppuhelper' delivered successfully. 0 files copied, 65 files unchanged -Module 'rdbmaker' delivered successfully. 0 files copied, 4 files unchanged -Module 'ucbhelper' delivered successfully. 0 files copied, 35 files unchanged -Module 'comphelper' delivered successfully. 0 files copied, 107 files unchanged -Module 'basegfx' delivered successfully. 4 files copied, 65 files unchanged -Module 'ridljar' delivered successfully. 0 files copied, 5 files unchanged -Module 'jurt' delivered successfully. 0 files copied, 4 files unchanged -Module 'jvmaccess' delivered successfully. 0 files copied, 6 files unchanged -Module 'bridges' delivered successfully. 1 files copied, 9 files unchanged -Module 'jvmfwk' delivered successfully. 0 files copied, 15 files unchanged -Module 'stoc' delivered successfully. 0 files copied, 28 files unchanged -Module 'cli_ure' delivered successfully. 0 files copied, 6 files unchanged -Module 'unoil' delivered successfully. 0 files copied, 5 files unchanged -Module 'javaunohelper' delivered successfully. 0 files copied, 3 files unchanged -Module 'cpputools' delivered successfully. 0 files copied, 13 files unchanged -Module 'oovbaapi' delivered successfully. 0 files copied, 2 files unchanged -Module 'sax' delivered successfully. 2 files copied, 7 files unchanged -Module 'animations' delivered successfully. 0 files copied, 5 files unchanged -Module 'i18nutil' delivered successfully. 0 files copied, 8 files unchanged -Module 'io' delivered successfully. 0 files copied, 12 files unchanged -Module 'jut' delivered successfully. 0 files copied, 3 files unchanged -Module 'remotebridges' delivered successfully. 0 files copied, 17 files unchanged -Module 'bean' delivered successfully. 0 files copied, 4 files unchanged -Module 'embedserv' delivered successfully. 0 files copied, 1 files unchanged -Module 'eventattacher' delivered successfully. 0 files copied, 2 files unchanged -Module 'hwpfilter' delivered successfully. 0 files copied, 4 files unchanged -Module 'package' delivered successfully. 0 files copied, 6 files unchanged -Module 'regexp' delivered successfully. 0 files copied, 4 files unchanged -Module 'i18npool' delivered successfully. 1 files copied, 40 files unchanged -Module 'tools' delivered successfully. 14 files copied, 92 files unchanged -Module 'unotools' delivered successfully. 3 files copied, 44 files unchanged -Module 'transex3' delivered successfully. 11 files copied, 22 files unchanged -Module 'sot' delivered successfully. 4 files copied, 17 files unchanged -Module 'fileaccess' delivered successfully. 1 files copied, 3 files unchanged -Module 'officecfg' delivered successfully. 1 files copied, 224 files unchanged -Module 'setup_native' delivered successfully. 1 files copied, 57 files unchanged -Module 'rsc' delivered successfully. 2 files copied, 6 files unchanged -Module 'oox' delivered successfully. 1 files copied, 8 files unchanged -Module 'psprint' delivered successfully. 0 files copied, 14 files unchanged -Module 'pyuno' delivered successfully. 0 files copied, 21 files unchanged -Module 'sysui' delivered successfully. 4 files copied, 128 files unchanged -Module 'UnoControls' delivered successfully. 1 files copied, 1 files unchanged -Module 'dtrans' delivered successfully. 3 files copied, 9 files unchanged -Module 'idl' delivered successfully. 1 files copied, 2 files unchanged -Module 'readlicense_oo' delivered successfully. 0 files copied, 12 files unchanged -Module 'sccomp' delivered successfully. 1 files copied, 3 files unchanged -Module 'scp2' delivered successfully. 9 files copied, 82 files unchanged -Module 'testtools' delivered successfully. 0 files copied, 1 files unchanged -Module 'twain' delivered successfully. 0 files copied, 2 files unchanged -Module 'unodevtools' delivered successfully. 0 files copied, 4 files unchanged -Module 'unoxml' delivered successfully. 0 files copied, 3 files unchanged -Module 'ure' delivered successfully. 0 files copied, 9 files unchanged -Module 'vigra' delivered successfully. 0 files copied, 83 files unchanged -Module 'basebmp' delivered successfully. 2 files copied, 35 files unchanged -Module 'wizards' delivered successfully. 0 files copied, 27 files unchanged -Module 'x11_extensions' delivered successfully. 0 files copied, 7 files unchanged -Module 'vcl' delivered successfully. 3 files copied, 140 files unchanged -Module 'toolkit' delivered successfully. 2 files copied, 55 files unchanged -Module 'svtools' delivered successfully. 15 files copied, 300 files unchanged -Module 'uui' delivered successfully. 2 files copied, 4 files unchanged -Module 'goodies' delivered successfully. 27 files copied, 62 files unchanged -Module 'xmloff' delivered successfully. 3 files copied, 124 files unchanged -Module 'ucb' delivered successfully. 0 files copied, 35 files unchanged -Module 'canvas' delivered successfully. 5 files copied, 39 files unchanged -Module 'configmgr' delivered successfully. 0 files copied, 9 files unchanged -Module 'connectivity' delivered successfully. 11 files copied, 71 files unchanged -Module 'xmlscript' delivered successfully. 0 files copied, 12 files unchanged -Module 'fpicker' delivered successfully. 5 files copied, 7 files unchanged -Module 'framework' delivered successfully. 6 files copied, 35 files unchanged -Module 'xmlhelp' delivered successfully. 0 files copied, 10 files unchanged -Module 'accessibility' delivered successfully. 1 files copied, 5 files unchanged -Module 'cppcanvas' delivered successfully. 2 files copied, 15 files unchanged -Module 'embeddedobj' delivered successfully. 0 files copied, 5 files unchanged -Module 'helpcontent2' delivered successfully. 1 files copied, 12 files unchanged -Module 'padmin' delivered successfully. 0 files copied, 4 files unchanged -Module 'scaddins' delivered successfully. 2 files copied, 5 files unchanged -Module 'shell' delivered successfully. 4 files copied, 24 files unchanged -Module 'sj2' delivered successfully. 3 files copied, 3 files unchanged -Module 'basic' delivered successfully. 7 files copied, 45 files unchanged -Module 'sfx2' delivered successfully. 4 files copied, 119 files unchanged -Module 'avmedia' delivered successfully. 2 files copied, 9 files unchanged -Module 'linguistic' delivered successfully. 2 files copied, 11 files unchanged -Module 'svx' delivered successfully. 5 files copied, 637 files unchanged -Module 'dbaccess' delivered successfully. 8 files copied, 62 files unchanged -Module 'automation' delivered successfully. 8 files copied, 12 files unchanged -Module 'basctl' delivered successfully. 1 files copied, 17 files unchanged -Module 'chart2' delivered successfully. 4 files copied, 8 files unchanged -Module 'desktop' delivered successfully. 15 files copied, 85 files unchanged -Module 'extensions' delivered successfully. 12 files copied, 35 files unchanged -Module 'filter' delivered successfully. 9 files copied, 110 files unchanged -Module 'forms' delivered successfully. 1 files copied, 4 files unchanged -Module 'lingucomponent' delivered successfully. 8 files copied, 5 files unchanged -Module 'lotuswordpro' delivered successfully. 1 files copied, 1 files unchanged -Module 'reportdesign' delivered successfully. 3 files copied, 28 files unchanged -Module 'sc' delivered successfully. 4 files copied, 172 files unchanged -Module 'scripting' delivered successfully. 5 files copied, 13 files unchanged -Module 'sd' delivered successfully. 5 files copied, 173 files unchanged -Module 'slideshow' delivered successfully. 2 files copied, 4 files unchanged -Module 'starmath' delivered successfully. 2 files copied, 14 files unchanged -Module 'writerfilter' delivered successfully. 1 files copied, 5 files unchanged -Module 'writerperfect' delivered successfully. 3 files copied, 1 files unchanged -Module 'sw' delivered successfully. 3 files copied, 260 files unchanged -Module 'xmerge' delivered successfully. 0 files copied, 12 files unchanged -Module 'xmlsecurity' delivered successfully. 0 files copied, 7 files unchanged -checkdeliver.pl - checking delivered binaries -Module 'postprocess' delivered successfully. 0 files copied, 2 files unchanged -Module 'packimages' delivered successfully. 6 files copied, 2 files unchanged -145 - -Build succeeded ...! -touch stamp/build - -... creating preregistered services.rdb ... - -************************************************** -ERROR: ERROR: Could not register all components for file services.rdb (gid_Starr -egistry_Services_Rdb)! -in function: create_services_rdb -************************************************** - -************************************************** -ERROR: Saved logfile: /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/b -uild/ooo300-m9/instsetoo_native/util/OpenOffice//logging/en-US/log_OOO300_en-US. -log -************************************************** -... cleaning the output tree ... -... removing directory /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/ -build/ooo300-m9/instsetoo_native/util/OpenOffice//zip/en-US ... -... removing directory /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/ -build/ooo300-m9/instsetoo_native/util/OpenOffice//gid_Starregistry_Services_Rdb_ -servicesrdb/en-US_witherror_1 ... -Thu Feb 19 14:30:56 2009 (01:23 min.) -Failed to install: at ./ooinstall line 143. -make: *** [install] Error 1 - -And the logs say - - terminate called after throwing an instance of 'com::sun::star::registry::CannotRegisterImplementationException' - terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' - -Saved logs at: - - http://lilypond.org/~janneke/software/ooo/gub-mingw/ - -''' diff --git a/gub/specs/raptor.py b/gub/specs/raptor.py deleted file mode 100644 index ed2aaf564..000000000 --- a/gub/specs/raptor.py +++ /dev/null @@ -1,40 +0,0 @@ -from gub import commands -from gub import misc -from gub import target - -class Raptor (target.AutoBuild): - source = 'http://download.librdf.org/source/raptor-1.4.18.tar.gz' - patches = ['raptor-1.4.18-cross.patch'] - dependencies = ['curl-devel', 'expat-devel', 'libxml2-devel', 'libxslt-devel', 'tools::flex', 'tools::autoconf', 'tools::automake', 'tools::libtool', 'tools::gtk_doc'] - config_cache_overrides = target.AutoBuild.config_cache_overrides + ''' -ac_cv_vsnprint_result_c99=1 -ac_cv_libxmlparse_xml_parsercreate=no -ac_cv_expat_xml_parsercreate=yes -ac_cv_expat_initial_utf8_bom=yes -''' - configure_flags = (target.AutoBuild.configure_flags - + misc.join_lines (''' ---enable-maintainer-mode -''')) - def autoupdate (self): - self.file_sub ([('( |-I|-L)/usr', r'\1%(system_prefix)s')] - , '%(srcdir)s/configure.ac') - self.runner._execute (commands.ForcedAutogenMagic (self)) - def config_script (self): - return 'raptor-config' - -class Raptor__mingw (Raptor): -# return '''CFLAGS='-Dstrtok_r\(s,d,p\)=strtok\(s,d\)' ''' - make_flags = '''CFLAGS="-D'strtok_r(s,d,p)=strtok(s,d)'" ''' - configure_flags = (target.AutoBuild.configure_flags - + misc.join_lines (''' ---enable-maintainer-mode ---enable-parsers="grddl rdfxml ntriples turtle trig guess rss-tag-soup rdfa n3" -''')) -#--enable-parsers="grddl rdfxml ntriples turtle trig guess rss-tag-soup rdfa n3" - -class Raptor__darwin (Raptor): - dependencies = [x for x in Raptor.dependencies - if x.replace ('-devel', '') not in [ - 'libxml2', # Included in darwin-sdk, hmm? - ]] diff --git a/gub/specs/rasqal.py b/gub/specs/rasqal.py deleted file mode 100644 index fa628d958..000000000 --- a/gub/specs/rasqal.py +++ /dev/null @@ -1,10 +0,0 @@ -from gub import target - -class Rasqal (target.AutoBuild): - source = 'http://download.librdf.org/source/rasqal-0.9.16.tar.gz' - dependencies = ['raptor-devel', 'libpcre-devel'] - def config_script (self): - return 'rasqal-config' - -class Rasqal__mingw (Rasqal): - patches = ['rasqal-0.9.16-mingw.patch'] diff --git a/gub/specs/rebase.py b/gub/specs/rebase.py deleted file mode 100644 index a00ef39b0..000000000 --- a/gub/specs/rebase.py +++ /dev/null @@ -1,43 +0,0 @@ -import os -# -from gub import misc -from gub import tools - -class Rebase__tools (tools.MakeBuild): - source = 'http://www.tishler.net/jason/software/rebase/rebase-2.4.2-1-src.tar.bz2' - patches = ['rebase-2.4.2-1.patch'] - dependencies = ['mingw::cross/gcc'] - def patch (self): - self.system ('dos2unix %(srcdir)s/imagehelper/*') - tools.MakeBuild.patch (self) - make_flags = misc.join_lines (''' -CC=i686-mingw32-gcc -CXX=i686-mingw32-g++ -AR=i686-mingw32-ar -LIBRESTRICT_ALLOW=%(targetdir)s:${LIBRESTRICT_ALLOW-/foo} -PREFIX=%(system_prefix)s -''') - # C&P from nsis. Should move to mingw. - def add_mingw_env (self): - # Do not use 'root', 'usr', 'cross', rather use from settings, - # that enables changing system root, prefix, etc. - mingw_dir = (self.settings.alltargetdir + '/mingw' - + self.settings.root_dir) - mingw_bin = (mingw_dir - + self.settings.prefix_dir - + self.settings.cross_dir - + '/bin') - tools_dir = (self.settings.alltargetdir + '/tools' - + self.settings.root_dir) - tools_bin = (tools_dir - + self.settings.prefix_dir - + '/bin') - return {'PATH': mingw_bin + ':' + tools_bin + ':' + os.environ['PATH'] } - def build_environment (self): - return self.add_mingw_env () - def compile (self): - self.system ('cd %(builddir)s && %(compile_command)s', - self.build_environment ()) - def install (self): - self.system ('cd %(builddir)s && %(install_command)s ', - self.build_environment ()) diff --git a/gub/specs/redland.py b/gub/specs/redland.py deleted file mode 100644 index d18629d54..000000000 --- a/gub/specs/redland.py +++ /dev/null @@ -1,49 +0,0 @@ -from gub import misc -from gub import target - -class Redland (target.AutoBuild): - source = 'http://download.librdf.org/source/redland-1.0.8.tar.gz' - dependencies = ['rasqal-devel', 'sqlite-devel'] - configure_flags = (target.AutoBuild.configure_flags - + misc.join_lines (''' - --without-mysql - --without-postgresql -''')) - def config_script (self): - return 'redland-config' - -class Redland__mingw (Redland): - patches = ['redland-1.0.8-mingw.patch'] - def patch (self): - Redland.patch (self) - self.file_sub ([ - ('#define HAVE_BDB_HASH 1', '/* undef HAVE_BDB_HASH */'), - ('#define HAVE_MYSQL 1', '/* undef HAVE_MYSQL */'), - ('#define STORAGE_MYSQL 1', '/* undef STORAGE_MYSQL */'), - ], '%(srcdir)s/librdf/win32_rdf_config.h') - ''' -i686-mingw32-gcc -mwindows -mms-bitfields -DLIBRDF_INTERNAL=1 -g -O2 -DLIBRDF_INTERNAL=1 -g -O2 -o .libs/redland-db-upgrade.exe db_upgrade.o -L/home/janneke/vc/gub/target/mingw/root/usr/lib -L/home/janneke/vc/gub/target/mingw/root/usr/bin -L/home/janneke/vc/gub/target/mingw/root/usr/lib/w32api ../librdf/.libs/librdf.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/librasqal.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libpcre.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libgmp.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libraptor.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libcurl.dll.a -lwldap32 /home/janneke/vc/gub/target/mingw/root/usr/lib/libxslt.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libxml2.dll.a -lws2_32 /home/janneke/vc/gub/target/mingw/root/usr/lib/libsqlite3.dll.a -L/home/janneke/vc/gub/target/mingw/root/usr/lib -db_upgrade.o: In function `main': -/home/janneke/vc/gub/target/mingw/src/redland-1.0.8/utils/db_upgrade.c:59: undefined reference to `_librdf_heuristic_gen_name' -collect2: ld returned 1 exit status -make[1]: *** [redland-db-upgrade.exe] Fout 1 -make[1]: *** Wachten op onvoltooide taken... -i686-mingw32-gcc -mwindows -mms-bitfields -DLIBRDF_INTERNAL=1 -g -O2 -DLIBRDF_INTERNAL=1 -g -O2 -o .libs/rdfproc.exe rdfproc.o -L/home/janneke/vc/gub/target/mingw/root/usr/lib -L/home/janneke/vc/gub/target/mingw/root/usr/bin -L/home/janneke/vc/gub/target/mingw/root/usr/lib/w32api ../librdf/.libs/librdf.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/librasqal.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libpcre.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libgmp.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libraptor.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libcurl.dll.a -lwldap32 /home/janneke/vc/gub/target/mingw/root/usr/lib/libxslt.dll.a /home/janneke/vc/gub/target/mingw/root/usr/lib/libxml2.dll.a -lws2_32 /home/janneke/vc/gub/target/mingw/root/usr/lib/libsqlite3.dll.a -L/home/janneke/vc/gub/target/mingw/root/usr/lib -Info: resolving _librdf_version_string by linking to __imp__librdf_version_string (auto-import) -Info: resolving _librdf_short_copyright_string by linking to __imp__librdf_short_copyright_string (auto-importrdfproc.o: In function `main': -/home/janneke/vc/gub/target/mingw/src/redland-1.0.8/utils/rdfproc.c:302: undefined reference to `_librdf_new_hash' -/home/janneke/vc/gub/target/mingw/src/redland-1.0.8/utils/rdfproc.c:303: undefined reference to `_librdf_hash_open' -/home/janneke/vc/gub/target/mingw/src/redland-1.0.8/utils/rdfproc.c:617: undefined reference to `_librdf_hash_from_string' -/home/janneke/vc/gub/target/mingw/src/redland-1.0.8/utils/rdfproc.c:447: undefined reference to `_librdf_get_storage_factory' -/home/janneke/vc/gub/target/mingw/src/redland-1.0.8/utils/rdfproc.c:1186: undefined reference to `_librdf_heuristic_is_blank_node' -/home/janneke/vc/gub/target/mingw/src/redland-1.0.8/utils/rdfproc.c:1187: undefined reference to `_librdf_heuristic_get_blank_node' -''' - self.file_sub ([('^(SUBDIRS =.*) utils ', r'\1 ')], - '%(srcdir)s/Makefile.am') - self.file_sub ([('^(SUBDIRS =.*) utils ', r'\1 ')], - '%(srcdir)s/Makefile.in') - configure_flags = (Redland.configure_flags - # without wsock32.dll, no libdb*.la/dll, no shared redland - + misc.join_lines (''' - --disable-shared -''')) diff --git a/gub/specs/saxon-java.py b/gub/specs/saxon-java.py deleted file mode 100644 index 080252b91..000000000 --- a/gub/specs/saxon-java.py +++ /dev/null @@ -1,16 +0,0 @@ -from gub import build - -class Saxon_java (build.BinaryBuild): - source = 'http://surfnet.dl.sourceforge.net/sourceforge/saxon/saxonb9-1-0-2j.zip' - def __init__ (self, settings, source): - build.BinaryBuild.__init__ (self, settings, source) - source._version = '9.1.0.2j' - def untar (self): - build.BinaryBuild.untar (self) - self.system (''' -cd %(srcdir)s && ln -f saxon9.jar saxon.jar -cd %(srcdir)s && mkdir -p usr/share/doc usr/share/java -cd %(srcdir)s && mv doc usr/share/doc/saxon -cd %(srcdir)s && mv notices usr/share/doc/saxon -cd %(srcdir)s && mv * usr/share/java || : -''') diff --git a/gub/specs/xerces-c.py b/gub/specs/xerces-c.py deleted file mode 100644 index eae3853fa..000000000 --- a/gub/specs/xerces-c.py +++ /dev/null @@ -1,53 +0,0 @@ -from gub import build -from gub import misc -from gub import target - -class Xerces_c (target.AutoBuild): - source = 'http://www.apache.org/dist/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz' - parallel_build_broken = True - config_cache_flag_broken = True - dependencies = ['tools::autoconf'] - autodir = '%(srcdir)s/src/xercesc' - def __init__ (self, settings, source): - target.AutoBuild.__init__ (self, settings, source) - self.compile_dict = { - 'XERCESCROOT': '%(builddir)s', - 'TRANSCODER': 'NATIVE', - 'MESSAGELOADER': 'INMEM', - 'NETACCESSOR': 'Socket', - 'THREADS': 'pthread', - 'BITSTOBUILD': '32', - 'LIBS': ' -lpthread ', - 'ALLLIBS': "${LIBS}", - 'CFLAGS': ' -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET ', - 'CXXFLAGS': ' -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET ', - } - build.change_dict (self, self.compile_dict) - s = '' - for i in list (self.compile_dict.keys ()): - s += ' ' + i + '="' + self.compile_dict[i] + '"' - self.make_flags = s - self.configure_command = (self.make_flags - + ' ' - + target.AutoBuild.configure_command) - def configure (self): - self.shadow () - self.config_cache () - self.system ('cd %(builddir)s/src/xercesc && %(configure_command)s') - def compile (self): - self.system ('cd %(builddir)s/src/xercesc && %(compile_command)s') - def install (self): - self.system ('cd %(builddir)s/src/xercesc && %(install_command)s') - -class Xerces_c__linux__arm__vfp (Xerces_c): - source = 'http://www.apache.org/dist/xerces/c/2/sources/xerces-c-src_2_6_0.tar.gz' - -class Xerces_c__mingw (Xerces_c): - source = 'http://www.apache.org/dist/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz' - def __init__ (self, settings, source): - Xerces_c.__init__ (self, settings, source) - self.compile_dict.update ({ - 'THREADS' : 'mthreads', - 'LIBS': '', - }) - build.change_dict (self, self.compile_dict) diff --git a/openoffice.make b/openoffice.make deleted file mode 100644 index cd820e775..000000000 --- a/openoffice.make +++ /dev/null @@ -1,42 +0,0 @@ -# -*-Makefile-*- -.PHONY: all default rest print-success -.PHONY: nsis openoffice openoffice-installers -default: all - -OPENOFFICE_BRANCH="" #master&revision=207309ec6d428c6a6698db061efb670b36d5df5a -OPENOFFICE_REPO_URL=git://anongit.freedesktop.org/git/ooo-build/ooo-build - -PLATFORMS=mingw - -# derived info -OPENOFFICE_SOURCE_URL=$(OPENOFFICE_REPO_URL)?branch=$(OPENOFFICE_BRANCH) -OPENOFFICE_DIRRED_BRANCH=$(shell $(PYTHON) gub/repository.py --branch-dir '$(OPENOFFICE_SOURCE_URL)') -OPENOFFICE_FLATTENED_BRANCH=$(shell $(PYTHON) gub/repository.py --full-branch-name '$(OPENOFFICE_SOURCE_URL)') -BUILD_PACKAGE='$(OPENOFFICE_SOURCE_URL)' -INSTALL_PACKAGE = openoffice - -MAKE += -f openoffice.make - -INSTALLER_BUILDER_OPTIONS =\ - --branch=ooo-build=$(OPENOFFICE_FLATTENED_BRANCH) - -include gub.make -include compilers.make - -#all: packages rest -all: openoffice rest -rest: nsis openoffice-installers print-success - -#avoid building native BUILD_PLATFORM -openoffice: - $(call INVOKE_GUB,$(PLATFORMS)) openoffice - -openoffice-installers: - $(call INVOKE_INSTALLER_BUILDER,$(PLATFORMS)) $(INSTALL_PACKAGE) - -nsis: - $(GUB) tools::nsis - -print-success: - @echo "success!!" - @echo OpenOffice installer in uploads/openoffice*.mingw.exe diff --git a/patches/libicu-3.8.1-cross-mingw.patch b/patches/libicu-3.8.1-cross-mingw.patch deleted file mode 100644 index 1f495d4b2..000000000 --- a/patches/libicu-3.8.1-cross-mingw.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- libicu-3.8.1/source/config/mh-mingw.orig 2008-10-19 11:55:51.000000000 +0200 -+++ libicu-3.8.1/source/config/mh-mingw 2008-10-19 11:53:41.000000000 +0200 -@@ -56,12 +56,12 @@ SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_V - - # Static library prefix and file extension - LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX) --A = lib -+A = a - - ## An import library is needed for z/OS and MSVC - #IMPORT_LIB_EXT = .lib - --LIBPREFIX= -+LIBPREFIX= lib - - # Change the stubnames so that poorly working FAT disks and installation programs can work. - # This is also for backwards compatibility. -@@ -72,10 +72,10 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICU - # The #M# is used to delete lines for icu-config - # Current full path directory. - #CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS --CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell -+CURR_FULL_DIR=$(shell pwd) - # Current full path directory for use in source code in a -D compiler option. - #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS --CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell -+CURR_SRCCODE_FULL_DIR=$(shell pwd) - - ## Compilation rules - %.$(STATIC_O): $(srcdir)/%.c diff --git a/patches/libicu-3.8.1-cross.patch b/patches/libicu-3.8.1-cross.patch deleted file mode 100644 index 4cc30ce52..000000000 --- a/patches/libicu-3.8.1-cross.patch +++ /dev/null @@ -1,309 +0,0 @@ ---- libicu-3.8.1/source/Makefile.in.orig 2008-10-18 21:03:02.000000000 +0200 -+++ libicu-3.8.1/source/Makefile.in 2007-12-12 19:58:06.000000000 +0100 -@@ -90,11 +90,11 @@ endif - LOCAL_SUBDIRS = $(SUBDIRS) - CLEAN_FIRST_SUBDIRS = tools - --$(LIBDIR) $(BINDIR): -+$(LIBDIR) $(BINDIR) $(LIBDIR_FOR_BUILD) $(BINDIR_FOR_BUILD): - -$(MKINSTALLDIRS) $@ - - ## Recursive targets --all-recursive install-recursive clean-recursive distclean-recursive dist-recursive check-recursive: $(LIBDIR) $(BINDIR) -+all-recursive install-recursive clean-recursive distclean-recursive dist-recursive check-recursive: $(LIBDIR) $(BINDIR) $(LIBDIR_FOR_BUILD) $(BINDIR_FOR_BUILD) - @dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(LOCAL_SUBDIRS)'; for subdir in $$list; do \ -@@ -158,7 +158,7 @@ clean-local: - distclean-local: clean-local - $(RMV) $(top_builddir)/config/Makefile.inc $(top_builddir)/config/icu-config - $(RMV) config.cache config.log config.status -- $(RMV) Makefile config/Makefile icudefs.mk $(LIBDIR) $(BINDIR) -+ $(RMV) Makefile config/Makefile icudefs.mk $(LIBDIR) $(BINDIR) $(LIBDIR_FOR_BUILD) $(BINDIR_FOR_BUILD) - - check-local: - ---- libicu-3.8.1/source/data/Makefile.in.orig 2008-10-18 21:06:51.000000000 +0200 -+++ libicu-3.8.1/source/data/Makefile.in 2008-10-18 21:06:10.000000000 +0200 -@@ -36,7 +36,7 @@ ICUPKGDATA_OUTDIR = $(OUTDIR) - endif - - CURDIR:=$(CURR_FULL_DIR) --PKGDATA = $(BINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR) -M'PKGDATA_LDFLAGS="$(LDFLAGSICUDT)"' -+PKGDATA = $(BINDIR_FOR_BUILD)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR) -M'PKGDATA_LDFLAGS="$(LDFLAGSICUDT)"' - - ifeq ($(OS390_STUBDATA),1) - OS390PKG=package390 -@@ -133,7 +133,7 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard - ifneq ($(ICUDATA_ARCHIVE),) - ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat - $(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR) -- $(INVOKE) $(BINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE) - endif - else - ifneq ($(ENABLE_STATIC),YES) -@@ -349,7 +349,7 @@ $(PKGDATA_LIST): $(SRCLISTDEPS) $(ICUDAT - ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES) - @echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)" - @-$(RMV) $@ -- $(INVOKE) $(BINDIR)/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) > $@ -+ $(INVOKE) $(BINDIR_FOR_BUILD)/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) > $@ - else - @echo "$@" > $@ - endif -@@ -378,45 +378,45 @@ endif - - # uprops.icu - $(BUILDDIR)/uprops.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)/genprops$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu -- $(INVOKE) $(BINDIR)/genprops -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -- $(INVOKE) $(BINDIR)/genprops --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genprops -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genprops --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) - - # ubidi.icu - $(BUILDDIR)/ubidi.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/genbidi$(EXEEXT) -- $(INVOKE) $(BINDIR)/genbidi -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -- $(INVOKE) $(BINDIR)/genbidi --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genbidi -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genbidi --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) - - # ucase.icu - $(BUILDDIR)/ucase.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/gencase$(EXEEXT) -- $(INVOKE) $(BINDIR)/gencase -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -- $(INVOKE) $(BINDIR)/gencase --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/gencase -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/gencase --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) - - # pnames.icu - $(BUILDDIR)/pnames.icu: $(UNICODEDATADIR)/PropertyAliases.txt $(UNICODEDATADIR)/PropertyValueAliases.txt $(UNICODEDATADIR)/Blocks.txt $(COMINCDIR)/uscript.h $(COMINCDIR)/uchar.h $(BINDIR)/genpname$(EXEEXT) -- $(INVOKE) $(BINDIR)/genpname -d $(BUILDDIR) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genpname -d $(BUILDDIR) - - # unorm.icu - $(BUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProps.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)/gennorm$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu $(BUILDDIR)/$(ICUDT)uprops.icu $(BUILDDIR)/$(ICUDT)ucase.icu -- $(INVOKE) $(BINDIR)/gennorm -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -- $(INVOKE) $(BINDIR)/gennorm --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/gennorm -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/gennorm --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION) - - # ucadata.icu - # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu - # see Jitterbug 4497 - $(BUILDDIR)/ucadata.icu $(BUILDDIR)/$(ICUDT)invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(BINDIR)/genuca$(EXEEXT) -- $(INVOKE) $(BINDIR)/genuca -s $(UNICODEDATADIR) -d $(BUILDDIR) -i $(BUILDDIR) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genuca -s $(UNICODEDATADIR) -d $(BUILDDIR) -i $(BUILDDIR) - - # unames.icu - $(BUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/gennames$(EXEEXT) -- $(INVOKE) $(BINDIR)/gennames -1 -d $(BUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION) -+ $(INVOKE) $(BINDIR_FOR_BUILD)/gennames -1 -d $(BUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION) - - # cnvalias.icu - $(BUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(BINDIR)/gencnval$(EXEEXT) -- $(INVOKE) $(BINDIR)/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt -+ $(INVOKE) $(BINDIR_FOR_BUILD)/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt - - # uidna.spp - $(BUILDDIR)/uidna.spp: $(MISCSRCDIR)/NamePrepProfile.txt $(BINDIR)/gensprep$(EXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu -- $(INVOKE) $(BINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(MISCSRCDIR) -b uidna -n $(UNICODEDATADIR) -u 3.2.0 -k NamePrepProfile.txt -+ $(INVOKE) $(BINDIR_FOR_BUILD)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(MISCSRCDIR) -b uidna -n $(UNICODEDATADIR) -u 3.2.0 -k NamePrepProfile.txt - - #################################################### BRK - # BRK FILES -@@ -425,28 +425,28 @@ $(BUILDDIR)/uidna.spp: $(MISCSRCDIR)/Nam - # $(RMV) $@ && ln -s $(BUILDDIR) $@ - - $(BRKBLDDIR)/%.brk: $(BRKSRCDIR)/%.txt $(BINDIR)/genbrk$(EXEEXT) $(DAT_FILES) -- $(INVOKE) $(BINDIR)/genbrk -c -i $(BUILDDIR) -r $< -o $@ -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genbrk -c -i $(BUILDDIR) -r $< -o $@ - - #################################################### CTD - # CTD FILES - - $(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(BINDIR)/genctd$(EXEEXT) $(DAT_FILES) -- $(INVOKE) $(BINDIR)/genctd -c -i $(BUILDDIR) -o $@ $< -+ $(INVOKE) $(BINDIR_FOR_BUILD)/genctd -c -i $(BUILDDIR) -o $@ $< - - #################################################### CNV - # CNV FILES - $(BUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(BINDIR)/makeconv$(EXEEXT) -- $(INVOKE) $(BINDIR)/makeconv -c -d $(BUILDDIR) $(UCMSRCDIR)/$( - - #include "unicode/umachine.h" - #include "unicode/utf.h" diff --git a/patches/lpsolve-5.5.0.13-mingw.patch b/patches/lpsolve-5.5.0.13-mingw.patch deleted file mode 100644 index 6ae5a4317..000000000 --- a/patches/lpsolve-5.5.0.13-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lpsolve-5.5.0.13.source/lp_types.h.orig 2008-10-29 21:50:54.000000000 +0100 -+++ lpsolve-5.5.0.13.source/lp_types.h 2008-10-29 21:51:28.000000000 +0100 -@@ -182,7 +182,7 @@ - #if !defined INLINE - #if defined __cplusplus - #define INLINE inline -- #elif (defined _WIN32) || (defined WIN32) || (defined _WIN64) || (defined WIN64) -+ #elif ((defined _WIN32) || (defined WIN32) || (defined _WIN64) || (defined WIN64)) && ! defined (__MINGW32__) - #define INLINE __inline - #else - #define INLINE static diff --git a/patches/openoffice-accessibility-nojava.patch b/patches/openoffice-accessibility-nojava.patch deleted file mode 100644 index e5015e779..000000000 --- a/patches/openoffice-accessibility-nojava.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- accessibility/bridge/source/java/makefile.mk.pristine 2009-04-05 11:23:45.847495404 +0200 -+++ accessibility/bridge/source/java/makefile.mk 2009-04-05 11:26:04.051493710 +0200 -@@ -43,6 +43,7 @@ VERSIONOBJ= - - # --- Files -------------------------------------------------------- - -+.IF "$(SOLAR_JAVA)"!="" - .IF "$(GUI)"=="WNT" - - SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj -@@ -72,3 +73,6 @@ $(SHL1HEADER) : - javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter - - .ENDIF # "$(GUI)"=="WNT" -+.ELSE # "$(SOLAR_JAVA)"=="" -+ALLTAR: -+.ENDIF # "$(SOLAR_JAVA)"=="" diff --git a/patches/openoffice-basegfx-no-cppunit.patch b/patches/openoffice-basegfx-no-cppunit.patch deleted file mode 100644 index 25eb6cf48..000000000 --- a/patches/openoffice-basegfx-no-cppunit.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ooo/basegfx/prj/build.lst.pristine 2009-04-06 10:18:35.000000000 +0200 -+++ ooo/basegfx/prj/build.lst 2009-04-06 10:18:39.000000000 +0200 -@@ -15,4 +15,4 @@ fx basegfx\source\color nmake - all - fx basegfx\source\pixel nmake - all fx_pixel fx_inc NULL - fx basegfx\source\raster nmake - all fx_raster fx_inc NULL - fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector fx_color fx_pixel fx_raster NULL --fx basegfx\test nmake - all fx_tests fx_util NULL -+#fx basegfx\test nmake - all fx_tests fx_util NULL diff --git a/patches/openoffice-config_office-cross.patch b/patches/openoffice-config_office-cross.patch deleted file mode 100644 index b3e387671..000000000 --- a/patches/openoffice-config_office-cross.patch +++ /dev/null @@ -1,216 +0,0 @@ ---- config_office/configure.in.orig 2008-10-19 21:05:46.000000000 +0200 -+++ config_office/configure.in 2008-10-19 21:27:16.000000000 +0200 -@@ -794,6 +794,11 @@ AC_ARG_ENABLE(verbose, - [ --enable-verbose Increase build verbosity. - --disable-verbose Decrease build verbosity. - ],,) -+AC_ARG_WITH(tools-dir, -+[ --with-tools-dir When cross compiling, specify solar tools -+ directory. -+],[TOOLS_DIR=$withval],[TOOLS_DIR='$(SOLARBINDIR)']) -+AC_SUBST(TOOLS_DIR) - - BUILD_TYPE="OOo" - -@@ -1035,6 +1035,21 @@ AC_SUBST(OSVERSION) - AC_SUBST(PTHREAD_CFLAGS) - AC_SUBST(PTHREAD_LIBS) - -+case "$target_os" in -+ linux-gnu*) -+ t_os=Linux -+ ;; -+ mingw32*) -+ t_os=MinGW -+ ;; -+ solaris*) -+ t_os=SunOS -+ ;; -+ *) -+ t_os=$_os -+ ;; -+esac -+ - dnl =================================================================== - dnl Set the ENABLE_CRASHDUMP variable. - dnl =================================================================== -@@ -1649,6 +1651,27 @@ if test "$_os" = "OSF1"; then - fi - fi - -+AC_CHECK_TOOL([AR], [ar], [:]) -+AC_CHECK_TOOL([AS], [as], [:]) -+AC_CHECK_TOOL([DLLTOOL], [dlltool], [:]) -+AC_CHECK_TOOL([LD], [ld], [:]) -+AC_CHECK_TOOL([NM], [nm], [:]) -+AC_CHECK_TOOL([RANLIB], [ranlib], [:]) -+AC_CHECK_TOOL([WINDRES], [windres], [:]) -+ -+BUILD_OS=$_os -+TARGET_OS=$t_os -+CROSS_COMPILING=$cross_compiling -+CC_FOR_BUILD=${CC_FOR_BUILD-cc} -+CCLD_FOR_BUILD=${CCLD_FOR_BUILD-${CC_FOR_BUILD}} -+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-} -+AC_SUBST(BUILD_OS) -+AC_SUBST(TARGET_OS) -+AC_SUBST(CROSS_COMPILING) -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CCLD_FOR_BUILD) -+AC_SUBST(LDFLAGS_FOR_BUILD) -+ - dnl =================================================================== - dnl Check whether there's a Perl version available. - dnl =================================================================== -@@ -3735,14 +3740,11 @@ if test -n "$with_system_python" -o -n " - AC_MSG_RESULT([external]) - AM_PATH_PYTHON([2.2]) - -- python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"` -- python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"` -- PYTHON_CFLAGS="-I$python_include" -+ PYTHON_CFLAGS=`python-config --cflags` -+ PYTHON_LIBS=`python-config --libs` - - if test "$_os" = "Darwin"; then - PYTHON_LIBS="-framework Python" -- else -- PYTHON_LIBS="-lpython$python_version" - fi - - dnl check if the headers really work: -@@ -3798,7 +3800,7 @@ int main(int argc, char **argv) { - if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0; - else return 1; - } -- ], [DB_VERSION_MINOR=$v], []) -+ ], [DB_VERSION_MINOR=$v], [], [DB_VERSION_MINOR=$ac_cv_db_version_minor]) - done - if test "$DB_VERSION_MINOR" -gt "1"; then - AC_MSG_RESULT([OK]) -@@ -4396,7 +4398,7 @@ int main(int argc, char **argv) { - else - return 0; - } -- ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])]) -+ ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])], [AC_MSG_RESULT($ac_cv_icu_version)]) - AC_LANG_POP([C++]) - else - AC_MSG_RESULT([internal]) -@@ -4519,7 +4521,7 @@ int main(int argc, char **argv) { - if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0; - else return 1; - } --], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, fontconfig >= 2.2.0 needed])]) -+], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, fontconfig >= 2.2.0 needed])], [AC_MSG_RESULT(possibly - should use pkg-config instead of home-brew checks)]) - fi - - dnl =================================================================== -@@ -4638,7 +4638,7 @@ AC_SUBST(SYSTEM_LPSOLVE) - dnl *************************************** - dnl testing libc version for Linux... - dnl *************************************** --if test "$_os" = "Linux"; then -+if test "$_os" = "Linux" -a "$cross_compiling" = "no"; then - AC_MSG_CHECKING([whether libc is >= 2.1.1]) - exec 6>/dev/null # no output - AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) ---- config_office/acinclude.m4.orig 2008-10-19 21:29:43.000000000 +0200 -+++ config_office/acinclude.m4 2008-10-19 21:29:51.000000000 +0200 -@@ -136,3 +136,24 @@ AC_DEFUN([PKG_CHECK_MODULES_MACHACK], - PKG_CHECK_MODULES($1, $3, $4, $5, $6) - fi - ]) -+ -+## ------------------------------------- ## -+## Checking for the existence of files. ## -+## ------------------------------------- ## -+ -+# AC_CHECK_FILE_CROSS(FILE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# ------------------------------------------------------------- -+# -+# Check for the existence of FILE; remove assertion on not cross-compiliing -+AC_DEFUN([AC_CHECK_FILE_CROSS], -+[ -+AS_VAR_PUSHDEF([ac_File], [ac_cv_file_$1])dnl -+AC_CACHE_CHECK([for $1], [ac_File], -+if test -r "$1"; then -+ AS_VAR_SET([ac_File], [yes]) -+else -+ AS_VAR_SET([ac_File], [no]) -+fi) -+AS_IF([test AS_VAR_GET([ac_File]) = yes], [$2], [$3])[]dnl -+AS_VAR_POPDEF([ac_File])dnl -+])# AC_CHECK_FILE_CROSS ---- config_office/bootstrap.1.orig 2008-10-19 23:24:01.000000000 +0200 -+++ config_office/bootstrap.1 2008-10-19 23:22:49.000000000 +0200 -@@ -1,7 +1,7 @@ - - # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x - # Use spawn instead of fork when building dmake on cygwin. --if test "$GUI" = "WNT"; then -+if test "$GUI" = "WNT" -a "$CROSS_COMPILING" != "yes"; then - EXEEXT=".exe" - DMAKE_CONF="--enable-spawn" - else -@@ -36,6 +36,14 @@ if test "$BUILD_DMAKE" != "NO"; then - $GNUMAKE distclean || exit - fi - -+ # When cross compiling, use native compiler -+ if test -n "$CC_FOR_BUILD"; then -+ CC=$CC_FOR_BUILD -+ export CC -+ LDFLAGS=$LDFLAGS_FOR_BUILD -+ export LDFLAGS -+ fi -+ - ./configure $DMAKE_CONF || exit - - ## invoke the gnu make command set by configure. -@@ -62,7 +70,7 @@ if test "$BUILD_DMAKE" != "NO"; then - echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT" - fi - --if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then -+if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT" -a "$CROSS_COMPILING" != "yes"; then - echo "" - echo "Calling $GNUMAKE in guw" - cd "$SRC_ROOT/config_office/guw" || exit ---- config_office/set_soenv.in.orig 2008-10-20 19:52:27.000000000 +0200 -+++ config_office/set_soenv.in 2008-10-20 21:38:02.000000000 +0200 -@@ -1194,8 +1210,11 @@ if ($platform =~ m/cygwin|os2/) - # The general environment path. - if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/) - { $PATH = $cur_dir. -- $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN. -- $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -+ $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN; -+ if ("@CROSS_COMPILING@" == "yes") { -+ $PATH .= $ps.'@TOOLS_DIR@'; -+ } -+ $PATH .= $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. - $ps.'$SOLARENV'.$BIN; - - if ($platform =~ m/solaris/) { -@@ -1847,6 +1847,20 @@ ToFile( "SOLAR_JAVA", $SOLAR_JAVA - ToFile( "BIG_SVX", $BIG_SVX, "e" ); - ToFile( "COM", $COM, "e" ); - ToFile( "COMPATH", $COMPATH, "e" ); -+ToFile( "BUILD_OS", "@BUILD_OS@", "e" ); -+ToFile( "TARGET_OS", "@TARGET_OS@", "e" ); -+ToFile( "CROSS_COMPILING", "@CROSS_COMPILING@", "e" ); -+ToFile( "CC_FOR_BUILD", "@CC_FOR_BUILD@", "e" ); -+ToFile( "CCLD_FOR_BUILD", "@CCLD_FOR_BUILD@", "e" ); -+ToFile( "LDFLAGS_FOR_BUILD", "@LDFLAGS_FOR_BUILD@", "e" ); -+ToFile( "AR", "@AR@", "e" ); -+ToFile( "AS", "@AS@", "e" ); -+ToFile( "DLLTOOL", "@DLLTOOL@", "e" ); -+ToFile( "LD", "@LD@", "e" ); -+ToFile( "NM", "@NM@", "e" ); -+ToFile( "RANLIB", "@RANLIB@", "e" ); -+ToFile( "WINDRES", "@WINDRES@", "e" ); -+ToFile( "TOOLS_DIR", "@TOOLS_DIR@", "e" ); - ToFile( "CPU", $CPU, "e" ); - ToFile( "CPUNAME", $CPUNAME, "e" ); - ToFile( "CVER", $CVER, "e" ); diff --git a/patches/openoffice-config_office-mingw.patch b/patches/openoffice-config_office-mingw.patch deleted file mode 100644 index e48ad2f13..000000000 --- a/patches/openoffice-config_office-mingw.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- config_office/configure.in.orig 2008-10-19 22:03:22.000000000 +0200 -+++ config_office/configure.in 2008-10-19 22:17:08.000000000 +0200 -@@ -1059,7 +1079,7 @@ - fi - AC_SUBST(ENABLE_CRASHDUMP) - --if test "$_os" = "WINNT"; then -+if test "$_os" = "WINNT" -o "$t_os" = "MinGW"; then - BUILD_TYPE="$BUILD_TYPE TWAIN" - fi - -@@ -4265,7 +4262,7 @@ elif test "$_os" = "OS2" ; then - echo "Do Nothing for _os = OS2. Don't check for X11." - dnl OS/2 uses native graphics. Don't check for X11. - : --elif test "$_os" != "WINNT" ; then -+elif test "$_os" != "WINNT" -a "$t_os" != "MinGW" ; then - AC_PATH_X - AC_PATH_XTRA - CPPFLAGS="$CPPFLAGS $X_CFLAGS" -@@ -4526,7 +4564,7 @@ fi - AC_SUBST(XLIB) - AC_SUBST(XAU_LIBS) - --if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then -+if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then - dnl =================================================================== - dnl Check for using Xaw - dnl =================================================================== -@@ -5371,7 +5409,7 @@ dnl ==================================== - - ENABLE_GCONF="" - AC_MSG_CHECKING([whether to enable GConf support]) --if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then -+if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then - ENABLE_GCONF="TRUE" - AC_MSG_RESULT([yes]) - PKG_CHECK_MODULES( GCONF, gconf-2.0 ) -@@ -5387,7 +5425,7 @@ dnl ==================================== - ENABLE_GNOMEVFS="" - GNOMEVFS_HAS_LOCKING="" - AC_MSG_CHECKING([whether to enable GNOME VFS support]) --if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then -+if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then - ENABLE_GNOMEVFS="TRUE" - AC_MSG_RESULT([yes]) - PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 ) ---- config_office/set_soenv.in.orig 2008-10-20 19:52:27.000000000 +0200 -+++ config_office/set_soenv.in 2008-10-20 20:22:58.000000000 +0200 -@@ -593,6 +593,22 @@ elsif ( $platform =~ m/linux/ ) - $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt"; - } - -+ if ( "@TARGET_OS@" == "MinGW" ) -+ { -+ print "Setting build=Linux -> target,host=MinGW specific values... "; -+ $COM = "GCC"; -+ $CVER = "C341"; -+ $OUTPATH = "wntgcci"; -+ $CPUNAME = "INTEL"; -+ $CPU = "I"; -+ $GUI = "WNT"; -+ $GUIBASE = "WIN"; -+ $GVER = "NT351"; -+ $OS = "WNT"; -+ $DYNAMIC_CRT = "TRUE"; -+ $SET_EXCEPTIONS = "TRUE"; -+ $use_shl_versions = "TRUE"; -+ } - - $INPATH = $OUTPATH.$PROEXT; - } diff --git a/patches/openoffice-connectivity-mingw.patch b/patches/openoffice-connectivity-mingw.patch deleted file mode 100644 index 0538af256..000000000 --- a/patches/openoffice-connectivity-mingw.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- connectivity/source/inc/odbc/OFunctiondefs.hxx.~1.17.~ 2008-04-10 13:43:33.000000000 +0200 -+++ connectivity/source/inc/odbc/OFunctiondefs.hxx 2008-10-31 15:24:26.000000000 +0100 -@@ -32,7 +32,14 @@ - #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_ - #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_ - --#if defined(WIN) || defined(WNT) -+#if defined(__MINGW32__) -+ -+#include -+#define SDB_ODBC_CHAR SQLCHAR -+#include -+#include -+ -+#elif defined(WIN) || defined(WNT) - - #ifdef _MSC_VER - #pragma warning(push) ---- connectivity/source/inc/adabas/BDriver.hxx.~1.13.~ 2008-04-10 12:43:47.000000000 +0200 -+++ connectivity/source/inc/adabas/BDriver.hxx 2008-10-31 15:24:26.000000000 +0100 -@@ -31,6 +31,8 @@ - #ifndef _CONNECTIVITY_ADABAS_BDRIVER_HXX_ - #define _CONNECTIVITY_ADABAS_BDRIVER_HXX_ - -+#include -+ - #include - #include - #include ---- connectivity/source/inc/TResultSetHelper.hxx.~1.3.~ 2008-04-10 12:39:57.000000000 +0200 -+++ connectivity/source/inc/TResultSetHelper.hxx 2008-10-31 15:24:26.000000000 +0100 -@@ -33,6 +33,9 @@ - - #include - -+#undef ABSOLUTE -+#undef RELATIVE -+ - namespace connectivity - { - class SAL_NO_VTABLE IResultSetHelper ---- connectivity/inc/connectivity/sdbcx/VDescriptor.hxx.~1.11.~ 2008-04-10 09:43:29.000000000 +0200 -+++ connectivity/inc/connectivity/sdbcx/VDescriptor.hxx 2008-10-31 15:24:26.000000000 +0100 -@@ -32,6 +32,7 @@ - #define _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_ - - #include -+#undef OPTIONAL - #include - #include - #include diff --git a/patches/openoffice-cppuhelper-mingw.patch b/patches/openoffice-cppuhelper-mingw.patch deleted file mode 100644 index 80636b8ed..000000000 --- a/patches/openoffice-cppuhelper-mingw.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- cppuhelper/source/shlib.cxx.pristine 2009-04-08 13:32:45.090439917 +0200 -+++ cppuhelper/source/shlib.cxx 2009-04-08 16:20:54.526067518 +0200 -@@ -100,7 +100,14 @@ static const ::std::vector< OUString > * - if (FileBase::getFileURLFromSystemPath(aStr, aFileUrl) - != FileBase::E_None) - { -- OSL_ASSERT(false); -+#if OSL_DEBUG_LEVEL > 1 -+ out( "*** getFileURLFromSystemPath failed for: " ); -+ out( aStr ); -+#endif -+#ifdef __MINGW32__ -+ continue; -+#endif /* __MINGW32__ */ -+ OSL_ASSERT(false); - } - s_v.push_back( aFileUrl ); - } while( nIndex != -1 ); -@@ -172,6 +179,8 @@ static bool checkAccessPath( OUString * - #endif - } - -+ OUString aBaseDirPlusFileColonSlashSlash -+ = OUString::createFromAscii ("file://") + aBaseDir; - if (0 == aAbs.indexOf( aBaseDir ) && // still part of it? - aBaseDir.getLength() < aAbs.getLength() && - (aBaseDir[ aBaseDir.getLength() -1 ] == (sal_Unicode)'/' || -@@ -186,6 +195,19 @@ static bool checkAccessPath( OUString * - return true; - } - #if OSL_DEBUG_LEVEL > 1 -+ else if (0 == aAbs.indexOf( aBaseDirPlusFileColonSlashSlash ) && // still part of it? -+ aBaseDirPlusFileColonSlashSlash.getLength() < aAbs.getLength() && -+ (aBaseDirPlusFileColonSlashSlash[ aBaseDirPlusFileColonSlashSlash.getLength() -1 ] == (sal_Unicode)'/' || -+ // dir boundary -+ aAbs[ aBaseDirPlusFileColonSlashSlash.getLength() ] == (sal_Unicode)'/')) -+ { -+#if OSL_DEBUG_LEVEL > 1 -+ out( ": ok [adding file://].\n" ); -+#endif -+ // load from absolute path -+ *pComp = aAbs; -+ return true; -+ } - else - { - out( "\" ...does not match given path \"" ); ---- cppuhelper/source/bootstrap.cxx.pristine 2009-04-08 15:48:48.595676127 +0200 -+++ cppuhelper/source/bootstrap.cxx 2009-04-08 15:48:22.621940816 +0200 -@@ -354,12 +354,14 @@ Reference< registry::XSimpleRegistry > n - } - catch(registry::InvalidRegistryException & invalidRegistryException) - { -+#ifndef __MINGW32__ - if (! optional) - { - // if a registry was explicitly given, the exception shall fly - if( ! bFallenBack ) - throw; - } -+#endif /* __MINGW32__ */ - - (void) invalidRegistryException; - #if OSL_DEBUG_LEVEL > 1 diff --git a/patches/openoffice-cppunit-mingw.patch b/patches/openoffice-cppunit-mingw.patch deleted file mode 100644 index 29e695703..000000000 --- a/patches/openoffice-cppunit-mingw.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- cppunit/cppunit-1.8.0-r1.patch.pristine 2009-04-04 15:33:44.231998652 +0200 -+++ cppunit/cppunit-1.8.0-r1.patch 2009-04-04 15:34:27.616002193 +0200 -@@ -9610,7 +9610,7 @@ Nur in misc/build/cppunit-1.8.0/src/resu - Nur in misc/build/cppunit-1.8.0/src/result: treswrapper.cxx.dummy. - --- misc/cppunit-1.8.0/src/win32/makefile.mk 2008-12-10 20:46:10.024158685 +0100 - +++ misc/build/cppunit-1.8.0/src/win32/makefile.mk 2008-12-10 19:45:23.000000000 +0100 --@@ -1 +1,67 @@ -+@@ -1 +1,68 @@ - -dummy - +#************************************************************************* - +# -@@ -9663,6 +9663,7 @@ Nur in misc/build/cppunit-1.8.0/src/resu - +#------------------------------------------------------------------------------- - +# This is a static lib - +LIB1TARGET= $(LB)$/$(TARGET).lib -++LIB1ARCHIV= $(LB)$/lib$(TARGET)$(DLLPOSTFIX).a - +LIB1OBJFILES= \ - + $(SLOFILES) - + -@@ -9682,7 +9683,7 @@ Nur in misc/build/cppunit-1.8.0/src/resu - Nur in misc/build/cppunit-1.8.0/src/win32: makefile.mk.dummy. - --- misc/cppunit-1.8.0/src/win32/winstuff.cxx 2008-12-10 20:46:10.106772548 +0100 - +++ misc/build/cppunit-1.8.0/src/win32/winstuff.cxx 2008-12-10 20:42:44.000000000 +0100 --@@ -1 +1,143 @@ -+@@ -1 +1,142 @@ - -dummy - +/************************************************************************* - + * -@@ -9727,7 +9728,6 @@ Nur in misc/build/cppunit-1.8.0/src/win3 - +#if defined _MSC_VER - +#pragma warning(pop) - +#endif --+#include - + - +void WinDebugBreak() - +{ diff --git a/patches/openoffice-dbaccess-mingw.patch b/patches/openoffice-dbaccess-mingw.patch deleted file mode 100644 index ab4939f16..000000000 --- a/patches/openoffice-dbaccess-mingw.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- dbaccess/source/ui/dlg/makefile.mk.pristine 2008-04-10 16:59:00.000000000 +0200 -+++ dbaccess/source/ui/dlg/makefile.mk 2009-02-16 15:51:44.000000000 +0100 -@@ -131,7 +131,7 @@ SLOFILES= \ - $(SLO)$/dlgsize.obj \ - $(SLO)$/dlgattr.obj - --.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" -+.IF ("$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="") || "$(TARGET_OS)" == "MinGW" - DISABLE_ADO=TRUE - .ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" - ---- dbaccess/source/ui/dlg/odbcconfig.cxx.~2~ 2008-11-05 10:14:38.000000000 +0100 -+++ dbaccess/source/ui/dlg/odbcconfig.cxx 2008-11-04 17:22:07.000000000 +0100 -@@ -31,6 +31,15 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_dbaccess.hxx" - -+#ifdef __MINGW32__ -+#define Rectangle W32_Rectangle -+#include -+#define SDB_ODBC_CHAR SQLCHAR -+#include -+#include -+#undef Yield -+#endif /* __MINGW32__ */ -+ - #ifndef _DBAUI_ODBC_CONFIG_HXX_ - #include "odbcconfig.hxx" - #endif -@@ -52,6 +61,9 @@ - #ifndef _TOOLS_DEBUG_HXX - #include - #endif -+#ifdef __MINGW32__ -+#undef Rectangle -+#endif /* __MINGW32__ */ - #ifndef _SV_SVAPP_HXX - #include - #endif ---- dbaccess/source/ui/dlg/ConnectionHelper.cxx.~1.19.~ 2008-05-05 17:56:49.000000000 +0200 -+++ dbaccess/source/ui/dlg/ConnectionHelper.cxx 2009-02-16 21:37:10.000000000 +0100 -@@ -149,7 +149,7 @@ - #ifndef _SFX_DOCFILT_HACK_HXX - #include - #endif --#if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT)) -+#if !defined(WINDOWS_VISTA_PSDK) && !defined(__MINGW32__) && (defined(WIN) || defined(WNT)) - #define _ADO_DATALINK_BROWSE_ - #endif - diff --git a/patches/openoffice-desktop-mingw.patch b/patches/openoffice-desktop-mingw.patch deleted file mode 100644 index 54f76c661..000000000 --- a/patches/openoffice-desktop-mingw.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- desktop/win32/source/setup/setup_w.cxx.~1.5.~ 2008-04-11 06:50:30.000000000 +0200 -+++ desktop/win32/source/setup/setup_w.cxx 2008-11-05 15:53:43.000000000 +0100 -@@ -34,5 +34,9 @@ - #define UNICODE 1 - #define _UNICODE 1 - -+#ifdef __MINGW32__ -+#define _ttempnam(a, b) (TCHAR*)tempnam ((char*)a, (char*)b) -+#endif -+ - #include "setup.cpp" - ---- desktop/win32/source/setup/setup_a.cxx.~1.5.~ 2008-04-11 06:49:31.000000000 +0200 -+++ desktop/win32/source/setup/setup_a.cxx 2008-11-05 15:52:36.000000000 +0100 -@@ -31,4 +31,8 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_desktop.hxx" - -+#ifdef __MINGW32__ -+#define _ttempnam tempnam -+#endif -+ - #include "setup.cpp" ---- desktop/win32/source/setup/rcheader.txt.~1.6.~ 2008-01-15 14:33:41.000000000 +0100 -+++ desktop/win32/source/setup/rcheader.txt 2008-11-05 15:16:00.000000000 +0100 -@@ -7,7 +7,7 @@ - #define CB_ADDSTRING (WM_USER+3) - #define IDC_STATIC (-1) - #endif --#include "resource.h" -+#include "Resource.h" - - ///////////////////////////////////////////////////////////////////////////// - // ---- desktop/win32/source/setup/setup.cpp.~1.15.12.1.~ 2008-09-03 15:00:32.000000000 +0200 -+++ desktop/win32/source/setup/setup.cpp 2008-11-05 15:52:16.000000000 +0100 -@@ -49,7 +49,7 @@ - - #include "setup.hxx" - --#include "resource.h" -+#include "Resource.h" - - //-------------------------------------------------------------------------- - ---- desktop/win32/source/setup/makefile.mk.~1.12.~ 2008-04-11 06:48:48.000000000 +0200 -+++ desktop/win32/source/setup/makefile.mk 2008-11-05 15:19:13.000000000 +0100 -@@ -92,4 +92,23 @@ APP1NOSVRES= $(RES)$/$(TARGET).res - - $(RCFILES) : $(ULFDIR)$/setup.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt - $(WRAPCMD) lngconvex.exe -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt -+.IF "$(CROSS_COMPILING)" == "yes" -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f]["\\]\)@\\x00\1@g' $@ -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f]["\\]\)@\\x00\1@g' $@ -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f][0-9a-f]["\\]\)@\\x0\1@g' $@ -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f][0-9a-f]["\\]\)@\\x0\1@g' $@ -+ sed -i -e 's@\([ ,]\)"@\1L"@g' $@ -+ sed -i -e 's@include L"@include "@' $@ -+ pytt '\r\n' '\n' $@ -+ pytt '^LANGUAGE 0x4d(.|\n)*' '' $@ -+# sed -i -e 's@^LANGUAGE 0x211@LANGUAGE 0x21@' $@ -+# sed -i -e 's@^LANGUAGE 0x226@LANGUAGE 0x26@' $@ -+# sed -i -e 's@^LANGUAGE 0x22c@LANGUAGE 0x2c@' $@ -+# sed -i -e 's@^LANGUAGE 0x22b@LANGUAGE 0x2b@' $@ -+# sed -i -e 's@^LANGUAGE 0x30@LANGUAGE 0x2d@' $@ -+# sed -i -e 's@^LANGUAGE 0x73@LANGUAGE 0x2a@' $@ -+# sed -i -e 's@^LANGUAGE 0x31@LANGUAGE 0x2e@' $@ -+# sed -i -e 's@^LANGUAGE 0x33@LANGUAGE 0x01@' $@ -+# sed -i -e 's@^LANGUAGE 0x55@LANGUAGE 0x22@' $@ -+.ENDIF #"$(CROSS_COMPILING)" == "yes" - ---- desktop/util/verinfo.rc.~1.19.12.1.~ 2008-09-19 09:30:39.000000000 +0200 -+++ desktop/util/verinfo.rc 2008-11-05 15:04:37.000000000 +0100 -@@ -149,7 +149,11 @@ VS_VERSION_INFO versioninfo - VS_VERSION_INFO rcdata - { - 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, -+#ifndef CROSS_COMPILING - VERSION, VERVARIANT, VER_COUNT -+#else -+ VERSION -+#endif - }; - - ---- desktop/util/ooverinfo.rc.~1.12.12.1.~ 2008-09-19 09:30:16.000000000 +0200 -+++ desktop/util/ooverinfo.rc 2008-11-05 15:07:54.000000000 +0100 -@@ -144,7 +144,11 @@ VS_VERSION_INFO versioninfo - VS_VERSION_INFO rcdata - { - 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, -+#ifndef CROSS_COMPILING - VERSION, SUBVERSION, VERVARIANT, VER_COUNT -+#else -+ VERSION -+#endif - }; - - ---- desktop/source/pkgchk/unopkg/makefile.mk.~1.17.~ 2008-07-22 19:16:08.000000000 +0200 -+++ desktop/source/pkgchk/unopkg/makefile.mk 2008-11-05 14:58:45.000000000 +0100 -@@ -55,7 +55,7 @@ APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) - APP1DEPN = $(SHL1TARGETN) - APP1NOSAL = TRUE - APP1RPATH = BRAND --.IF "$(OS)" == "WNT" -+.IF "$(TARGET_OS)" == "WNT" - APP1ICON = $(SOLARRESDIR)$/icons/so9_main_app.ico - APP1LINKRES = $(MISC)$/$(TARGET)1.res - .ENDIF -@@ -66,7 +66,7 @@ APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) - APP2DEPN = $(SHL1TARGETN) - APP2NOSAL = TRUE - APP2RPATH = BRAND --.IF "$(OS)" == "WNT" -+.IF "$(TARGET_OS)" == "WNT" - APP2ICON = $(SOLARRESDIR)$/icons/ooo3_main_app.ico - APP2LINKRES = $(MISC)$/$(TARGET)2.res - .ENDIF ---- desktop/source/deployment/misc/dp_misc.cxx.pristine 2009-04-06 12:16:26.807994125 +0200 -+++ desktop/source/deployment/misc/dp_misc.cxx 2009-04-06 12:16:33.664089092 +0200 -@@ -55,7 +55,7 @@ - #define UNICODE - #define _UNICODE - #define WIN32_LEAN_AND_MEAN --#include -+#include - //#include "tools/postwin.h" - #endif - diff --git a/patches/openoffice-dtrans-mingw.patch b/patches/openoffice-dtrans-mingw.patch deleted file mode 100644 index e025ebf60..000000000 --- a/patches/openoffice-dtrans-mingw.patch +++ /dev/null @@ -1,333 +0,0 @@ ---- dtrans/test/win32/dnd/transferable.hxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/test/win32/dnd/transferable.hxx 2008-10-29 20:30:12.000000000 +0100 -@@ -35,7 +35,7 @@ - //_________________________________________________________________________________________________________________________ - - --//#include "..\ImplHelper.hxx" -+//#include "../ImplHelper.hxx" - - //_________________________________________________________________________________________________________________________ - // other includes -@@ -66,7 +66,7 @@ - - #include - --#include "..\..\source\win32\ImplHelper.hxx" -+#include "../../source/win32/ImplHelper.hxx" - - - //------------------------------------------------------------- ---- dtrans/source/win32/mtaole/MtaOleClipb.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/mtaole/MtaOleClipb.cxx 2008-10-29 20:30:09.000000000 +0100 -@@ -52,7 +52,7 @@ - //#define UNICODE - #include - --#include "..\..\inc\MtaOleClipb.hxx" -+#include "../../inc/MtaOleClipb.hxx" - #include - - #include ---- dtrans/source/win32/clipb/WinClipbImpl.hxx.pristine 2008-10-29 17:21:58.000000000 +0100 -+++ dtrans/source/win32/clipb/WinClipbImpl.hxx 2008-10-29 17:22:16.000000000 +0100 -@@ -41,7 +41,7 @@ - #include - #include - #include --#include "..\..\inc\MtaOleClipb.hxx" -+#include "../../inc/MtaOleClipb.hxx" - - #if defined _MSC_VER - #pragma warning(push,1) ---- dtrans/source/win32/clipb/WinClipbImpl.cxx.pristine 2008-10-29 17:22:36.000000000 +0100 -+++ dtrans/source/win32/clipb/WinClipbImpl.cxx 2008-10-29 17:22:54.000000000 +0100 -@@ -38,11 +38,11 @@ - #include "WinClipbImpl.hxx" - - #include --#include "..\..\inc\DtObjFactory.hxx" --#include "..\dtobj\APNDataObject.hxx" -+#include "../../inc/DtObjFactory.hxx" -+#include "../dtobj/APNDataObject.hxx" - #include "WinClipboard.hxx" - #include --#include "..\dtobj\XNotifyingDataObject.hxx" -+#include "../dtobj/XNotifyingDataObject.hxx" - - #if defined _MSC_VER - #pragma warning(push,1) ---- dtrans/source/win32/ftransl/ftransl.hxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/ftransl/ftransl.hxx 2008-10-29 20:30:05.000000000 +0100 -@@ -42,7 +42,7 @@ - #include - #include - #include --#include "..\misc\WinClip.hxx" -+#include "../misc/WinClip.hxx" - - #include - ---- dtrans/source/win32/ftransl/ftransl.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/ftransl/ftransl.cxx 2008-10-29 20:30:05.000000000 +0100 -@@ -40,7 +40,7 @@ - #include "ftransl.hxx" - #endif - #include --#include "..\misc\ImplHelper.hxx" -+#include "../misc/ImplHelper.hxx" - - #if defined _MSC_VER - #pragma warning(push,1) ---- dtrans/source/win32/misc/ImplHelper.cxx.pristine 2008-10-29 17:18:03.000000000 +0100 -+++ dtrans/source/win32/misc/ImplHelper.cxx 2008-10-29 17:20:12.000000000 +0100 -@@ -49,7 +49,7 @@ - #pragma warning(pop) - #endif - #ifdef __MINGW32__ --#include -+#include - #endif - - //------------------------------------------------------------------------ ---- dtrans/source/win32/workbench/test_wincb.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/workbench/test_wincb.cxx 2008-10-29 20:30:06.000000000 +0100 -@@ -37,7 +37,7 @@ - //_________________________________________________________________________________________________________________________ - - --#include "..\misc\ImplHelper.hxx" -+#include "../misc/ImplHelper.hxx" - - //_________________________________________________________________________________________________________________________ - // other includes ---- dtrans/source/win32/workbench/XTDo.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/workbench/XTDo.cxx 2008-10-29 20:28:07.000000000 +0100 -@@ -36,7 +36,7 @@ - //------------------------------------------------------------------------ - #include - --#include "..\DTransHelper.hxx" -+#include "../DTransHelper.hxx" - - #ifndef _TWRAPPERDATAOBJECT_HXX_ - #include "XTDo.hxx" ---- dtrans/source/win32/dnd/source.hxx.pristine 2008-10-29 20:55:40.000000000 +0100 -+++ dtrans/source/win32/dnd/source.hxx 2008-10-29 21:09:00.000000000 +0100 -@@ -43,6 +43,7 @@ - #include - #include "../../inc/DtObjFactory.hxx" - #include "globals.hxx" -+#include - #include - - #include -@@ -129,8 +130,10 @@ public: - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); - -- -- -+#ifdef __MINGW32__ -+#undef STDMETHODCALLTYPE -+#define STDMETHODCALLTYPE -+#endif /* __MINGW32__ */ - virtual HRESULT STDMETHODCALLTYPE QueryInterface( - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); ---- dtrans/source/win32/dnd/source.cxx.pristine 2008-10-29 20:59:32.000000000 +0100 -+++ dtrans/source/win32/dnd/source.cxx 2008-10-29 21:08:39.000000000 +0100 -@@ -262,7 +262,7 @@ HRESULT STDMETHODCALLTYPE DragSource::Qu - //---------------------------------------------------- - /** - */ --ULONG STDMETHODCALLTYPE DragSource::AddRef( void) -+ULONG STDMETHODCALLTYPE DragSource::AddRef() - { - acquire(); - return (ULONG) m_refCount; -@@ -271,7 +271,7 @@ ULONG STDMETHODCALLTYPE DragSource::AddR - //---------------------------------------------------- - /** - */ --ULONG STDMETHODCALLTYPE DragSource::Release( void) -+ULONG STDMETHODCALLTYPE DragSource::Release() - { - ULONG ref= m_refCount; - release(); ---- dtrans/source/win32/dnd/target.hxx.pristine 2008-10-29 20:56:02.000000000 +0100 -+++ dtrans/source/win32/dnd/target.hxx 2008-10-29 20:56:20.000000000 +0100 -@@ -46,6 +46,7 @@ - #if defined _MSC_VER - #pragma warning(push,1) - #endif -+#include - #include - #if defined _MSC_VER - #pragma warning(pop) ---- dtrans/source/win32/dtobj/TxtCnvtHlp.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/TxtCnvtHlp.cxx 2008-10-29 20:30:06.000000000 +0100 -@@ -37,7 +37,7 @@ - #include - #include "TxtCnvtHlp.hxx" - #include "DTransHelper.hxx" --#include "..\misc\ImplHelper.hxx" -+#include "../misc/ImplHelper.hxx" - - using namespace ::com::sun::star::datatransfer; - using namespace ::com::sun::star::uno; ---- dtrans/source/win32/dtobj/DOTransferable.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/DOTransferable.cxx 2008-10-29 20:30:06.000000000 +0100 -@@ -40,10 +40,10 @@ - #ifndef _DOWRAPPERTRANSFERABLE_HXX_ - #include "DOTransferable.hxx" - #endif --#include "..\misc\ImplHelper.hxx" --#include "..\misc\WinClip.hxx" -+#include "../misc/ImplHelper.hxx" -+#include "../misc/WinClip.hxx" - #include "DTransHelper.hxx" --#include "..\misc\ImplHelper.hxx" -+#include "../misc/ImplHelper.hxx" - #include "TxtCnvtHlp.hxx" - #include "MimeAttrib.hxx" - #include "FmtFilter.hxx" ---- dtrans/source/win32/dtobj/FetcList.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/FetcList.cxx 2008-10-29 20:30:06.000000000 +0100 -@@ -43,8 +43,8 @@ - #ifndef _DATAFORMATTRANSLATOR_HXX_ - #include "DataFmtTransl.hxx" - #endif --#include "..\misc\ImplHelper.hxx" --#include "..\misc\WinClip.hxx" -+#include "../misc/ImplHelper.hxx" -+#include "../misc/WinClip.hxx" - - #include - ---- dtrans/source/win32/dtobj/DtObjFactory.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/DtObjFactory.cxx 2008-10-29 20:30:09.000000000 +0100 -@@ -34,7 +34,7 @@ - //------------------------------------------------------------------------ - // includes - //------------------------------------------------------------------------ --#include "..\..\inc\DtObjFactory.hxx" -+#include "../../inc/DtObjFactory.hxx" - - #ifndef _TWRAPPERDATAOBJECT_HXX_ - #include "XTDataObject.hxx" ---- dtrans/source/win32/dtobj/Fetc.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/Fetc.cxx 2008-10-29 20:30:06.000000000 +0100 -@@ -36,7 +36,7 @@ - //------------------------------------------------------------------------ - #include - #include "Fetc.hxx" --#include "..\misc\ImplHelper.hxx" -+#include "../misc/ImplHelper.hxx" - - //------------------------------------------------------------------------ - // ---- dtrans/source/win32/dtobj/DataFmtTransl.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/DataFmtTransl.cxx 2008-10-29 20:30:06.000000000 +0100 -@@ -38,8 +38,8 @@ - #include - #include - #include --#include "..\misc\ImplHelper.hxx" --#include "..\misc\WinClip.hxx" -+#include "../misc/ImplHelper.hxx" -+#include "../misc/WinClip.hxx" - #include "MimeAttrib.hxx" - #include "DTransHelper.hxx" - #include ---- dtrans/source/win32/dtobj/XTDataObject.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/XTDataObject.cxx 2008-10-29 20:42:42.000000000 +0100 -@@ -39,8 +39,8 @@ - #ifndef _TXDATAOBJECT_HXX_ - #include "XTDataObject.hxx" - #endif --#include --#include "..\misc\ImplHelper.hxx" -+#include -+#include "../misc/ImplHelper.hxx" - #include "DTransHelper.hxx" - #include "TxtCnvtHlp.hxx" - #include ---- dtrans/source/win32/dtobj/XTDataObject.hxx.pristine 2008-10-29 20:41:49.000000000 +0100 -+++ dtrans/source/win32/dtobj/XTDataObject.hxx 2008-10-29 20:41:28.000000000 +0100 -@@ -45,7 +45,7 @@ - #endif - - #ifndef _FETCLIST_HXX_ --#include "FEtcList.hxx" -+#include "FetcList.hxx" - #endif - - #if defined _MSC_VER ---- dtrans/source/win32/dtobj/FmtFilter.cxx.pristine 2008-10-29 20:12:03.000000000 +0100 -+++ dtrans/source/win32/dtobj/FmtFilter.cxx 2008-10-29 20:51:01.000000000 +0100 -@@ -38,9 +38,14 @@ - #pragma warning(push,1) - #pragma warning(disable:4917) - #endif --#include -+#include -+#ifndef __MINGW32__ -+#include -+#else /* __MINGW32__ */ -+#include -+#endif /* __MINGW32__ */ - #include --#include -+#include - #include - #if defined _MSC_VER - #pragma warning(pop) ---- dtrans/source/win32/dtobj/XNotifyingDataObject.cxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/XNotifyingDataObject.cxx 2008-10-29 20:30:09.000000000 +0100 -@@ -32,9 +32,9 @@ - #include "precompiled_dtrans.hxx" - #include - #include "XNotifyingDataObject.hxx" --#include "..\clipb\WinClipbImpl.hxx" --#include "..\clipb\WinClipboard.hxx" --#include "..\..\inc\DtObjFactory.hxx" -+#include "../clipb/WinClipbImpl.hxx" -+#include "../clipb/WinClipboard.hxx" -+#include "../../inc/DtObjFactory.hxx" - - #ifdef __MINGW32__ - #define __uuidof(I) IID_##I ---- dtrans/source/win32/dtobj/DTransHelper.hxx.pristine 2008-10-29 20:36:59.000000000 +0100 -+++ dtrans/source/win32/dtobj/DTransHelper.hxx 2008-10-29 20:30:06.000000000 +0100 -@@ -43,7 +43,7 @@ - #if defined _MSC_VER - #pragma warning(pop) - #endif --#include "..\misc\WinClip.hxx" -+#include "../misc/WinClip.hxx" - - //------------------------------------------------------------------------ - // defines ---- dtrans/source/win32/dtobj/XNotifyingDataObject.hxx.pristine 2008-10-29 20:10:38.000000000 +0100 -+++ dtrans/source/win32/dtobj/XNotifyingDataObject.hxx 2008-10-29 20:10:50.000000000 +0100 -@@ -43,8 +43,8 @@ - #if defined _MSC_VER - #pragma warning(push,1) - #endif --#include - #include -+#include - #if defined _MSC_VER - #pragma warning(pop) - #endif ---- dtrans/source/inc/MtaOleClipb.hxx.pristine 2008-10-29 20:11:24.000000000 +0100 -+++ dtrans/source/inc/MtaOleClipb.hxx 2008-10-29 20:11:39.000000000 +0100 -@@ -37,6 +37,7 @@ - #if defined _MSC_VER - #pragma warning(push,1) - #endif -+#include - #include - #if defined _MSC_VER - #pragma warning(pop) diff --git a/patches/openoffice-embeddedobj-mingw.patch b/patches/openoffice-embeddedobj-mingw.patch deleted file mode 100644 index 5febe9286..000000000 --- a/patches/openoffice-embeddedobj-mingw.patch +++ /dev/null @@ -1,259 +0,0 @@ ---- embeddedobj/source/msole/olepersist.cxx.~1.39.~ 2008-07-22 16:39:36.000000000 +0200 -+++ embeddedobj/source/msole/olepersist.cxx 2008-11-03 15:52:02.000000000 +0100 -@@ -176,7 +176,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUS - - return aResult; - } --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - ::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const ::rtl::OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) - throw( io::IOException, uno::RuntimeException ) - { -@@ -229,7 +229,7 @@ void LetCommonStoragePassBeUsed_Impl( co - xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ), - uno::makeAny( (sal_Bool)sal_True ) ); - } --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - //------------------------------------------------------ - void VerbExecutionController::StartControlExecution() - { -@@ -818,7 +818,7 @@ uno::Reference< io::XStream > OleEmbedde - m_aTempURL = ::rtl::OUString(); - } - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - // retry to create the component after recovering - GetRidOfComponent(); - -@@ -889,7 +889,7 @@ void OleEmbeddedObject::SwitchOwnPersist - SwitchOwnPersistence( xNewParentStorage, xNewOwnStream, aNewName ); - } - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - //---------------------------------------------- - sal_Bool OleEmbeddedObject::SaveObject_Impl() - { -@@ -1215,7 +1215,7 @@ void OleEmbeddedObject::StoreToLocation_ - - sal_Bool bStoreLoaded = sal_False; - if ( m_nObjectState == embed::EmbedStates::LOADED --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - // if the object was NOT modified after storing it can be just copied - // as if it was in loaded state - || ( m_pOleComponent && !m_pOleComponent->IsDirty() ) -@@ -1255,7 +1255,7 @@ void OleEmbeddedObject::StoreToLocation_ - bVisReplIsStored = HasVisReplInStream(); - bStoreLoaded = sal_True; - } --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - else if ( m_pOleComponent ) - { - xTargetStream = -@@ -1457,7 +1457,7 @@ void SAL_CALL OleEmbeddedObject::setPers - if ( lArguments[nInd].Name.equalsAscii( "ReadOnly" ) ) - lArguments[nInd].Value >>= m_bReadOnly; - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - sal_Int32 nStorageMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE; - #endif - -@@ -1467,7 +1467,7 @@ void SAL_CALL OleEmbeddedObject::setPers - if ( lObjArgs[nInd].Name.equalsAscii( "StoreVisualReplacement" ) ) - lObjArgs[nInd].Value >>= m_bStoreVisRepl; - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( nEntryConnectionMode == embed::EntryInitModes::DEFAULT_INIT ) - { - if ( m_bFromClipboard ) -@@ -1864,7 +1864,7 @@ void SAL_CALL OleEmbeddedObject::storeOw - - sal_Bool bStoreLoaded = sal_True; - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_nObjectState != embed::EmbedStates::LOADED && m_pOleComponent && m_pOleComponent->IsDirty() ) - { - bStoreLoaded = sal_False; -@@ -2078,7 +2078,7 @@ void SAL_CALL OleEmbeddedObject::breakLi - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_pOleComponent ) - { - // TODO: create an object based on the link ---- embeddedobj/source/msole/oleembed.cxx.~1.24.~ 2008-07-22 16:39:09.000000000 +0200 -+++ embeddedobj/source/msole/oleembed.cxx 2008-11-03 15:52:51.000000000 +0100 -@@ -63,7 +63,7 @@ - - using namespace ::com::sun::star; - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - //---------------------------------------------- - void OleEmbeddedObject::SwitchComponentToRunningState_Impl() - { -@@ -478,7 +478,7 @@ void SAL_CALL OleEmbeddedObject::changeS - if ( m_nObjectState == nNewState ) - return; - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_pOleComponent ) - { - if ( m_nTargetState != -1 ) -@@ -631,7 +631,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleE - throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ), - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_pOleComponent ) - { - if ( m_nObjectState == embed::EmbedStates::LOADED ) -@@ -705,7 +705,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( - throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ), - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_pOleComponent ) - { - sal_Int32 nOldState = m_nObjectState; -@@ -822,7 +822,7 @@ uno::Sequence< embed::VerbDescriptor > S - if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ), - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_pOleComponent ) - { - // registry could be used in this case -@@ -987,7 +987,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::ge - - sal_Int64 nResult = 0; - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_bGotStatus && m_nStatusAspect == nAspect ) - nResult = m_nStatus; - else if ( m_pOleComponent ) ---- embeddedobj/source/msole/makefile.mk.~1.15.~ 2008-04-11 06:59:23.000000000 +0200 -+++ embeddedobj/source/msole/makefile.mk 2008-11-01 14:30:00.000000000 +0100 -@@ -74,7 +74,7 @@ EXCEPTIONSFILES= \ - $(SLO)$/olemisc.obj\ - $(SLO)$/ownview.obj - --.IF "$(GUI)"=="WNT" -+.IF "$(GUI)"=="WNT" && "$(CROSS_COMPILING)" == "no" - - SLOFILES += \ - $(SLO)$/graphconvert.obj\ -@@ -90,7 +90,7 @@ EXCEPTIONSFILES += \ - $(SLO)$/xdialogcreator.obj\ - $(SLO)$/advisesink.obj - --.ENDIF -+.ENDIF # "$(GUI)"=="WNT" && "$(CROSS_COMPILING)" - - SHL1OBJS= $(SLOFILES) - ---- embeddedobj/source/msole/olemisc.cxx.~1.28.~ 2008-07-22 16:39:22.000000000 +0200 -+++ embeddedobj/source/msole/olemisc.cxx 2008-11-03 15:53:24.000000000 +0100 -@@ -112,7 +112,7 @@ OleEmbeddedObject::OleEmbeddedObject( co - , m_bTriedConversion( sal_False ) - { - } --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - //------------------------------------------------------ - // this constructor let object be initialized from clipboard - OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) -@@ -188,7 +188,7 @@ void OleEmbeddedObject::MakeEventListene - } - } - } --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - //---------------------------------------------- - void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ) - { -@@ -233,7 +233,7 @@ void OleEmbeddedObject::StateChangeNotif - //------------------------------------------------------ - void OleEmbeddedObject::GetRidOfComponent() - { --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - if ( m_pOleComponent ) - { - if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED ) ---- embeddedobj/source/msole/oleregister.cxx.~1.6.~ 2008-04-11 07:01:19.000000000 +0200 -+++ embeddedobj/source/msole/oleregister.cxx 2008-11-03 15:52:36.000000000 +0100 -@@ -65,7 +65,7 @@ void * SAL_CALL component_getFactory( co - OleEmbeddedObjectFactory::impl_staticCreateSelfInstance, - OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() ); - } --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - // the following service makes sence only on windows - else if ( aImplName.equals( MSOLEDialogObjectCreator::impl_staticGetImplementationName() ) ) - { -@@ -102,7 +102,7 @@ sal_Bool SAL_CALL component_writeInfo( v - for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) - xNewKey->createKey( rServices.getConstArray()[ind] ); - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - // the following service makes sence only on windows - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - MSOLEDialogObjectCreator::impl_staticGetImplementationName() + ---- embeddedobj/source/msole/platform.h.~1.7.~ 2008-04-11 07:02:49.000000000 +0200 -+++ embeddedobj/source/msole/platform.h 2008-11-01 14:23:32.000000000 +0100 -@@ -42,7 +42,9 @@ - #pragma warning(disable: 4548 4555 4917) - #endif - #include "windows.h" --#ifdef __MINGW32__ -+#if defined (__MINGW32__) && defined (__CROSS__) -+#include -+#elif defined __MINGW32__ - #include - #else - #if defined(_MSC_VER) && (_MSC_VER > 1310) ---- embeddedobj/source/msole/olevisual.cxx.~1.22.~ 2008-07-22 16:39:49.000000000 +0200 -+++ embeddedobj/source/msole/olevisual.cxx 2008-11-03 15:53:07.000000000 +0100 -@@ -120,7 +120,7 @@ void SAL_CALL OleEmbeddedObject::setVisu - throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not loaded!\n" ), - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - // RECOMPOSE_ON_RESIZE misc flag means that the object has to be switched to running state on resize. - // SetExtent() is called only for objects that require it, - // it should not be called for MSWord documents to workaround problem i49369 -@@ -202,7 +202,7 @@ awt::Size SAL_CALL OleEmbeddedObject::ge - - awt::Size aResult; - --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - // TODO/LATER: Support different aspects - if ( m_pOleComponent && !m_bHasSizeToSet && nAspect == embed::Aspects::MSOLE_CONTENT ) - { -@@ -365,7 +365,7 @@ embed::VisualRepresentation SAL_CALL Ole - { - return GetVisualRepresentationInNativeFormat_Impl( m_xCachedVisualRepresentation ); - } --#ifdef WNT -+#if defined (WNT) && !defined (__CROSS__) - else if ( m_pOleComponent ) - { - try diff --git a/patches/openoffice-external-mingwheaders.patch b/patches/openoffice-external-mingwheaders.patch deleted file mode 100644 index f85e1f7de..000000000 --- a/patches/openoffice-external-mingwheaders.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- external/mingwheaders/makefile.mk.pristine 2008-06-06 18:46:47.000000000 +0200 -+++ external/mingwheaders/makefile.mk 2008-10-22 09:10:58.000000000 +0200 -@@ -35,17 +35,26 @@ - - .INCLUDE : settings.mk - --.IF "$(OS)$(COM)" == "WNTGCC" -+.IF "$(OS)$(COM)" == "WNTGCC" && "$(CROSS_COMPILING)" != "yes" -+# patches fail with i686-mingw-gcc built from 4.1.1 -+# How this is supposed to work, patching mingw header files -+# without patching the mingw libraries? Why not fix OO.o -+# client code to work with latest mingw? - - # Cygwin and MinGW use different directories for the W32API headers - .IF "$(USE_MINGW)" == "cygwin" - MINGW_INCLUDE_DIR=$/usr$/include/mingw/include/ - MINGW_W32API_INCLUDE_DIR=$/usr$/include/w32api/ - MINGW_W32API_LIB_DIR=$/usr$/include/w32api/ --.ELSE -+.ELIF "$(CROSS_COMPILING)" == "no" - MINGW_INCLUDE_DIR=$(COMPATH)$/include/ - MINGW_W32API_INCLUDE_DIR=$(COMPATH)$/include/ - MINGW_W32API_LIB_DIR=$(COMPATH)$/lib/ -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+MINGW_INCLUDE_DIR=$(COMPATH)/../../include/ -+MINGW_W32API_INCLUDE_DIR=$(COMPATH)/../../include/ -+MINGW_W32API_LIB_DIR=$(COMPATH)/../../lib/ -+PSDK_HOME=$(COMPATH)/../.. - .ENDIF - - SYS_INCLUDE_DIR=$(MINGW_INCLUDE_DIR)$/sys/ -@@ -184,29 +189,33 @@ - $(COPY) $(FILES_TO_COPY_FROM_MINGW:^$(MINGW_INCLUDE_DIR)) $(MISC)$/mingw$/include - $(COPY) $(FILES_TO_COPY_FROM_W32API:^$(MINGW_W32API_INCLUDE_DIR)) $(MISC)$/mingw$/include - $(COPY) $(FILES_TO_COPY_FROM_SYS:^$(SYS_INCLUDE_DIR)) $(MISC)$/mingw$/include$/sys -- $(COPY) $(FILES_TO_COPY_FROM_PSDK:^$(PSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include -+ $(COPY) $(FILES_TO_COPY_FROM_PSDK:^$(PSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include || : -+.IF "$(DIRECTXSDK_HOME)" != "" - $(COPY) $(FILES_TO_COPY_FROM_DIRECTXSDK:^$(DIRECTXSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include -+.ENDIF # "$(DIRECTXSDK_HOME)" != "" - $(TOUCH) $(MISC)$/mingwheader_copy - - .IF "$(DISABLE_ATL)"=="" - $(MINGWHEADER_ATL_COPY_TARGET): - $(MKDIRHIER) $(MISC)$/mingw$/include/atl - $(COPY) $(FILES_TO_COPY_FROM_ATL:^$(ATL_INCLUDE_DIR)) $(MISC)$/mingw$/include$/atl -- $(TOUCH) $(MINGWHEADER_ATL_COPY_TARGET) -+ $(TOUCH) $(MINGWHEADER_ATL_COPY_TARGET) - .ENDIF - - $(LB)$/libmsvcrt.a: - .IF "$(USE_MINGW)" == "cygwin" -- $(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/mingw/libmsvcrt.a > $(MISC)$/msvcrt.nm -+ $(WRAPCMD) $(NM) -g --defined-only $(COMPATH)$/lib/mingw/libmsvcrt.a > $(MISC)$/msvcrt.nm -+.ELIF "$(CROSS_COMPILING)" == "no" -+ $(WRAPCMD) $(NM) -g --defined-only $(COMPATH)$/lib/libmsvcrt.a > $(MISC)$/msvcrt.nm - .ELSE -- $(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/libmsvcrt.a > $(MISC)$/msvcrt.nm --.ENDIF -+ $(WRAPCMD) $(NM) -g --defined-only $(COMPATH)/../../lib/libmsvcrt.a > $(MISC)$/msvcrt.nm -+.ENDIF # "$(CROSS_COMPILING)" == "yes" - echo EXPORTS > $(MISC)$/msvcrt.def - sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def - -sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \ - sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def - cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def -- dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a -+ $(DLLTOOL) --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a - - clean: - -$(RM) $(MISC)$/mingw$/include$/*.h diff --git a/patches/openoffice-fpicker-mingw.patch b/patches/openoffice-fpicker-mingw.patch deleted file mode 100644 index 10cef1e0a..000000000 --- a/patches/openoffice-fpicker-mingw.patch +++ /dev/null @@ -1,261 +0,0 @@ ---- fpicker/source/win32/folderpicker/MtaFop.hxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/folderpicker/MtaFop.hxx 2008-10-31 17:44:49.000000000 +0100 -@@ -48,7 +48,7 @@ - #if defined _MSC_VER - #pragma warning(pop) - #endif --#include "..\misc\WinImplHelper.hxx" -+#include "../misc/WinImplHelper.hxx" - - //---------------------------------------------------------------- - // a simple helper class used to provide a buffer for different ---- fpicker/source/win32/folderpicker/makefile.mk.pristine 2008-10-31 17:41:41.000000000 +0100 -+++ fpicker/source/win32/folderpicker/makefile.mk 2008-10-31 17:44:49.000000000 +0100 -@@ -45,9 +45,9 @@ COMP1TYPELIST=$(TARGET) - # enable rtti - CFLAGS+=-GR - --SLOFILES=$(SLO)$/fopentry.obj\ -- $(SLO)$/folderpicker.obj\ -- $(SLO)$/WinFopImpl.obj\ -+SLOFILES=$(SLO)$/Fopentry.obj\ -+ $(SLO)$/FolderPicker.obj\ -+ $(SLO)$/WinFOPImpl.obj\ - $(SLO)$/MtaFop.obj - - # --- Targets ------------------------------------------------------ ---- fpicker/source/win32/folderpicker/Fopentry.cxx.pristine 2008-10-31 17:41:41.000000000 +0100 -+++ fpicker/source/win32/folderpicker/Fopentry.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -39,7 +39,7 @@ - #include - - #ifndef _FILEPICKER_HXX_ --#include "folderpicker.hxx" -+#include "FolderPicker.hxx" - #endif - - #ifndef _FPSERVICEINFO_HXX_ ---- fpicker/source/win32/folderpicker/workbench/Test_fops.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/folderpicker/workbench/Test_fops.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -62,7 +62,7 @@ - #include - - #ifndef _FPSERVICEINFO_HXX_ --#include "..\FOPServiceInfo.hxx" -+#include "../FOPServiceInfo.hxx" - #endif - - #include ---- fpicker/source/win32/folderpicker/FolderPicker.cxx.pristine 2008-10-31 17:41:41.000000000 +0100 -+++ fpicker/source/win32/folderpicker/FolderPicker.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -37,7 +37,7 @@ - #include - - #ifndef _FOLDERPICKER_HXX_ --#include "folderpicker.hxx" -+#include "FolderPicker.hxx" - #endif - #include - #include "WinFOPImpl.hxx" ---- fpicker/source/win32/folderpicker/MtaFop.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/folderpicker/MtaFop.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -36,7 +36,7 @@ - #include "MtaFop.hxx" - #include - #include --#include "..\misc\resourceprovider.hxx" -+#include "../misc/resourceprovider.hxx" - - #include - ---- fpicker/source/win32/filepicker/FilePicker.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/FilePicker.cxx 2008-10-31 18:47:21.000000000 +0100 -@@ -41,12 +41,12 @@ - #include - - #ifndef _FILEPICKER_HXX_ --#include "filepicker.hxx" -+#include "FilePicker.hxx" - #endif - #include "WinFileOpenImpl.hxx" - - #include "FPServiceInfo.hxx" --#include "..\misc\WinImplHelper.hxx" -+#include "../misc/WinImplHelper.hxx" - #include - #include "filepickereventnotification.hxx" - ---- fpicker/source/win32/filepicker/VistaFilePicker.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/VistaFilePicker.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -41,7 +41,7 @@ - - #include "VistaFilePicker.hxx" - #include "WinFileOpenImpl.hxx" --#include "..\misc\WinImplHelper.hxx" -+#include "../misc/WinImplHelper.hxx" - #include "shared.hxx" - - #include ---- fpicker/source/win32/filepicker/controlaccess.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/controlaccess.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -38,7 +38,7 @@ - #include - #include - #include "controlaccess.hxx" --#include "..\misc\WinImplHelper.hxx" -+#include "../misc/WinImplHelper.hxx" - - //------------------------------------------------------------ - // we are using a table based algorithm to dispatch control ---- fpicker/source/win32/filepicker/makefile.mk.pristine 2008-10-31 17:41:41.000000000 +0100 -+++ fpicker/source/win32/filepicker/makefile.mk 2008-10-31 17:44:49.000000000 +0100 -@@ -55,7 +55,7 @@ CDEFS+=-UWINVER -DWINVER=0x500 - # --- Resources ---------------------------------------------------- - - .IF "$(GUI)" == "WNT" --RCFILES=fps.rc -+RCFILES=Fps.rc - .ENDIF - - # --- Files -------------------------------------------------------- -@@ -80,9 +80,14 @@ SLOFILES=$(SLO)$/FileOpenDlg.obj\ - $(SLO)$/customcontrolfactory.obj\ - $(SLO)$/dialogcustomcontrols.obj\ - $(SLO)$/asyncrequests.obj\ -+# -+ -+.IF "$(CROSS_COMPILING)" == "no" -+SLOFILES +=\ - $(SLO)$/VistaFilePickerEventHandler.obj\ - $(SLO)$/VistaFilePickerImpl.obj\ - $(SLO)$/VistaFilePicker.obj -+.ENDIF # "$(CROSS_COMPILING)" == "no" - - # --- Targets ------------------------------------------------------ - ---- fpicker/source/win32/filepicker/WinFileOpenImpl.hxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/WinFileOpenImpl.hxx 2008-10-31 17:44:49.000000000 +0100 -@@ -47,7 +47,7 @@ - #include "helppopupwindow.hxx" - #include "customcontrol.hxx" - #include "customcontrolfactory.hxx" --#include "..\misc\resourceprovider.hxx" -+#include "../misc/resourceprovider.hxx" - - #include - #include ---- fpicker/source/win32/filepicker/comptr.hxx.pristine 2008-10-31 17:41:41.000000000 +0100 -+++ fpicker/source/win32/filepicker/comptr.hxx 2008-10-31 17:44:49.000000000 +0100 -@@ -33,7 +33,9 @@ - - #include - #include -+#ifndef __MINGW32__ - #include -+#endif /* __MINGW32__ */ - - template< class T_INTERFACE , - REFIID P_IID = IID_NULL , ---- fpicker/source/win32/filepicker/WinFileOpenImpl.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/WinFileOpenImpl.cxx 2008-10-31 18:47:42.000000000 +0100 -@@ -44,11 +44,11 @@ - #include - #include - #include --#include --#include "..\misc\WinImplHelper.hxx" -+#include -+#include "../misc/WinImplHelper.hxx" - - #ifndef _FILEPICKER_HXX_ --#include "filepicker.hxx" -+#include "FilePicker.hxx" - #endif - #include "controlaccess.hxx" - #include ---- fpicker/source/win32/filepicker/workbench/Test_fps.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/workbench/Test_fps.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -70,7 +70,7 @@ - #include - #include - --#include "..\FPServiceInfo.hxx" -+#include "../FPServiceInfo.hxx" - - // - // namesapces ---- fpicker/source/win32/filepicker/filepickerstate.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/filepickerstate.cxx 2008-10-31 18:47:58.000000000 +0100 -@@ -39,7 +39,7 @@ - #include "controlaccess.hxx" - #include - #include --#include -+#include - #include - #include "controlcommandrequest.hxx" - #include "controlcommandresult.hxx" -@@ -49,7 +49,7 @@ - #include "FileOpenDlg.hxx" - - #include --#include "..\misc\WinImplHelper.hxx" -+#include "../misc/WinImplHelper.hxx" - //--------------------------------------------- - // - //--------------------------------------------- ---- fpicker/source/win32/filepicker/getfilenamewrapper.cxx.pristine 2008-10-31 17:41:41.000000000 +0100 -+++ fpicker/source/win32/filepicker/getfilenamewrapper.cxx 2008-10-31 17:44:49.000000000 +0100 -@@ -48,6 +48,10 @@ - #pragma warning(pop) - #endif - -+#ifdef __MINGW32__ -+#include -+#endif /* __MINGW32__ */ -+ - namespace /* private */ - { - ---- fpicker/source/win32/filepicker/FPentry.cxx.pristine 2008-10-29 21:13:36.000000000 +0100 -+++ fpicker/source/win32/filepicker/FPentry.cxx 2008-10-31 18:45:17.000000000 +0100 -@@ -41,8 +41,10 @@ - #include "FPServiceInfo.hxx" - - #pragma warning (disable:4917) -+#ifndef __MINGW32__ - #include "VistaFilePicker.hxx" --#include "..\misc\WinImplHelper.hxx" -+#endif /* __MINGW32__ */ -+#include "../misc/WinImplHelper.hxx" - #include - - //----------------------------------------------- -@@ -66,6 +68,7 @@ static Reference< XInterface > SAL_CALL - const Reference< XMultiServiceFactory >& rServiceManager ) - { - Reference< XInterface > xDlg; -+#ifndef __MINGW32__ - bool bVista = IsWindowsVista(); - - if (bVista) -@@ -76,6 +79,7 @@ static Reference< XInterface > SAL_CALL - new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) ); - } - else -+#endif /* __MINGW32__ */ - { - fprintf(stdout, "use normal system file picker ...\n"); - xDlg.set( ---- fpicker/source/win32/filepicker/vistatypes.h.pristine 2008-10-31 17:41:41.000000000 +0100 -+++ fpicker/source/win32/filepicker/vistatypes.h 2008-10-31 17:44:49.000000000 +0100 -@@ -36,7 +36,9 @@ - //----------------------------------------------------------------------------- - - #include "comptr.hxx" -+#ifndef __MINGW32__ - #include -+#endif /* __MINGW32__ */ - - //----------------------------------------------------------------------------- - // namespace diff --git a/patches/openoffice-funit-char-line.patch b/patches/openoffice-funit-char-line.patch deleted file mode 100644 index 27daa07fd..000000000 --- a/patches/openoffice-funit-char-line.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ./rsc/inc/vclrsc.hxx.old 2009-04-02 10:44:31.000000000 +0000 -+++ ./rsc/inc/vclrsc.hxx 2009-04-06 16:41:41.000000000 +0000 -@@ -176,7 +176,7 @@ typedef sal_Int64 WinBits; - // from vcl/inc/fldunit.hxx - enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM, - FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA, -- FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM, -+ FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM, - FUNIT_PERCENT, FUNIT_100TH_MM }; - - ---- ./rsc/source/parser/rscibas.cxx.old 2009-04-02 10:44:31.000000000 +0000 -+++ ./rsc/source/parser/rscibas.cxx 2009-04-06 16:41:41.000000000 +0000 -@@ -240,6 +240,9 @@ RscEnum * RscTypCont::InitFieldUnitsType - SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT ); - SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE ); - SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM ); -+ // Amelia : adds two units ,"char" and "line" -+ SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR ); -+ SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE ); - SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT ); - - return pFieldUnits; diff --git a/patches/openoffice-goodies-mingw.patch b/patches/openoffice-goodies-mingw.patch deleted file mode 100644 index 39527d0fa..000000000 --- a/patches/openoffice-goodies-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- goodies/source/inv/makefile.mk.~1.21.~ 2008-07-22 19:45:33.000000000 +0200 -+++ goodies/source/inv/makefile.mk 2009-02-15 21:35:25.000000000 +0100 -@@ -114,7 +114,7 @@ $(BIN)$/applicat.rdb : makefile.mk $(SOL - rm -f $@ - $(GNUCOPY) $(SOLARBINDIR)$/types.rdb $@ - cd $(BIN) && \ -- regcomp -register -r applicat.rdb \ -+ $(REGCOMP) -register -r applicat.rdb \ - -c i18npool.uno$(DLLPOST) - - # --- Def-File --- diff --git a/patches/openoffice-helpcontent2-mingw.patch b/patches/openoffice-helpcontent2-mingw.patch deleted file mode 100644 index ad4b84f7d..000000000 --- a/patches/openoffice-helpcontent2-mingw.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- helpcontent2/util/target.pmk.pristine 2009-04-22 11:13:36.202219858 +0200 -+++ helpcontent2/util/target.pmk 2009-04-22 11:15:17.262216225 +0200 -@@ -38,8 +38,14 @@ ALLTAR : $(LINKALLTARGETS) - JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) - .ENDIF - -+.IF "$(CROSS_COMPILING)" == "no" -+HELPLINKER=HelpLinker -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+HELPLINKER=$(SOLARBINDIR)/HelpLinker.exe -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst -- $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) -+ $(WRAPCMD) $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) - .IF "$(SOLAR_JAVA)" == "TRUE" - $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexer -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ - .ELSE diff --git a/patches/openoffice-i18npool-cross.patch b/patches/openoffice-i18npool-cross.patch deleted file mode 100644 index dccd2d9d8..000000000 --- a/patches/openoffice-i18npool-cross.patch +++ /dev/null @@ -1,103 +0,0 @@ -i18npool/source/textconversion/data/makefile.mk ---- i18npool/source/textconversion/data/makefile.mk.~1.7.~ 2008-04-10 11:11:44.000000000 +0200 -+++ i18npool/source/textconversion/data/makefile.mk 2008-10-28 16:48:36.000000000 +0100 -@@ -64,9 +64,16 @@ LIB1OBJFILES=$(SHL1OBJS) - .INCLUDE : target.mk - - APP1TARGET = genconv_dict -+ -+.IF "$(CROSS_COMPILING)" == "no" -+GENCONV_DICT = $(BIN)$/genconv_dict$(EXECPOST) -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+GENCONV_DICT = $(OOO_TOOLS_DIR)/genconv_dict -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - $(MISC)$/%.cxx : %.dic -- $(BIN)$/genconv_dict $* $< $@ -+ $(GENCONV_DICT) $* $< $@ - - # ugly - is this dependency really required here? --$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST) -+$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(GENCONV_DICT) - -i18npool/source/localedata/data/makefile.mk ---- i18npool/source/localedata/data/makefile.mk.~1.47.~ 2008-04-10 11:06:09.000000000 +0200 -+++ i18npool/source/localedata/data/makefile.mk 2008-10-28 16:45:45.000000000 +0100 -@@ -486,7 +486,13 @@ DEPOBJFILES= \ - - $(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST) - -+.IF "$(CROSS_COMPILING)" == "no" -+SAXPARSER = $(BIN)$/saxparser$(EXECPOST) -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+SAXPARSER = $(OOO_TOOLS_DIR)/saxparser -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - $(MISC)$/localedata_%.cxx : %.xml -- $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb -+ $(WRAPCMD) $(SAXPARSER) $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb - $(RM) $(BIN)$/$(@:b).rdb - -i18npool/source/collator/data/makefile.mk ---- i18npool/source/collator/data/makefile.mk.~1.7.~ 2008-04-10 10:58:10.000000000 +0200 -+++ i18npool/source/collator/data/makefile.mk 2008-10-28 16:42:36.000000000 +0100 -@@ -60,9 +60,15 @@ SHL1OBJS=$(SLOFILES) - # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk - -+.IF "$(CROSS_COMPILING)" == "no" -+GENCOLL_RULE = $(BIN)$/gencoll_rule$(EXECPOST) -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+GENCOLL_RULE = $(OOO_TOOLS_DIR)/gencoll_rule -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - $(MISC)$/collator_%.cxx : %.txt -- $(BIN)$/gencoll_rule $< $@ $* -+ $(GENCOLL_RULE) $< $@ $* - - # ugly - is this dependency really required here? --$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST) -+$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/$(GENCOLL_RULE) - -i18npool/source/indexentry/data/makefile.mk ---- i18npool/source/indexentry/data/makefile.mk.~1.7.~ 2008-04-10 11:01:24.000000000 +0200 -+++ i18npool/source/indexentry/data/makefile.mk 2008-10-28 16:44:07.000000000 +0100 -@@ -63,9 +63,15 @@ LIB1OBJFILES=$(SHL1OBJS) - # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk - -+.IF "$(CROSS_COMPILING)" == "no" -+GENINDEX_DATA = $(BIN)$/genindex_data$(EXECPOST) -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+GENINDEX_DATA = $(OOO_TOOLS_DIR)/genindex_data -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - $(MISC)$/%.cxx : %.txt -- $(BIN)$/genindex_data $< $@ $* -+ $(GENINDEX_DATA) $< $@ $* - - # ugly - is this dependency really required here? --$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST) -+$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/$(GENINDEX_DATA) - -i18npool/source/breakiterator/data/makefile.mk ---- i18npool/source/breakiterator/data/makefile.mk.~1.9.~ 2008-04-10 10:54:04.000000000 +0200 -+++ i18npool/source/breakiterator/data/makefile.mk 2008-10-28 16:40:03.000000000 +0100 -@@ -80,9 +80,15 @@ DEPOBJFILES= \ - # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk - -+.IF "$(CROSS_COMPILING)" == "no" -+GENDICT = $(BIN)$/gendict$(EXECPOST) -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+GENDICT = $(OOO_TOOLS_DIR)/gendict -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - $(MISC)$/dict_%.cxx : %.dic -- $(BIN)$/gendict $< $@ -+ $(GENDICT) $< $@ - - # ugly - is this dependency really required here? --$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST) -+$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(GENDICT) - diff --git a/patches/openoffice-i18npool-mingw.patch b/patches/openoffice-i18npool-mingw.patch deleted file mode 100644 index 364a3dae2..000000000 --- a/patches/openoffice-i18npool-mingw.patch +++ /dev/null @@ -1,16 +0,0 @@ -i18npool/source/collator/collator_unicode.cxx ---- i18npool/source/collator/collator_unicode.cxx.~1.20.~ 2008-04-10 10:57:26.000000000 +0200 -+++ i18npool/source/collator/collator_unicode.cxx 2008-10-28 16:31:43.000000000 +0100 -@@ -135,9 +135,9 @@ Collator_Unicode::loadCollatorAlgorithm( - uppercase itself, so we don't have to bother with that. - */ - icu::Locale icuLocale( -- OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(), -- OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(), -- OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr()); -+ (char const*)OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(), -+ (char const*)OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(), -+ (char const*)OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr()); - // load ICU collator - collator = (RuleBasedCollator*) icu::Collator::createInstance(icuLocale, status); - if (! U_SUCCESS(status)) throw RuntimeException(); diff --git a/patches/openoffice-icc-cross.patch b/patches/openoffice-icc-cross.patch deleted file mode 100644 index b0a5db911..000000000 --- a/patches/openoffice-icc-cross.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- icc/makefile.mk.orig 2008-10-27 20:25:57.000000000 +0100 -+++ icc/makefile.mk 2008-10-27 20:34:33.000000000 +0100 -@@ -55,7 +55,13 @@ CONVERTFILES= \ - Contrib$/ICC_utils$/Vetters.cpp - - CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip && patch -p0 < $(BACK_PATH)..$/mdv-fmtargs-buildfix.patch -+ -+.IF "$(CROSS_COMPILING)" == "no" - BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile -+.ELSE -+# FIXME: should use CC_FOR_BUILD to build the thing here -+BUILD_ACTION=dmake && cd Contrib/CmdLine/create_sRGB_profile && create_sRGB_profile -+.ENDIF - - # --- Targets ------------------------------------------------------ - diff --git a/patches/openoffice-instsetoo_native-mingw.patch b/patches/openoffice-instsetoo_native-mingw.patch deleted file mode 100644 index 1c859ba9c..000000000 --- a/patches/openoffice-instsetoo_native-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- instsetoo_native/util/makefile.mk.pristine 2008-11-09 20:12:40.000000000 +0100 -+++ instsetoo_native/util/makefile.mk 2008-11-09 20:11:53.000000000 +0100 -@@ -96,7 +96,7 @@ LOCALPYFILES= \ - # native - "Native" software distribution for the platform - # portable - Portable software distribution - --.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" -+.IF "$(BUILD_OS)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" - ALLTAR : $(LOCALPYFILES) - @echo "No EPM: do no packaging at this stage" - .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" diff --git a/patches/openoffice-lingucomponent-mingw.patch b/patches/openoffice-lingucomponent-mingw.patch deleted file mode 100644 index 92bc97702..000000000 --- a/patches/openoffice-lingucomponent-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lingucomponent/source/lingutil/lingutil.cxx.~1.4.~ 2008-06-13 16:02:52.000000000 +0200 -+++ lingucomponent/source/lingutil/lingutil.cxx 2008-11-06 14:14:09.000000000 +0100 -@@ -36,7 +36,7 @@ - #endif - - #if defined(WNT) --#include -+#include - #endif - - #if defined(WNT) diff --git a/patches/openoffice-o3tl-no-cppunit.patch b/patches/openoffice-o3tl-no-cppunit.patch deleted file mode 100644 index 82032005c..000000000 --- a/patches/openoffice-o3tl-no-cppunit.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ooo/o3tl/prj/build.lst.pristine 2009-04-06 09:29:17.000000000 +0200 -+++ ooo/o3tl/prj/build.lst 2009-04-06 09:29:23.000000000 +0200 -@@ -2,4 +2,4 @@ ot o3tl : sal testshl2 BOOST:boost NULL - ot o3tl usr1 - all ot_mkout NULL - ot o3tl\inc get - all ot_inc NULL - ot o3tl\prj get - all ot_prj NULL --ot o3tl\qa nmake - all ot_qa NULL -+#ot o3tl\qa nmake - all ot_qa NULL diff --git a/patches/openoffice-postprocess-mingw.patch b/patches/openoffice-postprocess-mingw.patch deleted file mode 100644 index e32ca8b12..000000000 --- a/patches/openoffice-postprocess-mingw.patch +++ /dev/null @@ -1,26 +0,0 @@ -Too bad, our rebase has other arguments, and they're not trivial to translate. - -rebase -C ../wntgcci.pro/misc/coffbase.txt -b 0x68000000 -e 10000 -l ../wntgcci.pro/misc/rebase_log.txt -R /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/build/ooo300-m9/solver/300/wntgcci.pro/bin -N no_rebase.txt -d -v @../wntgcci.pro/misc/rebase_new.txt -/home/janneke/vc/gub/target/tools/root/usr/bin/rebase: unknown option -- C -usage: rebase -b BaseAddress [-Vdv] [-o Offset] [-T FileList | -] Files... -Error: rebase failed with exit code 1! - - ---- postprocess/rebase/makefile.mk.~1.10.~ 2008-04-10 10:48:57.000000000 +0200 -+++ postprocess/rebase/makefile.mk 2008-11-07 17:46:19.000000000 +0100 -@@ -48,13 +48,13 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLAR - ALLTAR : REBASE - - REBASE .PHONY : $(BASEADDRESSES) --.IF "$(GUI)"=="WNT" -+.IF "$(GUI)"=="WNT" && "$(CROSS_COMPILING)" == "no" - .IF "$(product)"=="full" - $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES) - .ELSE # "$(product)"=="full" - @echo Doing nothing on non product builds ... - .ENDIF # "$(product)"=="full" --.ELSE # "$(GUI)"=="WNT" -+.ELSE # "$(GUI)"!="WNT" || "$(CROSS_COMPILING)" != "no" - @echo Nothing to do, 'rebase' is windows only. - .ENDIF - diff --git a/patches/openoffice-pyuno-mingw.patch b/patches/openoffice-pyuno-mingw.patch deleted file mode 100644 index 46068ced1..000000000 --- a/patches/openoffice-pyuno-mingw.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- pyuno/source/module/makefile.mk.pristine 2008-10-29 14:25:58.000000000 +0100 -+++ pyuno/source/module/makefile.mk 2008-10-29 14:25:33.000000000 +0100 -@@ -57,6 +57,7 @@ EXTRA_FRAMEWORK_FLAG=-framework Python - PYUNO_MODULE=$(DLLDEST)$/pyuno.so - PYUNORC=pyunorc - .ELSE -+.INCLUDEDIRS: $(PRJ)/../python - .INCLUDE : pyversion.mk - PYUNORC=pyuno.ini - .ENDIF diff --git a/patches/openoffice-sal-cross.patch b/patches/openoffice-sal-cross.patch deleted file mode 100644 index e30598637..000000000 --- a/patches/openoffice-sal-cross.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- sal/rtl/source/makefile.mk.orig 2008-10-21 15:08:00.000000000 +0200 -+++ sal/rtl/source/makefile.mk 2008-10-21 15:09:56.000000000 +0200 -@@ -196,6 +196,12 @@ $(ALWAYSDBGFILES): - - ALLTAR : $(BOOTSTRAPMK) - --$(BOOTSTRAPMK) : $(APP1TARGETN) -+.IF "$(CROSS_COMPILING)" == "no" -+GEN_MAKEFILE = $(APP1TARGETN) -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+GEN_MAKEFILE = $(TOOLS_DIR)/gen_makefile -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ -+$(BOOTSTRAPMK) : $(GEN_MAKEFILE) - $< > $@ - diff --git a/patches/openoffice-sal-mingw-c.patch b/patches/openoffice-sal-mingw-c.patch deleted file mode 100644 index b220991d8..000000000 --- a/patches/openoffice-sal-mingw-c.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- sal/osl/w32/conditn.c.~1.7.46.1.~ 2008-08-21 17:30:55.000000000 +0200 -+++ sal/osl/w32/conditn.c 2008-10-21 20:51:52.000000000 +0200 -@@ -108,7 +108,11 @@ - { - /* Only wake up if a SendMessage call to the threads message loop is detected */ - -+#ifndef __MINGW32__ - switch( MsgWaitForMultipleObjects( 1, &(HANDLE)Condition, FALSE, timeout, QS_SENDMESSAGE ) ) -+#else /* __MINGW32__ */ -+ switch( MsgWaitForMultipleObjects( 1, (HANDLE)Condition, FALSE, timeout, QS_SENDMESSAGE ) ) -+#endif /* __MINGW32__ */ - { - case WAIT_OBJECT_0 + 1: - { ---- sal/osl/w32/dllentry.c.~1.34.~ 2008-04-10 13:17:16.000000000 +0200 -+++ sal/osl/w32/dllentry.c 2008-10-21 20:56:07.000000000 +0200 -@@ -216,7 +216,9 @@ - - //We disable floating point exceptions. This is the usual state at program startup - //but on Windows 98 and ME this is not always the case. -+#ifndef __MINGW32__ - _control87(_MCW_EM, _MCW_EM); -+#endif - #ifdef __MINGW32__ - atexit(do_cleanup); - } ---- sal/systools/win32/uwinapi/ResolveUnicows.cpp.pristine 2008-10-01 10:05:18.000000000 +0200 -+++ sal/systools/win32/uwinapi/ResolveUnicows.cpp 2009-04-04 14:43:41.198056996 +0200 -@@ -227,8 +226,8 @@ DEFINE_UNICOWS_THUNK( kernel32, DWORD, W - DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetFileAttributesExW, (LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID) ) - DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFileAttributesW, (LPCWSTR) ) - DEFINE_UNICOWS_THUNK( comdlg32, short, WINAPI, GetFileTitleW, (LPCWSTR,LPWSTR,WORD) ) --DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, GetFileVersionInfoSizeW, (LPWSTR,PDWORD) ) --DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, GetFileVersionInfoW, (LPWSTR,DWORD,DWORD,PVOID) ) -+DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, GetFileVersionInfoSizeW, (const WCHAR*,DWORD*) ) -+DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, GetFileVersionInfoW, (const WCHAR*,DWORD,DWORD,PVOID) ) - DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFullPathNameW, (LPCWSTR,DWORD,LPWSTR,LPWSTR*) ) - DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetGlyphOutlineW, (HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*) ) - DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetICMProfileW, (HDC,LPDWORD,LPWSTR) ) -@@ -273,7 +272,7 @@ DEFINE_UNICOWS_THUNK( kernel32, BOOL, WI - DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeW, (DWORD,LPCWSTR,int,LPWORD) ) - DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemDirectoryW, (LPWSTR,UINT) ) - DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemWindowsDirectoryW, (LPWSTR,UINT) ) --DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,CONST INT*) ) -+DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,int*) ) - DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetTempFileNameW, (LPCWSTR,LPCWSTR,UINT,LPWSTR) ) - DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetTempPathW, (DWORD,LPWSTR) ) - DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentExPointW, ( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ) ) -@@ -452,11 +451,11 @@ DEFINE_UNICOWS_THUNK( shell32, BOOL, WIN - DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, StartDocPrinterW, (HANDLE,DWORD,PBYTE) ) - DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, StartDocW, (HDC,const DOCINFOW*) ) - DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SystemParametersInfoW, (UINT,UINT,PVOID,UINT) ) --DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,CONST INT*,int) ) -+DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,int*,int) ) - DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, TextOutW, (HDC,int,int,LPCWSTR,int) ) - DEFINE_UNICOWS_THUNK( user32, int, WINAPI, TranslateAcceleratorW, (HWND,HACCEL,LPMSG) ) - DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, UnregisterClassW, (LPCWSTR,HINSTANCE) ) --DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, UpdateICMRegKeyW, (DWORD,LPWSTR,LPWSTR,UINT) ) -+DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, UpdateICMRegKeyW, (DWORD,DWORD,LPWSTR,UINT) ) - DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, UpdateResourceW, (HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD) ) - DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerFindFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT) ) - DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerInstallFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT) ) ---- onlinecheck.cxx 10 apr 2008 14:11:15 +0200 1.8 -+++ sal/systools/win32/onlineupdate/onlinecheck.cxx 22 okt 2008 10:56:53 +0200 -@@ -45,8 +45,8 @@ - #endif - #include - #ifdef __MINGW32__ --#include --#endif -+#include -+#endif /* __MINGW32__ */ - - #define elementsof(a) (sizeof(a)/sizeof((a)[0])) - -diff -purN sal/systools/win32/uwinapi/FindFirstVolumeA.cpp sal/systools/win32/uwinapi/FindFirstVolumeA.cpp ---- sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2009-04-06 20:23:37.935495274 +0200 -+++ sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2009-04-06 20:21:51.303494448 +0200 -@@ -30,4 +30,4 @@ - - #include "macros.h" - --DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) ) -\ Geen regeleindeteken (LF) aan einde van bestand -+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPCSTR lpszVolumeName, DWORD cchBufferLength) ) -\ Geen regeleindeteken (LF) aan einde van bestand -diff -purN sal/systools/win32/uwinapi/FindFirstVolumeW.cpp sal/systools/win32/uwinapi/FindFirstVolumeW.cpp ---- sal/systools/win32/uwinapi/FindFirstVolumeW.cpp 2009-04-06 20:23:37.935495274 +0200 -+++ sal/systools/win32/uwinapi/FindFirstVolumeW.cpp 2009-04-06 20:21:51.303494448 +0200 -@@ -30,4 +30,4 @@ - - #include "macros.h" - --DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) ) -\ Geen regeleindeteken (LF) aan einde van bestand -+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPCWSTR lpszVolumeName, DWORD cchBufferLength) ) -\ Geen regeleindeteken (LF) aan einde van bestand -diff -purN sal/systools/win32/uwinapi/FindNextVolumeA.cpp sal/systools/win32/uwinapi/FindNextVolumeA.cpp ---- sal/systools/win32/uwinapi/FindNextVolumeA.cpp 2009-04-06 20:23:37.935495274 +0200 -+++ sal/systools/win32/uwinapi/FindNextVolumeA.cpp 2009-04-06 20:21:51.303494448 +0200 -@@ -30,4 +30,4 @@ - - #include "macros.h" - --DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) ) -\ Geen regeleindeteken (LF) aan einde van bestand -+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPCSTR lpszVolumeName, DWORD cchBufferLength) ) -\ Geen regeleindeteken (LF) aan einde van bestand diff --git a/patches/openoffice-sal-mingw.patch b/patches/openoffice-sal-mingw.patch deleted file mode 100644 index 8fbcda50b..000000000 --- a/patches/openoffice-sal-mingw.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- sal/osl/w32/signal.c.~1.12.~ 2008-04-10 13:22:35.000000000 +0200 -+++ sal/osl/w32/signal.c 2008-10-21 20:53:05.000000000 +0200 -@@ -37,8 +37,8 @@ - #include - #ifndef __MINGW32__ - #include --#endif - #include -+#endif /* __MINGW32__ */ - #include - - typedef struct _oslSignalHandlerImpl ---- sal/systools/win32/uwinapi/GetLongPathNameW.cpp.~1.5.~ 2008-04-10 14:18:12.000000000 +0200 -+++ sal/systools/win32/uwinapi/GetLongPathNameW.cpp 2008-10-21 21:30:26.000000000 +0200 -@@ -29,6 +29,13 @@ - ************************************************************************/ - - #define UNICODE -+ -+#ifdef __MINGW32__ -+#undef _WIN32_WINNT -+#define _WIN32_WINNT 0x0500 -+#include -+#endif /* __MINGW32__ */ -+ - #include "macros.h" - - EXTERN_C DWORD WINAPI GetLongPathNameW_NT( LPCWSTR lpShortPath, LPWSTR lpLongPath, DWORD cchBuffer ) ---- sal/systools/win32/uwinapi/GetLongPathNameA.cpp.~1.5.~ 2008-04-10 14:17:56.000000000 +0200 -+++ sal/systools/win32/uwinapi/GetLongPathNameA.cpp 2008-10-21 21:29:56.000000000 +0200 -@@ -28,7 +28,13 @@ - * - ************************************************************************/ - -+#ifdef __MINGW32__ -+#undef _WIN32_WINNT -+#define _WIN32_WINNT 0x0500 -+#include -+#endif /* __MINGW32__ */ -+ - #include "macros.h" - - IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLongPathNameA, ( LPCTSTR lpShortPath, LPTSTR lpLongPath, DWORD cchBuffer ) ) --#include "GetLongPathName.cpp" -\ Geen regeleindeteken (LF) aan einde van bestand -+#include "GetLongPathName.cpp" ---- sal/systools/win32/uwinapi/ResolveUnicows.cpp.~1.4.~ 2008-06-06 19:02:43.000000000 +0200 -+++ sal/systools/win32/uwinapi/ResolveUnicows.cpp 2008-10-21 21:53:19.000000000 +0200 -@@ -1,7 +1,6 @@ - #ifdef __MINGW32__ - #define _GDI32_ - #include "macros.h" --#include - extern "C" { - extern HMODULE hModuleUnicowsDLL; - } ---- sal/systools/win32/uwinapi/makefile.mk.~1.17.~ 2008-04-10 14:26:19.000000000 +0200 -+++ sal/systools/win32/uwinapi/makefile.mk 2008-10-21 23:43:31.000000000 +0200 -@@ -160,7 +160,7 @@ - ALL: ALLTAR $(LB)$/libuwinapi.a - - $(LB)$/libuwinapi.a: $(MISC)$/uwinapi.def -- dlltool --dllname uwinapi.dll --input-def=$(MISC)$/uwinapi.def --kill-at --output-lib=$(LB)$/libuwinapi.a -+ $(DLLTOOL) --dllname uwinapi.dll --input-def=$(MISC)$/uwinapi.def --kill-at --output-lib=$(LB)$/libuwinapi.a - .ENDIF - - .INCLUDE : target.mk ---- sal/systools/win32/uwinapi/macros.h.pristine 2008-10-27 17:30:38.000000000 +0100 -+++ sal/systools/win32/uwinapi/macros.h 2008-10-27 17:30:49.000000000 +0100 -@@ -43,7 +43,7 @@ - # ifdef UNICODE - # define _UNICODE - # endif --# include -+# include - #endif - - // Globally disable "warning C4100: unreferenced formal parameter" caused by ---- sal/osl/w32/file.cxx.orig 2008-08-06 17:36:23.000000000 +0200 -+++ sal/osl/w32/file.cxx 2008-10-21 20:53:48.000000000 +0200 -@@ -34,7 +34,7 @@ - #define UNICODE - #define _UNICODE - #define _WIN32_WINNT 0x0500 --#include "systools\win32\uwinapi.h" -+#include "systools/win32/uwinapi.h" - - #include "path_helper.hxx" - ---- sal/inc/sal/mathconf.h.~1.6.~ 2008-04-10 12:47:09.000000000 +0200 -+++ sal/inc/sal/mathconf.h 2008-04-10 12:47:24.000000000 +0200 -@@ -53,7 +53,7 @@ - problems, the SAL_MATH_FPEXCEPTIONS_OFF macro can be used to explicitly - switch off exceptions (on Windows). - */ --#if defined WNT -+#if defined (WNT) && ! defined (__MINGW32__) - #define SAL_MATH_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) - #else /* WNT */ - #define SAL_MATH_FPEXCEPTIONS_OFF() -@@ -61,16 +61,16 @@ - - - /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */ --#if defined( WNT) -+#if defined (WNT) && ! defined (__MINGW32__) - #define SAL_MATH_FINITE(d) _finite(d) - #elif defined OS2 - #define SAL_MATH_FINITE(x) \ - ((sizeof (x) == sizeof (float)) ? __isfinitef(x) \ - : (sizeof (x) == sizeof (double)) ? __isfinite(x) \ - : __isfinitel(x)) --#elif defined LINUX || defined UNX -+#elif defined LINUX || defined UNX || defined __MINGW32__ - #define SAL_MATH_FINITE(d) finite(d) --#else /* WNT, LINUX, UNX */ -+#else /* WNT, LINUX, UNX, __MINGW32__ */ - #error "SAL_MATH_FINITE not defined" - #endif /* WNT, LINUX, UNX */ - diff --git a/patches/openoffice-sccomp-mingw.patch b/patches/openoffice-sccomp-mingw.patch deleted file mode 100644 index 15ff5e112..000000000 --- a/patches/openoffice-sccomp-mingw.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- sccomp/source/solver/solver.cxx.pristine 2008-10-30 08:51:53.000000000 +0100 -+++ sccomp/source/solver/solver.cxx 2008-10-30 08:51:44.000000000 +0100 -@@ -28,6 +28,13 @@ - * - ************************************************************************/ - -+#ifdef __MINGW32__ -+#define BOOL OOO_BOOL -+#define INT32 OOO_INT32 -+#define UINT32 OOO_UINT32 -+#include -+#endif /* __MINGW32__ */ -+ - #undef LANGUAGE_NONE - #define WINAPI __stdcall - #define LoadInverseLib FALSE ---- sccomp/source/solver/solver.hxx.pristine 2008-10-30 09:23:23.000000000 +0100 -+++ sccomp/source/solver/solver.hxx 2008-10-30 09:22:41.000000000 +0100 -@@ -31,6 +31,7 @@ - #ifndef SOLVER_HXX - #define SOLVER_HXX - -+#include - #include - #include - #include diff --git a/patches/openoffice-scp2-mingw.patch b/patches/openoffice-scp2-mingw.patch deleted file mode 100644 index 6608d0ad8..000000000 --- a/patches/openoffice-scp2-mingw.patch +++ /dev/null @@ -1,283 +0,0 @@ -scp2/source/winexplorerext/file_winexplorerext.scp.pristine ---- scp2/source/winexplorerext/file_winexplorerext.scp.pristine 2008-11-27 09:24:30.000000000 +0100 -+++ scp2/source/winexplorerext/file_winexplorerext.scp 2008-11-27 09:24:08.000000000 +0100 -@@ -74,9 +74,11 @@ - End - #endif - -+#if !defined __CROSS__ - File gid_File_Lib_Shlxtmsi - TXT_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; - Name = "shlxtmsi.dll"; - End -+#endif /* !__CROSS__ */ -\ Geen regeleindeteken (LF) aan einde van bestand -scp2/source/canvas/directxcanvas.scp.pristine ---- scp2/source/canvas/directxcanvas.scp.pristine 2008-06-24 14:18:48.000000000 +0200 -+++ scp2/source/canvas/directxcanvas.scp 2008-11-26 19:32:06.000000000 +0100 -@@ -30,7 +30,7 @@ - - #include "macros.inc" - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - # ifdef USE_DIRECTX5 - SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) - # endif -scp2/source/ooo/common_brand.scp.pristine ---- scp2/source/ooo/common_brand.scp.pristine 2008-11-26 11:18:01.000000000 +0100 -+++ scp2/source/ooo/common_brand.scp 2008-11-26 19:32:06.000000000 +0100 -@@ -628,7 +628,7 @@ - End - #endif - --#if defined WNT && defined(_gcc3) -+#if defined WNT && defined(_gcc3) && !defined __CROSS__ - File gid_Brand_File_Lib_Mingwm10 - BIN_FILE_BODY; - Styles = (PACKED); -scp2/source/ooo/file_library_ooo.scp.pristine ---- scp2/source/ooo/file_library_ooo.scp.pristine 2008-11-26 11:15:27.000000000 +0100 -+++ scp2/source/ooo/file_library_ooo.scp 2008-11-27 09:20:53.000000000 +0100 -@@ -29,7 +29,7 @@ - ************************************************************************/ - #include "macros.inc" - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - File gid_File_Lib_Accessbridge - BIN_FILE_BODY; - Styles = (PACKED); -@@ -41,7 +41,7 @@ - STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas) - #endif - --#if defined(WNT) -+#if defined(WNT) && ! defined __CROSS__ - STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado) - #endif - -@@ -656,7 +656,7 @@ - - STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm) - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - File gid_File_Lib_Gdiplus - BIN_FILE_BODY; - Styles = (PACKED); -@@ -834,7 +834,7 @@ - - #endif - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - - File gid_File_Lib_sn_tools - BIN_FILE_BODY; -@@ -845,7 +845,7 @@ - - #endif - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - - File gid_File_Lib_relnotes - BIN_FILE_BODY; -@@ -957,7 +957,7 @@ File gid_File_Lib_Mozbootstrap - #ifdef UNX - Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX)); - #else -- Name = "libmozbootstrap.dll"; -+ Name = "mozbootstrap.dll"; - #endif - End - -@@ -967,7 +967,7 @@ - - STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - #if defined(_gcc3) - - File gid_File_Lib_Mingwm10 -@@ -1206,7 +1206,7 @@ - - #endif - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - - File gid_File_Lib_Reg4allmsdoc - TXT_FILE_BODY; -@@ -1217,7 +1217,7 @@ - - #endif - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - - File gid_File_Lib_Qslnkmsi - TXT_FILE_BODY; -@@ -1228,7 +1228,7 @@ - - #endif - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - - File gid_File_Lib_Sdqsmsi - TXT_FILE_BODY; -@@ -1336,12 +1336,14 @@ - - #ifdef WNT - -+#ifndef __CROSS__ - File gid_File_Lib_OOoFilt - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; - Name = "ooofilt.dll"; - End -+#endif /* !__CROSS__ */ - - File gid_File_Lib_OOoFiltProxy - TXT_FILE_BODY; -@@ -1350,12 +1352,14 @@ - Name = "ooofiltproxy.dll"; - End - -+#ifndef __CROSS__ - File gid_File_Lib_Instooofiltmsi - TXT_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; - Name = "instooofiltmsi.dll"; - End -+#endif /* !__CROSS__ */ - - #endif - -@@ -1754,7 +1758,7 @@ - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -- #ifdef WNT -+ #if defined WNT && ! defined __CROSS__ - Name = "ssleay32.dll"; - #endif - End -@@ -1766,7 +1770,7 @@ - Styles = (PACKED); - Dir = gid_Dir_Program; - -- #ifdef WNT -+ #if defined WNT && ! defined __CROSS__ - Name = "libeay32.dll"; - #endif - End -@@ -1868,7 +1872,7 @@ - STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf) - - --#ifdef WNT -+#if defined WNT && !defined __CROSS__ - File gid_File_Lib_sellangmsi - TXT_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); -scp2/source/ooo/windowscustomaction_ooo.scp.pristine ---- scp2/source/ooo/windowscustomaction_ooo.scp.pristine 2008-11-26 11:14:00.000000000 +0100 -+++ scp2/source/ooo/windowscustomaction_ooo.scp 2008-11-27 09:23:20.000000000 +0100 -@@ -30,6 +30,7 @@ - - #include "macros.inc" - -+#ifndef __CROSS__ - WindowsCustomAction gid_Customaction_Regallmsdocdll - Name = "Regallmsdocdll"; - Typ = "65"; -@@ -38,6 +39,7 @@ - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize"); - End -+#endif /* !__CROSS__ */ - - WindowsCustomAction gid_Customaction_Regactivexdll1 - Name = "Regactivexdll1"; -@@ -75,6 +77,7 @@ - Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "end"); - End - -+#ifndef __CROSS__ - WindowsCustomAction gid_Customaction_sdqsmsidll - Name = "sdqsmsidll"; - Typ = "65"; -@@ -236,6 +239,7 @@ - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end"); - Assignment2 = ("AdminExecuteSequence", "", "end"); - End -+#endif /* !__CROSS__ */ - - WindowsCustomAction gid_Customaction_RegCleanOld - Name = "RegCleanOld"; -@@ -371,6 +375,7 @@ - Assignment10 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct2", "Show", "ISWRONGPRODUCT"); - End - -+#ifndef __CROSS__ - WindowsCustomAction gid_Customaction_MigrateInstallPath - Name = "MigrateInstallPath"; - Typ = "321"; -@@ -417,3 +422,4 @@ - Inbinarytable = 1; - Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1"); - End -+#endif /* !__CROSS__ */ -scp2/source/ooo/scpaction_ooo.scp.pristine ---- scp2/source/ooo/scpaction_ooo.scp.pristine 2008-04-15 16:49:29.000000000 +0200 -+++ scp2/source/ooo/scpaction_ooo.scp 2008-11-26 19:32:06.000000000 +0100 -@@ -102,7 +102,7 @@ - #endif - End - --#if defined(WNT) && defined(_gcc3) -+#if defined(WNT) && defined(_gcc3) && !defined __CROSS__ - ScpAction SCP_COPY_MINGWM10 - Copy = "mingwm10.dll"; - Name = "mingwm10.dll"; -scp2/source/ooo/file_ooo.scp.pristine ---- scp2/source/ooo/file_ooo.scp.pristine 2008-11-26 11:17:34.000000000 +0100 -+++ scp2/source/ooo/file_ooo.scp 2008-11-26 19:32:06.000000000 +0100 -@@ -459,7 +459,7 @@ - EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart); - End - --#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT -+#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT && !defined __CROSS__ - - File gid_File_Jar_Accessbridge - TXT_FILE_BODY; -scp2/source/ooo/ure.scp.pristine ---- scp2/source/ooo/ure.scp.pristine 2008-11-26 11:18:46.000000000 +0100 -+++ scp2/source/ooo/ure.scp 2008-11-26 19:32:06.000000000 +0100 -@@ -895,7 +895,7 @@ - End - #endif - --#if (defined WNT && defined _gcc3) -+#if (defined WNT && defined _gcc3) && !defined __CROSS__ - File gid_File_Lib_Mingwm10_Ure - TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; -@@ -937,7 +937,7 @@ - #endif - #endif - --#if defined WNT -+#if defined WNT && !defined __CROSS__ - File gid_File_Dl_Unicows - TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; diff --git a/patches/openoffice-scripting-mingw.patch b/patches/openoffice-scripting-mingw.patch deleted file mode 100644 index a3e9c6708..000000000 --- a/patches/openoffice-scripting-mingw.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- scripting/source/dlgprov/dlgevtatt.hxx.~1~ 2008-11-06 23:36:39.000000000 +0100 -+++ scripting/source/dlgprov/dlgevtatt.hxx 2008-11-06 23:33:48.000000000 +0100 -@@ -46,7 +46,9 @@ - - #include - -+#ifndef __MINGW32__ - #define FAKE_VBA_EVENT_SUPPORT 1 -+#endif - - //......................................................................... - namespace dlgprov diff --git a/patches/openoffice-setup_native-mingw.patch b/patches/openoffice-setup_native-mingw.patch deleted file mode 100644 index c6b8637bb..000000000 --- a/patches/openoffice-setup_native-mingw.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- setup_native/source/win32/customactions/tools/seterror.cxx.pristine 2008-10-28 20:55:13.000000000 +0100 -+++ setup_native/source/win32/customactions/tools/seterror.cxx 2008-10-28 21:12:01.000000000 +0100 -@@ -41,12 +41,12 @@ - #include - #include - #include --#include "strsafe.h" - - #include - - //---------------------------------------------------------- - #ifdef DEBUG -+#include "strsafe.h" - inline void OutputDebugStringFormat( LPCTSTR pFormat, ... ) - { - TCHAR buffer[1024]; ---- setup_native/source/win32/stwrapper/resource.rc.pristine 2008-10-28 21:24:11.000000000 +0100 -+++ setup_native/source/win32/stwrapper/resource.rc 2008-10-28 21:24:37.000000000 +0100 -@@ -113,7 +113,11 @@ VS_VERSION_INFO versioninfo - VS_VERSION_INFO rcdata - { - 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, -+#ifndef CROSS_COMPILING - VERSION, SUBVERSION, VERVARIANT, VER_COUNT -+#else -+ VERSION, SUBVERSION -+#endif - }; - - diff --git a/patches/openoffice-shell-mingw.patch b/patches/openoffice-shell-mingw.patch deleted file mode 100644 index 2fd0536f2..000000000 --- a/patches/openoffice-shell-mingw.patch +++ /dev/null @@ -1,355 +0,0 @@ ---- shell/source/all/ooofilereader/makefile.mk.~1.7.~ 2008-07-22 19:48:30.000000000 +0200 -+++ shell/source/all/ooofilereader/makefile.mk 2008-11-03 20:35:11.000000000 +0100 -@@ -51,6 +51,10 @@ CDEFS_X64+=-D_WIN32_IE=0x501 - CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE - .ENDIF - -+.IF "$(SYSTEM_EXPAT)" == "YES" -+CFLAGS+=-DSYSTEM_EXPAT -+.ENDIF -+ - # --- Files -------------------------------------------------------- - - ---- shell/source/win32/sysshell/systemshell.cxx.~1.6.~ 2008-04-11 10:29:13.000000000 +0200 -+++ shell/source/win32/sysshell/systemshell.cxx 2008-11-04 12:05:46.000000000 +0100 -@@ -38,10 +38,14 @@ - #pragma warning(push, 1) - #pragma warning(disable:4917) - #endif --#include -+#include - #if defined _MSC_VER - #pragma warning(pop) --#endif -+#endif -+ -+#ifdef __MINGW32__ -+#define SHARD_PATHW SHARD_PATH -+#endif /* __MINGW32__ */ - - namespace SystemShell - { ---- shell/source/win32/shlxthandler/propsheets/makefile.mk.~1.6.~ 2008-04-11 10:22:06.000000000 +0200 -+++ shell/source/win32/shlxthandler/propsheets/makefile.mk 2008-11-03 20:55:35.000000000 +0100 -@@ -59,6 +59,10 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\ - $(SLO_X64)$/document_statistic.obj - .ENDIF # "$(BUILD_X64)"!="" - -+.IF "$(SYSTEM_EXPAT)" == "YES" -+CFLAGS+=-DSYSTEM_EXPAT -+.ENDIF -+ - # --- Targets ------------------------------------------------------ - - .INCLUDE : set_wntx64.mk ---- shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx.~1.9.~ 2008-04-11 10:21:31.000000000 +0200 -+++ shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx 2008-11-03 21:07:07.000000000 +0100 -@@ -54,6 +54,32 @@ - #include - #include "internal/resource.h" - -+#ifdef __MINGW32__ -+struct LVGROUP { -+ UINT cbSize; -+ UINT mask; -+ LPWSTR pszHeader; -+ int cchHeader; -+ LPWSTR pszFooter; -+ int cchFooter; -+ int iGroupId; -+ UINT stateMask; -+ UINT state; -+ UINT uAlign; -+}; -+ -+// FIXME -+int const LVGA_HEADER_CENTER = 0; -+ -+int const LVGF_HEADER = 0; -+int const LVGF_STATE = 0; -+int const LVGF_GROUPID = 0; -+int const LVGF_TEXT = 0; -+ -+int const LVGS_NORMAL = 0; -+ -+#endif /* __MINGW32__ */ -+ - //------------------------------------ - // - //------------------------------------ ---- shell/source/win32/shlxthandler/makefile.mk.~1.13.26.1.~ 2008-08-27 16:44:04.000000000 +0200 -+++ shell/source/win32/shlxthandler/makefile.mk 2008-11-04 11:15:21.000000000 +0100 -@@ -57,8 +57,11 @@ SLOFILES=$(SLO)$/classfactory.obj\ - $(SLO)$/propsheets.obj\ - $(SLO)$/shlxthdl.obj\ - $(SLO)$/listviewbuilder.obj\ -- $(SLO)$/document_statistic.obj\ -- $(SLO)$/thumbviewer.obj -+ $(SLO)$/document_statistic.obj -+ -+.IF "$(CROSS_COMPILING)" == "no" -+SLOFILES += $(SLO)$/thumbviewer.obj -+.ENDIF # "$(CROSS_COMPILING)" == "no" - - SHL1TARGET=$(TARGET) - -@@ -78,8 +81,11 @@ SHL1STDLIBS+=\ - $(UUIDLIB)\ - $(SHELL32LIB)\ - $(KERNEL32LIB)\ -- $(GDI32LIB)\ -- $(GDIPLUSLIB) -+ $(GDI32LIB) -+ -+.IF "$(CROSS_COMPILING)" == "no" -+SHL1STDLIBS+=$(GDIPLUSLIB) -+.ENDIF # "$(CROSS_COMPILING)" == "no" - - SHL1LIBS+=$(SLB)$/util.lib\ - $(SLB)$/ooofilereader.lib -@@ -139,6 +145,10 @@ DEF1NAME_X64=$(SHL1TARGET_X64) - DEF1EXPORTFILE_X64=exports.dxp - .ENDIF # "$(BUILD_X64)"!="" - -+.IF "$(SYSTEM_EXPAT)" == "YES" -+CFLAGS+=-DSYSTEM_EXPAT -+.ENDIF -+ - # --- Targets ------------------------------------------------------ - - .INCLUDE : set_wntx64.mk ---- shell/source/win32/shlxthandler/shlxthdl.cxx.~1.9.~ 2008-04-11 10:17:19.000000000 +0200 -+++ shell/source/win32/shlxthandler/shlxthdl.cxx 2008-11-04 11:13:35.000000000 +0100 -@@ -38,6 +38,10 @@ - #include "internal/fileextensions.hxx" - #include "internal/utilities.hxx" - -+#ifdef __MINGW32__ -+#define IID_IExtractImage (CLSID const&)*(CLSID const*)0 -+#endif /* __MINGW32__ */ -+ - #include - #include - #include ---- shell/source/win32/shlxthandler/util/registry.cxx.~1.7.~ 2008-04-11 10:25:06.000000000 +0200 -+++ shell/source/win32/shlxthandler/util/registry.cxx 2008-11-03 20:36:51.000000000 +0100 -@@ -50,6 +50,10 @@ - #pragma warning(pop) - #endif - -+#ifdef __MINGW32__ -+#define DELETE 0x00010000L -+#endif /* __MINGW32__ */ -+ - //--------------------------------------- - // - //--------------------------------------- ---- shell/source/win32/shlxthandler/util/makefile.mk.~1.6.~ 2008-04-11 10:24:43.000000000 +0200 -+++ shell/source/win32/shlxthandler/util/makefile.mk 2008-11-04 11:05:11.000000000 +0100 -@@ -61,6 +61,10 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\ - $(SLO_X64)$/utilities.obj\ - $(SLO_X64)$/iso8601_converter.obj - -+.IF "$(SYSTEM_EXPAT)" == "YES" -+CFLAGS+=-DSYSTEM_EXPAT -+.ENDIF -+ - # --- Targets ------------------------------------------------------ - - .INCLUDE : set_wntx64.mk ---- shell/source/win32/shlxthandler/classfactory.hxx.~1.5.~ 2008-04-11 10:15:21.000000000 +0200 -+++ shell/source/win32/shlxthandler/classfactory.hxx 2008-11-04 11:04:23.000000000 +0100 -@@ -34,6 +34,9 @@ - #if defined _MSC_VER - #pragma warning(push, 1) - #endif -+#ifdef __MINGW32__ -+#include -+#endif - #include - #if defined _MSC_VER - #pragma warning(pop) ---- shell/source/win32/shlxthandler/ooofilt/makefile.mk.~1.8.~ 2008-04-11 10:18:50.000000000 +0200 -+++ shell/source/win32/shlxthandler/ooofilt/makefile.mk 2008-11-04 12:03:12.000000000 +0100 -@@ -117,8 +117,16 @@ DEF1NAME_X64=$(SHL1TARGET_X64) - DEF1EXPORTFILE_X64=exports.dxp - .ENDIF # "$(BUILD_X64)"!="" - -+.IF "$(SYSTEM_EXPAT)" == "YES" -+CFLAGS+=-DSYSTEM_EXPAT -+.ENDIF -+ - # --- Targets ------------------------------------------------------ - -+.IF "$(CROSS_COMPILING)" == "yes" -+all: -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - .INCLUDE : set_wntx64.mk - .INCLUDE : target.mk - .INCLUDE : tg_wntx64.mk -\ Geen regeleindeteken (LF) aan einde van bestand ---- shell/source/win32/shlxthandler/thumbviewer/makefile.mk.~1.5.~ 2008-04-11 10:23:22.000000000 +0200 -+++ shell/source/win32/shlxthandler/thumbviewer/makefile.mk 2008-11-04 12:03:18.000000000 +0100 -@@ -58,7 +58,10 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj - - # --- Targets ------------------------------------------------------ - -+.IF "$(CROSS_COMPILING)" == "yes" -+all: -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - .INCLUDE : set_wntx64.mk - .INCLUDE : target.mk - .INCLUDE : tg_wntx64.mk -- ---- shell/source/win32/shlxthandler/columninfo/columninfo.cxx.~1.7.~ 2008-04-11 10:17:35.000000000 +0200 -+++ shell/source/win32/shlxthandler/columninfo/columninfo.cxx 2008-11-04 11:59:08.000000000 +0100 -@@ -39,6 +39,10 @@ - - #include - -+#ifdef __MINGW32__ -+#define FMTID_SummaryInformation (GUID const&)*(GUID const*)0 -+#endif /* __MINGW32__ */ -+ - //---------------------------- - // - //---------------------------- -@@ -47,12 +51,14 @@ namespace /* private */ - { - SHCOLUMNINFO ColumnInfoTable[] = - { -+#ifndef __MINGW32__ - {{PSGUID_SUMMARYINFORMATION, PIDSI_TITLE}, VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Title", L"Title"}, - {{PSGUID_SUMMARYINFORMATION, PIDSI_AUTHOR}, VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Author", L"Author"}, - {{PSGUID_SUMMARYINFORMATION, PIDSI_SUBJECT}, VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Subject", L"Subject"}, - {{PSGUID_SUMMARYINFORMATION, PIDSI_KEYWORDS}, VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Keywords", L"Keywords"}, - {{PSGUID_SUMMARYINFORMATION, PIDSI_COMMENTS}, VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Comments", L"Comments"}, - {{PSGUID_SUMMARYINFORMATION, PIDSI_PAGECOUNT},VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Pagecount", L"Pagecount"} -+#endif /* !__MINGW32__ */ - }; - - size_t ColumnInfoTableSize = sizeof(ColumnInfoTable)/sizeof(ColumnInfoTable[0]); ---- shell/source/win32/shlxthandler/columninfo/makefile.mk.~1.6.~ 2008-04-11 10:17:52.000000000 +0200 -+++ shell/source/win32/shlxthandler/columninfo/makefile.mk 2008-11-03 20:37:26.000000000 +0100 -@@ -55,6 +55,10 @@ CDEFS_X64+=-D_WIN32_IE=0x501 - SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj - .ENDIF # "$(BUILD_X64)"!="" - -+.IF "$(SYSTEM_EXPAT)" == "YES" -+CFLAGS+=-DSYSTEM_EXPAT -+.ENDIF -+ - # --- Targets ------------------------------------------------------ - .INCLUDE : set_wntx64.mk - .INCLUDE : target.mk ---- shell/source/win32/shlxthandler/classfactory.cxx.~1.6.~ 2008-04-11 10:15:02.000000000 +0200 -+++ shell/source/win32/shlxthandler/classfactory.cxx 2008-11-04 11:08:46.000000000 +0100 -@@ -39,8 +38,10 @@ - #include - using ::std::max; - using ::std::min; --#endif -+#define IID_IExtractImage 0 -+#else /* !__MINGW32__ */ - #include "internal/thumbviewer.hxx" -+#endif /* !__MINGW32__ */ - #include "internal/shlxthdl.hxx" - - //----------------------------- -@@ -128,10 +132,10 @@ HRESULT STDMETHODCALLTYPE CClassFactory: - - else if (CLSID_COLUMN_HANDLER == m_Clsid) - pUnk = static_cast(new CColumnInfo()); -- -+#ifndef __MINGW32__ - else if (CLSID_THUMBVIEWER_HANDLER == m_Clsid) - pUnk = static_cast(new CThumbviewer()); -- -+#endif /* !__MINGW32__ */ - POST_CONDITION(pUnk != 0, "Could not create COM object"); - - if (0 == pUnk) ---- shell/source/win32/shlxthandler/infotips/makefile.mk.~1.6.~ 2008-04-11 10:18:30.000000000 +0200 -+++ shell/source/win32/shlxthandler/infotips/makefile.mk 2008-11-03 20:41:46.000000000 +0100 -@@ -54,6 +54,10 @@ CDEFS_X64+=-D_WIN32_IE=0x501 - SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj - .ENDIF # "$(BUILD_X64)"!="" - -+.IF "$(SYSTEM_EXPAT)" == "YES" -+CFLAGS+=-DSYSTEM_EXPAT -+.ENDIF -+ - # --- Targets ------------------------------------------------------ - - .INCLUDE : set_wntx64.mk ---- shell/source/win32/shlxthandler/res/makefile.mk.~1.8.~ 2008-04-11 10:23:02.000000000 +0200 -+++ shell/source/win32/shlxthandler/res/makefile.mk 2008-11-04 10:53:13.000000000 +0100 -@@ -63,4 +63,22 @@ ULFDIR:=. - - $(RCFILES) : $(ULFDIR)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt - $(WRAPCMD) $(BIN)$/lngconvex.exe -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt -+.IF "$(CROSS_COMPILING)" == "yes" -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f]["\\]\)@\\x00\1@g' $@ -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f]["\\]\)@\\x00\1@g' $@ -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f][0-9a-f]["\\]\)@\\x0\1@g' $@ -+ sed -i -e 's@\\x\([0-9a-f][0-9a-f][0-9a-f]["\\]\)@\\x0\1@g' $@ -+ sed -i -e 's@\([ ,]\)"@\1L"@g' $@ -+ sed -i -e 's@include L"@include "@' $@ -+ pytt '\r\n' '\n' $@ -+ pytt '^LANGUAGE 0x244(.|\n)*' '' $@ -+# sed -i -e 's@^LANGUAGE 0x211@LANGUAGE 0x21@' $@ -+# sed -i -e 's@^LANGUAGE 0x226@LANGUAGE 0x26@' $@ -+# sed -i -e 's@^LANGUAGE 0x22c@LANGUAGE 0x2c@' $@ -+# sed -i -e 's@^LANGUAGE 0x22b@LANGUAGE 0x2b@' $@ -+# sed -i -e 's@^LANGUAGE 0x30@LANGUAGE 0x2d@' $@ -+# sed -i -e 's@^LANGUAGE 0x73@LANGUAGE 0x2a@' $@ -+# sed -i -e 's@^LANGUAGE 0x31@LANGUAGE 0x2e@' $@ -+# sed -i -e 's@^LANGUAGE 0x33@LANGUAGE 0x01@' $@ -+.ENDIF #"$(CROSS_COMPILING)" == "yes" - ---- shell/inc/internal/infotips.hxx.~1.5.~ 2008-04-11 09:43:15.000000000 +0200 -+++ shell/inc/internal/infotips.hxx 2008-11-03 20:54:22.000000000 +0100 -@@ -31,6 +31,12 @@ - #ifndef INFOTIPS_HXX_INCLUDED - #define INFOTIPS_HXX_INCLUDED - -+#ifdef __MINGW32__ -+#include -+#undef STDMETHODCALLTYPE -+#define STDMETHODCALLTYPE -+#endif /* __MINGW32__ */ -+ - #if defined _MSC_VER - #pragma warning(push, 1) - #pragma warning(disable:4917) ---- shell/inc/internal/propsheets.hxx.~1.6.~ 2008-04-11 09:44:04.000000000 +0200 -+++ shell/inc/internal/propsheets.hxx 2008-11-04 11:20:49.000000000 +0100 -@@ -43,6 +43,11 @@ - #include - #include - -+#ifdef __MINGW32__ -+#undef STDMETHODCALLTYPE -+#define STDMETHODCALLTYPE -+#endif /* __MINGW32__ */ -+ - class CPropertySheet : public IShellExtInit, public IShellPropSheetExt - { - public: ---- shell/inc/internal/zipfile.hxx.~1.4.~ 2008-04-11 09:46:04.000000000 +0200 -+++ shell/inc/internal/zipfile.hxx 2008-11-03 20:00:53.000000000 +0100 -@@ -35,7 +35,11 @@ - #define _WINDOWS - #endif - -+#ifdef __MINGW32__ -+#include -+#else /* !__MINGW32__ */ - #include -+#endif /* !__MINGW32__ */ - - #include - #include diff --git a/patches/openoffice-solenv-cross.patch b/patches/openoffice-solenv-cross.patch deleted file mode 100644 index 74f586a83..000000000 --- a/patches/openoffice-solenv-cross.patch +++ /dev/null @@ -1,208 +0,0 @@ ---- solenv/inc/startup/startup.mk.orig 2008-10-21 09:41:14.000000000 +0200 -+++ solenv/inc/startup/startup.mk 2008-10-21 09:52:19.000000000 +0200 -@@ -40,9 +40,20 @@ CALLTARGETS=$(MAKETARGETS) - OS_variable_needed - .ENDIF - --# Customize macro definitions based on seting of OS. --# This must come before the default macro definitions which follow. --.INCLUDE .NOINFER : $(INCFILENAME:d)$(OS)$/macros.mk -+# Customize macro definitions based on seting of BUILD_OS, after -+# translation into a third naming scheme (1. config.guess, -+# 2. configure.in) devised in 3. set_soenv.in: $B_OS. -+.IF "$(CROSS_COMPILING)" == "no" -+B_OS = $(OS) -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+.IF "$(BUILD_OS)" == "Linux" -+B_OS = LINUX -+.ELSE # "$(BUILD_OS)" != "Linux" -+.ERROR : ; @echo Work in progress: cross compiling only on Linux -+.ENDIF -+.ENDIF # "$(CROSS_COMPILING)" != "yes" -+ -+.INCLUDE .NOINFER : $(INCFILENAME:d)$(B_OS)$/macros.mk - - # ----------------- Default Control Macro definitions ----------------------- - # Select appropriate defaults for basic macros ---- solenv/bin/build.pl.orig 2008-07-22 18:46:59.000000000 +0200 -+++ solenv/bin/build.pl 2008-10-21 10:58:44.000000000 +0200 -@@ -61,7 +61,7 @@ - my $enable_multiprocessing = 1; - my $cygwin = 0; - $cygwin++ if ($^O eq 'cygwin'); -- if ($ENV{GUI} eq 'WNT' && !$cygwin) { -+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) { - eval { require Win32::Process; import Win32::Process; }; - $enable_multiprocessing = 0 if ($@); - }; -@@ -812,7 +838,7 @@ sub CorrectPath { - sub check_dmake { - #print "Checking dmake..."; - # my $dmake_batch = CorrectPath("$tmp_dir/dmake.bat"); -- if ($QuantityToBuild && ($ENV{GUI} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) { -+ if ($QuantityToBuild && ($ENV{BUILD_OS} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) { - if (open(DMAKEVERSION, "where dmake |")) { - my @output = ; - close DMAKEVERSION; -@@ -857,7 +883,7 @@ sub get_commands { - while ($arg = pop(@dmake_args)) { - $dmake .= ' '.$arg; - }; --# if (($ENV{GUI} eq 'WNT') && $QuantityToBuild) { -+# if (($ENV{BUILD_OS} eq 'WNT') && $QuantityToBuild) { - # print_error("There is no such executable $_4nt_exe") if (!-e $_4nt_exe); - # $dmake_batch = generate_4nt_batch(); - # }; -@@ -873,7 +899,7 @@ sub get_commands { - # ($ENV{GUI} eq 'MACOSX')) && - # ($Dir eq '/')) { - # return 1; --# } elsif ( (($ENV{GUI} eq 'WNT') || -+# } elsif ( (($ENV{BUILD_OS} eq 'WNT') || - # ($ENV{GUI} eq 'WIN') || - # ($ENV{GUI} eq 'OS2')) && - # ($Dir =~ /\S:\/$/)) { -@@ -933,7 +959,7 @@ sub CheckPlatform { - return 1 if (($ENV{GUI} eq 'WIN') && ($Platform eq 'w')); - return 1 if (($ENV{GUI} eq 'UNX') && ($Platform eq 'u')); - return 1 if (($ENV{GUI} eq 'OS2') && ($Platform eq 'p')); -- return 1 if (($ENV{GUI} eq 'WNT') && -+ return 1 if ((($ENV{TARGET_OS} eq 'WNT') || ($ENV{TARGET_OS} eq 'MinGW')) && - (($Platform eq 'w') || ($Platform eq 'n'))); - return 0; - }; -@@ -1378,7 +1409,7 @@ sub cancel_build { - }; - print "\nAttention: if you build and deliver the above module(s) you may prolongue your the build issuing command \"build --from @broken_modules_names\"\n"; - } else { --# if ($ENV{GUI} eq 'WNT') { -+# if ($ENV{BUILD_OS} eq 'WNT') { - while (children_number()) { - handle_dead_children(1); - } -@@ -1400,7 +1431,7 @@ sub store_error { - my ($pid, $error_code) = @_; - return 0 if (!$error_code); - my $child_nick = $processes_hash{$pid}; -- if ($ENV{GUI} eq 'WNT') { -+ if ($ENV{BUILD_OS} eq 'WNT') { - if (!defined $had_error{$child_nick}) { - $had_error{$child_nick}++; - return 1; -@@ -1429,7 +1460,7 @@ sub handle_dead_children { - my $try_once_more = 0; - do { - my $pid = 0; -- if ($ENV{GUI} eq 'WNT' && !$cygwin) { -+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) { - foreach $pid (keys %processes_hash) { - my $exit_code = undef; - my $proc_obj = $windows_procs{$pid}; -@@ -1552,7 +1583,7 @@ sub start_child { - # html_store_job_info($dependencies_hash, $job_dir, $error_code); - # if ($error_code) { - # # give windows (4nt) one more chance --# if ($ENV{GUI} eq 'WNT' && !$cygwin) { -+# if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) { - # $error_code = do_post_job($`, $post_job, $dependencies_hash); - # }; - # if ($error_code) { -@@ -1569,7 +1600,7 @@ sub start_child { - my $children_running; - my $oldfh = select STDOUT; - $| = 1; -- if ($ENV{GUI} eq 'WNT' && !$cygwin) { -+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) { - print "$job_dir\n"; - my $process_obj = undef; - my $rc = Win32::Process::Create($process_obj, $dmake_bin, -@@ -1725,7 +1756,7 @@ sub do_custom_job { - $error_code = run_job($job, CorrectPath($StandDir.$module), $module_job); - if ($error_code) { - # give windows (4nt) one more chance -- if ($ENV{GUI} eq 'WNT' && !$cygwin) { -+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) { - $error_code = run_job($job, CorrectPath($StandDir.$module), $module_job); - }; - }; -@@ -3180,7 +3211,7 @@ sub html_store_job_info { - - sub start_server_on_port { - my $port = shift; -- if ($ENV{GUI} eq 'WNT') { -+ if ($ENV{BUILD_OS} eq 'WNT') { - $socket_obj = new IO::Socket::INET (#LocalAddr => hostname(), - LocalPort => $port, - Proto => 'tcp', ---- solenv/bin/deliver.pl.orig 2008-10-21 10:52:30.000000000 +0200 -+++ solenv/bin/deliver.pl 2008-10-21 10:58:49.000000000 +0200 -@@ -140,7 +140,7 @@ parse_options(); - print "$script_name -- version: $script_rev\n" if !$opt_silent; - - if ( ! $opt_delete ) { -- if ( $ENV{GUI} eq 'WNT' ) { -+ if ( $ENV{BUILD_OS} eq 'WNT' ) { - if ($ENV{COM} eq 'GCC') { - initialize_strip() ; - }; -@@ -411,7 +411,7 @@ sub parse_options - $arg =~ /^-delete$/ and $opt_delete = 1 and next; - $arg =~ /^-dontdeletecommon$/ and $dontdeletecommon = 1 and next; - $arg =~ /^-help$/ and $opt_help = 1 and $arg = ''; -- $arg =~ /^-link$/ and $ENV{GUI} ne 'WNT' and $opt_link = 1 and next; -+ $arg =~ /^-link$/ and $ENV{BUILD_OS} ne 'WNT' and $opt_link = 1 and next; - $arg =~ /^-deloutput$/ and $opt_deloutput = 1 and next; - $arg =~ /^-debug$/ and $is_debug = 1 and next; - $arg =~ /^-checkdlst$/ and $opt_checkdlst = 1 and next; -@@ -711,7 +711,7 @@ sub is_unstripped { - # OS X file command doesn't know if a file is stripped or not - if (($file_type =~ /not stripped/o) || ($file_type =~ /Mach-O/o) || - (($file_type =~ /PE/o) && ($ENV{GUI} eq 'WNT') && -- ($nm_output = `nm $file_name 2>&1`) && $nm_output && -+ ($nm_output = `$(NM) $file_name 2>&1`) && $nm_output && - !($nm_output =~ /no symbols/i) && !($nm_output =~ /not recognized/i))) { - return '1' if ($file_name =~ /\.bin$/o); - return '1' if ($file_name =~ /\.so\.*/o); -@@ -1485,7 +1485,7 @@ sub usage - print STDERR " -force copy even if not newer\n"; - print STDERR " -dontdeletecommon do not delete common files (for -delete option)\n"; - print STDERR " -help print this message\n"; -- if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) { -+ if ( !defined($ENV{BUILD_OS}) || $ENV{BUILD_OS} ne 'WNT' ) { - print STDERR " -link hard link files into the solver to save disk space\n"; - } - print STDERR " -minor deliver into minor (milestone)\n"; ---- solenv/inc/unitools.mk.pristine 2008-10-21 11:31:04.000000000 +0200 -+++ solenv/inc/unitools.mk 2008-10-21 13:54:42.000000000 +0200 -@@ -39,7 +39,7 @@ XSLTPROC*=xsltproc - - ULFCONV*=ulfconv - --MAKEDEPEND*=$(SOLARBINDIR)$/makedepend -+MAKEDEPEND*=$(TOOLS_DIR)/makedepend - - SCP_CHECK_TOOL:=checkscp$E - ---- solenv/inc/settings.mk.pristine 2008-10-29 08:42:08.000000000 +0100 -+++ solenv/inc/settings.mk 2008-10-30 10:01:59.000000000 +0100 -@@ -752,7 +752,7 @@ COMMONBIN=$(LOCAL_COMMON_OUT)$/bin - INC=$(PRJ)$/inc - INCPCH=$(PRJ)$/inc$/pch - INCLOCAL=..$/inc --INCGUI=$(PRJ)$/$(GUIBASE)$/inc -+INCGUI=$(PRJ)$/$(GUIBASE:l)$/inc - INCCOM=$(OUT)$/inc - INCCOMX=$(OUT)$/inc - INCUNOIDL=$(INCCOM)$/$(PRJNAME) -@@ -1050,7 +1050,11 @@ JAVA*:=$(JAVAINTERPRETER) - SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl - SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl - LZIP*=lzip -+.IF "$(GUI)" == "UNX" || "$(BUILD_OS)" != "WNT" -+CPPLCC*=cpp.lcc -+.ELSE - CPPLCC*=cpplcc -+.ENDIF - - .IF "$(DISABLE_ENHANCED_COMID)"=="" - .INCLUDE : tg_compv.mk diff --git a/patches/openoffice-solenv-mingw-installer.patch b/patches/openoffice-solenv-mingw-installer.patch deleted file mode 100644 index 46d31a2f8..000000000 --- a/patches/openoffice-solenv-mingw-installer.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- solenv/bin/modules/installer/parameter.pm.pristine 2008-11-12 15:42:24.000000000 +0100 -+++ solenv/bin/modules/installer/parameter.pm 2008-11-12 15:38:58.000000000 +0100 -@@ -307,8 +307,11 @@ sub setglobalvariables - - if ( $installer::globals::compiler =~ /unxso[lg]i/ ) { $installer::globals::issolarisx86build = 1; } - -- if ($ENV{OS} eq 'LINUX') -+ if ($ENV{OS} eq 'LINUX' -+ || ($ENV{BUILD_OS} == 'Linux' && $ENV{CROSS_COMPILING} eq 'yes')) - { -+ $installer::globals::installertypedir = ""; -+ $installer::globals::iswindowsbuild = 0; - $installer::globals::islinuxbuild = 1; - if ( $installer::globals::packageformat eq "rpm" ) - { ---- solenv/bin/modules/installer/servicesfile.pm.pristine 2008-11-27 13:28:48.000000000 +0100 -+++ solenv/bin/modules/installer/servicesfile.pm 2008-11-27 13:28:09.000000000 +0100 -@@ -942,13 +942,13 @@ sub create_services_rdb - - my $searchname; - -- if ($installer::globals::isunix) { $searchname = "regcomp"; } -+ if ($installer::globals::isunix && $ENV{CROSS_COMPILING} ne 'yes') { $searchname = "regcomp"; } - else { $searchname = "regcomp.exe"; } - - $regcompfileref = get_source_path_cygwin_safe($searchname, $includepatharrayref, 1); - if ( $$regcompfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for registering uno components!", "create_services_rdb"); } - -- if ($installer::globals::isunix) { $searchname = "regmerge"; } -+ if ($installer::globals::isunix && $ENV{CROSS_COMPILING} ne 'yes') { $searchname = "regmerge"; } - else { $searchname = "regmerge.exe"; } - - $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1); ---- solenv/bin/modules/installer/worker.pm.pristine 2009-04-06 18:25:00.471497381 +0200 -+++ solenv/bin/modules/installer/worker.pm 2009-04-07 21:00:26.915994121 +0200 -@@ -32,7 +32,9 @@ - package installer::worker; - - use Cwd; -+use File::Basename; - use File::Copy; -+use File::Path; - use File::stat; - use File::Temp qw(tmpnam); - use installer::control; -@@ -808,7 +810,8 @@ sub install_simple ($$$$$$) - - push @lines, "$destination\n"; - # printf "cp $sourcepath $destdir$destination\n"; -- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; -+ mkpath dirname $destdir.$destination; -+ copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; - my $sourcestat = stat($sourcepath); - utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination"); - chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!"; -@@ -822,7 +825,8 @@ sub install_simple ($$$$$$) - my $destinationfile = $onelink->{'destinationfile'}; - - # print "link $destinationfile -> $destdir$destination\n"; -- symlink ("$destinationfile", "$destdir$destination") || die "Can't create symlink: $!"; -+ mkpath dirname $destdir.$destination; -+ symlink ("$destinationfile", "$destdir$destination") || die "Can't create symlink: $destinationfile -> $destdir$destination $!"; - push @lines, "$destination\n"; - } - diff --git a/patches/openoffice-solenv-mingw.patch b/patches/openoffice-solenv-mingw.patch deleted file mode 100644 index 250f3f3ad..000000000 --- a/patches/openoffice-solenv-mingw.patch +++ /dev/null @@ -1,207 +0,0 @@ ---- solenv/inc/wntgcci6.mk.pristine 2008-10-29 08:42:22.000000000 +0100 -+++ solenv/inc/wntgcci6.mk 2008-10-30 14:11:42.000000000 +0100 -@@ -31,14 +31,19 @@ - - # mk file for wntgcci6 - --SOLAR_JAVA*=TRUE -+#SOLAR_JAVA*=TRUE - FULL_DESK=TRUE - JAVAFLAGSDEBUG=-g - - # SOLAR JAva Unterstuetzung nur fuer wntmsci - -+.IF "$(CROSS_COMPILING)" == "no" - ASM=ml - AFLAGS=/c /Cp /coff -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+ASM=$(NASM) -+REGCOMP:=wine $(SOLARBINDIR)/regcomp -+.ENDIF # "$(CROSS_COMPILING)" == "yes" - - # architecture dependent flags for the C and C++ compiler that can be changed by - # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -@@ -50,7 +54,13 @@ CXX*=gcc - #CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF) - # new: - #CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /) --CFLAGS=-fmessage-length=0 -c -nostdinc $(OLE2DEF) -+CFLAGS=-fmessage-length=0 -c $(OLE2DEF) -+.IF "$(CROSS_COMPILING)" == "no" -+CFLAGS += -nostdinc -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+CFLAGS += -D__CROSS__ -+SCPDEFS += -D__MINGW32__ -D__CROSS__ -DDISABLE_ATL -DUSE_SYSTEM_STL -+.ENDIF # "$(CROSS_COMPILING)" == "yes" - ### - CFLAGSCC=-pipe $(ARCH_FLAGS) - CFLAGSCXX=-pipe $(ARCH_FLAGS) -@@ -109,18 +116,37 @@ DYNAMIC= -dynamic - - LINK*=$(CXX) - LINKC*=$(CC) -- --CYGLIB=$(LIB:s/;/ -L/) --LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB) -+# FIXME: better way to strip trailing semicolon from $(LIB) to avoid -+# CYGLIB content to end with -L, eating next argument -+LIB___=$(LIB)--- -+LIB_NO_TRAILING_SEMI___ = $(LIB___:s/;---//) -+LIB_NO_TRAILING_SEMI = $(LIB_NO_TRAILING_SEMI___:s/---//) -+CYGLIB=$(LIB_NO_TRAILING_SEMI:s/;/ -L/) -+LINKFLAGS=-Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -+.IF "$(CYGLIB)" != "" -+LINKFLAGS += -L$(CYGLIB) -+.ENDIF #"$(CYGLIB)" != "" -+.IF "$(CROSS_COMPILING)" == "no" -+LINKFLAGS += -nostdlib -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+LINKFLAGS += -L$(SOLARBINDIR) -L$(SOLARLIBDIR) -L$(COMPATH)/../../bin -L$(COMPATH)/../../lib -+.ENDIF # "$(CROSS_COMPILING)" == "yes" - .IF "$(USE_MINGW)"=="cygwin" - MINGWLIBDIR=$(COMPATH)$/lib$/mingw - .ELSE - MINGWLIBDIR=$(COMPATH)$/lib - .ENDIF --LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o --LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o --LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o --LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)$/dllcrt2.o -+LINKFLAGSAPPGUI=-mwindows -+LINKFLAGSSHLGUI=--warn-once -mwindows -shared -+LINKFLAGSAPPCUI=-mconsole -+LINKFLAGSSHLCUI=--warn-once -mconsole -shared -+.IF "$(CROSS_COMPILING)" == "no" -+LINKFLAGSAPPGUI+=$(MINGWLIBDIR)$/crt2.o -+LINKFLAGSSHLGUI+=$(MINGWLIBDIR)$/dllcrt2.o -+LINKFLAGSAPPCUI+=$(MINGWLIBDIR)$/crt2.o -+LINKFLAGSSHLCUI+=$(MINGWLIBDIR)$/dllcrt2.o -+.ENDIF # "$(CROSS_COMPILING)" == "no" -+ - LINKFLAGSTACK= - LINKFLAGSPROF= - LINKFLAGSDEBUG=-g -@@ -144,24 +170,28 @@ STDLIBCUIMT+=-lmingwthrd - STDSHLGUIMT+=-lmingwthrd - STDSHLCUIMT+=-lmingwthrd - .ENDIF --STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt --STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt --STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt --STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -+STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion -+STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion -+STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion -+STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion - - LIBSTLPORT=-lstlport_gcc - LIBSTLPORTST=-lstlport_gcc_static - --LIBMGR=ar -+LIBMGR=$(AR) - LIBFLAGS=-rsu - --IMPLIB=ld -+IMPLIB=$(LD) - IMPLIBFLAGS= - - MAPSYM=tmapsym - MAPSYMFLAGS= - -+.IF "$(CROSS_COMPILING)" == "no" - RC=rc -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+RC=wrc --nostdinc -I $(COMPATH)/../../include -I/ -DCROSS_COMPILING=1 -+.ENDIF # "$(CROSS_COMPILING)" == "yes" - RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -fo$@ $(RCFILES) - RCLINK= - RCLINKFLAGS= -@@ -170,12 +200,22 @@ RCSETVERSION= - DLLPOSTFIX=gi - PCHPOST=.gch - -+.IF "$(CROSS_COMPILING)" == "no" -+LINK_PSDK_LIB=$(PSDK_HOME)/lib/ -+PSDK_DOT_LIB=.lib -+.ELSE # "$(CROSS_COMPILING)" == "yes" -+DISABLE_ACTIVEX=TRUE -+DISABLE_ATL=TRUE -+LINK_PSDK_LIB=-l -+PSDK_DOT_LIB= -+.ENDIF # "$(CROSS_COMPILING)" == "yes" -+ - ADVAPI32LIB=-ladvapi32 - SHELL32LIB=-lshell32 - GDI32LIB=-lgdi32 - OLE32LIB=-lole32 - OLEAUT32LIB=-loleaut32 --UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib -+UUIDLIB=$(LINK_PSDK_LIB)uuid$(PSDK_DOT_LIB) - WINSPOOLLIB=-lwinspool - IMM32LIB=-limm32 - PSPLIB=-lpsp -@@ -189,14 +228,21 @@ USER32LIB=-luser32 - LIBCMT=-lmsvcrt - COMDLG32LIB=-lcomdlg32 - COMCTL32LIB=-lcomctl32 --CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib --GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib --DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib --MSILIB=$(PSDK_HOME)$/lib$/msi.lib --DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib --SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib --URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib --UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib -+CRYPT32LIB=$(LINK_PSDK_LIB)crypt32$(PSDK_DOT_LIB) -+GDIPLUSLIB=$(LINK_PSDK_LIB)gdiplus$(PSDK_DOT_LIB) -+DBGHELPLIB=$(LINK_PSDK_LIB)dbghelp$(PSDK_DOT_LIB) -+MSILIB=$(LINK_PSDK_LIB)msi$(PSDK_DOT_LIB) -+DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw$(PSDK_DOT_LIB) -+SHLWAPILIB=$(LINK_PSDK_LIB)shlwapi$(PSDK_DOT_LIB) -+URLMONLIB=$(LINK_PSDK_LIB)urlmon$(PSDK_DOT_LIB) -+UNICOWSLIB=$(LINK_PSDK_LIB)unicows$(PSDK_DOT_LIB) - WININETLIB=-lwininet - OLDNAMESLIB=-lmoldname --MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib -+MSIMG32LIB=$(LINK_PSDK_LIB)msimg32$(PSDK_DOT_LIB) -+ -+.IF "$(CROSS_COMPILING)" == "yes" -+CURLLIB=-lcurl -+BERKELEYLIB=-ldb -lwsock32 -+XSLTLIB=-lxslt -lxml2 -+LIBXML2LIB=-lxml2 -+.ENDIF ---- solenv/inc/shlinfo.rc.pristine 2008-10-29 09:33:25.000000000 +0100 -+++ solenv/inc/shlinfo.rc 2008-10-29 09:33:33.000000000 +0100 -@@ -29,7 +29,9 @@ - ************************************************************************/ - - #define VERSION 3 -+#ifndef CROSS_COMPILING - #define SUBVERSION 0 -+#endif - #define VERVARIANT 0 - - // .0 + VER_CONCEPT -@@ -140,7 +142,9 @@ - value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" - ADDITIONAL_VERINFO1 - ADDITIONAL_VERINFO2 -+#ifndef CROSS_COMPILING - ADDITIONAL_VERINFO3 -+#endif - } - #endif - } -@@ -159,7 +161,11 @@ VS_VERSION_INFO versioninfo - VS_VERSION_INFO rcdata - { - 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, -+#ifndef CROSS_COMPILING - VERSION, VERVARIANT, VER_COUNT -+#else -+ VERSION -+#endif - }; - - #endif // OS2 diff --git a/patches/openoffice-solenv.patch b/patches/openoffice-solenv.patch deleted file mode 100644 index ad1f87f8c..000000000 --- a/patches/openoffice-solenv.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/bin/build.pl.orig 2008-07-22 18:46:59.000000000 +0200 -+++ solenv/bin/build.pl 2008-10-21 11:18:41.000000000 +0200 -@@ -419,7 +419,7 @@ sub BuildAll { - while ($Prj = PickPrjToBuild(\%global_deps_hash)) { - if (!defined $dead_parents{$Prj}) { - if (scalar keys %broken_build) { -- print $echo . "Skipping project $Prj because of error(s)\n"; -+ print $echo . "Skipping project $Prj: error:" . $broken_build{$Prj} . "\n"; - RemoveFromDependencies($Prj, \%global_deps_hash); - $build_is_finished{$Prj}++; - next; diff --git a/patches/openoffice-soltools-cross.patch b/patches/openoffice-soltools-cross.patch deleted file mode 100644 index 1e15193f3..000000000 --- a/patches/openoffice-soltools-cross.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- soltools/util/makefile.pmk.~1.7.~~ 2008-04-10 20:11:03.000000000 +0200 -+++ soltools/util/makefile.pmk 2008-10-21 16:07:21.000000000 +0200 -@@ -29,8 +29,10 @@ - # - #************************************************************************* - -+.IF "$(CROSS_COMPILING)" == "no" - # find 'makedepend' in own output tree - MAKEDEPEND=$(WRAPCMD) $(BIN)$/makedepend - - # find 'adjustvisibility' in own output tree - ADJUSTVISIBILITY=$(WRAPCMD) $(BIN)$/adjustvisibility -+.ENDIF # "$(CROSS_COMPILING)" == "no" diff --git a/patches/openoffice-soltools-mingw.patch b/patches/openoffice-soltools-mingw.patch deleted file mode 100644 index 899cd73fb..000000000 --- a/patches/openoffice-soltools-mingw.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git soltools/mkdepend/collectdircontent.cxx soltools/mkdepend/collectdircontent.cxx -index 39fc2ec..4bcf1a5 100755 ---- soltools/mkdepend/collectdircontent.cxx -+++ soltools/mkdepend/collectdircontent.cxx -@@ -26,7 +26,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { - }; - do { - string winFileName(FindFileData.cFileName); -- transform(winFileName.begin(), winFileName.end(), winFileName.begin(), tolower); -+ transform(winFileName.begin(), winFileName.end(), winFileName.begin(), ::tolower); - dirContent.insert(winFileName); - } while (FindNextFile(hFind, &FindFileData)); - #else -@@ -47,7 +47,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { - - bool IncludesCollection::exists(string filePath) { - #if defined( WNT ) -- transform(filePath.begin(), filePath.end(), filePath.begin(), tolower); -+ transform(filePath.begin(), filePath.end(), filePath.begin(), ::tolower); - #endif // defined( WNT ) - PathFilePair dirFile = split_path(filePath); - string dirPath = dirFile.first; diff --git a/patches/openoffice-srcdir-build.patch b/patches/openoffice-srcdir-build.patch deleted file mode 100644 index 3b3df37ee..000000000 --- a/patches/openoffice-srcdir-build.patch +++ /dev/null @@ -1,957 +0,0 @@ -From 1b9575e99a762d43789f1933bf23d6ecb5bb4a30 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Fri, 3 Apr 2009 17:00:51 +0200 -Subject: [PATCH] GUB3-[mingw-]cross-build: apply openoffice-srcdir-build.patch. - -Update and apply patch from GUB3 - - https://github.com/gperciva/gub/blob/e0a39ff58bf4cbda742391e8bf3c099f8ffdcd01/patches/openoffice-srcdir-build.patch - -fixes oot build, ie ./configure'ing of ooo-build with --srcdir. ---- - Makefile.shared | 24 ++++++++++++------------ - bin/build-ooo | 4 ++-- - bin/build-tools | 2 +- - bin/localize-ooo | 4 ++-- - bin/ooinstall | 2 +- - bin/package-ooo | 4 ++-- - bin/setup.in | 33 +++++++++++++++++---------------- - bin/unpack | 2 +- - configure.in | 11 ++++++----- - desktop/Makefile.am | 2 +- - 10 files changed, 45 insertions(+), 43 deletions(-) - -diff --git a/Makefile.shared b/Makefile.shared -index 761e542..b81739c 100644 ---- a/Makefile.shared -+++ b/Makefile.shared -@@ -13,10 +13,10 @@ $(OOBUILDDIR)/unpack : - $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true - if test -d $(OOBUILDDIR)/applied_patches ; then \ -- FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ -- chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \ -+ FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOP_BUILDDIR)/bin` ; \ -+ chmod +x $(TOP_BUILDDIR)/patches/apply.pl && $(TOP_BUILDDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \ - fi -- cd $(top_srcdir)/bin ; ./unpack -+ cd $(top_srcdir)/bin ; TOP_BUILDDIR=$(TOP_BUILDDIR) ./unpack - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true - rm -f $(STAMP_DIR)/build $(STAMP_DIR)/patch.apply \ - $(STAMP_DIR)/artwork.install -@@ -31,7 +31,7 @@ $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \ - touch $@ - - patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply --$(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ -+$(STAMP_DIR)/patch.apply : $(TOP_BUILDDIR)/patches/apply.pl \ - $(top_srcdir)/patches/*/*.diff \ - $(APPLY_DIR)/apply - if test "z$(BUILD_WIN32)" != "z"; then \ -@@ -47,8 +47,8 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ - - $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true -- FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ -- chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ; -+ FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOP_BUILDDIR)/bin` ; \ -+ chmod +x $(TOP_BUILDDIR)/patches/apply.pl && $(TOP_BUILDDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ; - test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true - $(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR) - test -n "$(OOO_GIT)" && cd $(OOBUILDDIR) && git commit -am 'Font munging.' || true -@@ -58,8 +58,8 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ - - patch.unapply: - $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) -- FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ -- chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ; -+ FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOP_BUILDDIR)/bin` ; \ -+ chmod +x $(TOP_BUILDDIR)/patches/apply.pl && $(TOP_BUILDDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ; - rm -f $(STAMP_DIR)/patch.apply - - patch.list: -@@ -85,7 +85,7 @@ $(STAMP_DIR)/prebuild : $(OOBUILDDIR)/unpack - - build.tools : $(STAMP_DIR)/build.tools - $(STAMP_DIR)/build.tools : $(STAMP_DIR)/prebuild -- cd $(top_srcdir)/bin ; ./build-tools -+ cd $(top_srcdir)/bin ; TOP_BUILDDIR=$(TOP_BUILDDIR) ./build-tools - touch $@ - - build : $(STAMP_DIR)/build -@@ -94,14 +94,14 @@ $(STAMP_DIR)/build : $(OOBUILDDIR)/unpack \ - $(STAMP_DIR)/artwork.install \ - $(STAMP_DIR)/build.tools \ - $(STAMP_DIR)/prebuild -- cd $(top_srcdir)/bin ; ./build-ooo -+ cd $(top_srcdir)/bin ; TOP_BUILDDIR=$(TOP_BUILDDIR) ./build-ooo - touch $@ - - all: build - - install: $(STAMP_DIR)/build - if BUILD_WIN32 -- cd bin ; ./make-win32-iso -+ cd $(top_srcdir)/bin ; ./make-win32-iso - else -- cd bin ; ./package-ooo -+ cd $(top_srcdir)/bin ; TOP_BUILDDIR=$(TOP_BUILDDIR) ./package-ooo - endif -diff --git a/bin/build-ooo b/bin/build-ooo -index 445f80a..da225f0 100755 ---- a/bin/build-ooo -+++ b/bin/build-ooo -@@ -3,7 +3,7 @@ - # - # See setup for user tweakables. - # --. ./setup -+. $TOP_BUILDDIR/bin/setup - - if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin"; then - if ! test -f /proc/cpuinfo; then -@@ -137,7 +137,7 @@ fi - - if test "z$PIECE" != "z"; then - echo "Build $PIECE" -- . $TOOLSDIR/bin/piece/build-$PIECE -+ . $TOP_BUILDDIR/bin/piece/build-$PIECE - else - - # update localizations from external sources -diff --git a/bin/build-tools b/bin/build-tools -index 525cde5..68d8806 100755 ---- a/bin/build-tools -+++ b/bin/build-tools -@@ -3,7 +3,7 @@ - # - # See setup for user tweakables. - # --. ./setup -+. $TOP_BUILDDIR/bin/setup - - if test "z$SYSTEM_GCC" != "z"; then - echo "Not building gcc / binutils"; -diff --git a/bin/localize-ooo b/bin/localize-ooo -index 78dc401..d24244c 100755 ---- a/bin/localize-ooo -+++ b/bin/localize-ooo -@@ -15,9 +15,9 @@ if test -n "$OO_TOOLSDIR" ; then - ALL_LANGS=`sed -n -e "s|^[[:space:]]*completelangiso=\(.*\)\(en-US \)\(.*\)$|\2\1\3|p" $SOLARENV/inc/postset.mk` - split_build=yes - else -- . ./setup -+ . $TOP_BUILDDIR/bin/setup - . $OOBUILDDIR/*.[sS]et.sh -- . ./setup -+ . $TOP_BUILDDIR/bin/setup - SRCDIR_PIECE= - split_build=no - fi -diff --git a/bin/ooinstall b/bin/ooinstall -index e3e0a73..0b05e43 100755 ---- a/bin/ooinstall -+++ b/bin/ooinstall -@@ -45,7 +45,7 @@ sub wanted { - - ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted"; - --suck_setup ("./setup") || suck_setup ("bin/setup") || die "can't find bin/setup"; -+suck_setup ("./setup") || suck_setup ("bin/setup") || suck_setup ("$ENV{'TOP_BUILDDIR'}/bin/setup") || die "can't find bin/setup"; - - print "Sucking env from build setup\n"; - my $fname = `ls $setup_vars{'OOBUILDDIR'}/*.[sS]et.sh`; -diff --git a/bin/package-ooo b/bin/package-ooo -index 189ce35..9f803bf 100755 ---- a/bin/package-ooo -+++ b/bin/package-ooo -@@ -5,9 +5,9 @@ - # - # See setup for user tweakables. - # --. ./setup -+. $TOP_BUILDDIR/bin/setup - . $OOBUILDDIR/*.[sS]et.sh --. ./setup -+. $TOP_BUILDDIR/bin/setup - - export LC_ALL='C'; - -diff --git a/bin/setup.in b/bin/setup.in -index 502054f..481c5fa 100644 ---- a/bin/setup.in -+++ b/bin/setup.in -@@ -37,6 +37,7 @@ SPLIT_APP_MODULES='@SPLIT_APP_MODULES@' - SPLIT_OPT_FEATURES='@SPLIT_OPT_FEATURES@' - RUN_POST_INSTALL_SCRIPTS='@RUN_POST_INSTALL_SCRIPTS@' - TOOLSDIR='@TOOLSDIR@' -+TOP_BUILDDIR='@TOP_BUILDDIR@' - ENABLE_ODK='@ENABLE_ODK@' - USE_PREBUILD_UNOWINREG_DLL='@USE_PREBUILD_UNOWINREG_DLL@' - ENABLE_MONO='@ENABLE_MONO@' -@@ -67,39 +68,39 @@ GNUPATCH=@GNUPATCH@ - GNUTAR=@GNUTAR@ - DRINK="@DRINK@" - --if test -f "$TOOLSDIR/distro-configs/Common.conf" ; then -- COMMON_OPTIONS="`cat $TOOLSDIR/distro-configs/Common.conf | xargs`"; -+if test -f "$TOP_BUILDDIR/distro-configs/Common.conf" ; then -+ COMMON_OPTIONS="`cat $TOP_BUILDDIR/distro-configs/Common.conf | xargs`"; - else -- echo "Warning: $TOOLSDIR/distro-configs/Common.conf not found." -+ echo "Warning: $TOP_BUILDDIR/distro-configs/Common.conf not found." - fi - - if test "z$BUILD_WIN32" != "z"; then -- if test -f "$TOOLSDIR/distro-configs/CommonWin32.conf" ; then -- PLATFORM_OPTIONS="`cat $TOOLSDIR/distro-configs/CommonWin32.conf | xargs`"; -+ if test -f "$TOP_BUILDDIR/distro-configs/CommonWin32.conf" ; then -+ PLATFORM_OPTIONS="`cat $TOP_BUILDDIR/distro-configs/CommonWin32.conf | xargs`"; - else -- echo "Warning: $TOOLSDIR/distro-configs/CommonWin32.conf not found." -+ echo "Warning: $TOP_BUILDDIR/distro-configs/CommonWin32.conf not found." - fi - else if test "z`uname -s`" = "zDarwin"; then -- if test -f "$TOOLSDIR/distro-configs/CommonMac.conf" ; then -- PLATFORM_OPTIONS="`cat $TOOLSDIR/distro-configs/CommonMac.conf | xargs`"; -+ if test -f "$TOP_BUILDDIR/distro-configs/CommonMac.conf" ; then -+ PLATFORM_OPTIONS="`cat $TOP_BUILDDIR/distro-configs/CommonMac.conf | xargs`"; - else -- echo "Warning: $TOOLSDIR/distro-configs/CommonMac.conf not found." -+ echo "Warning: $TOP_BUILDDIR/distro-configs/CommonMac.conf not found." - fi - else -- if test -f "$TOOLSDIR/distro-configs/CommonLinux.conf" ; then -- PLATFORM_OPTIONS="`cat $TOOLSDIR/distro-configs/CommonLinux.conf | xargs`"; -+ if test -f "$TOP_BUILDDIR/distro-configs/CommonLinux.conf" ; then -+ PLATFORM_OPTIONS="`cat $TOP_BUILDDIR/distro-configs/CommonLinux.conf | xargs`"; - else -- echo "Warning: $TOOLSDIR/distro-configs/CommonLinux.conf not found." -+ echo "Warning: $TOP_BUILDDIR/distro-configs/CommonLinux.conf not found." - fi - fi - fi - --if test "z$DISTRO" != "z" -a -f "$TOOLSDIR/distro-configs/$DISTRO.conf"; then -- CONFIGURE_OPTIONS="$COMMON_OPTIONS $PLATFORM_OPTIONS $OOO_WIDGET_FLAGS `cat $TOOLSDIR/distro-configs/$DISTRO.conf | xargs`"; -+if test "z$DISTRO" != "z" -a -f "$TOP_BUILDDIR/distro-configs/$DISTRO.conf"; then -+ CONFIGURE_OPTIONS="$COMMON_OPTIONS $PLATFORM_OPTIONS $OOO_WIDGET_FLAGS `cat $TOP_BUILDDIR/distro-configs/$DISTRO.conf | xargs`"; - else - echo "ERROR: Could not find the distribution specific configure options" -- echo " file in $TOOLSDIR/distro-configs/." -- echo " $TOOLSDIR/distro-configs/$DISTRO.conf is probably missing." -+ echo " file in $TOP_BUILDDIR/distro-configs/." -+ echo " $TOP_BUILDDIR/distro-configs/$DISTRO.conf is probably missing." - fi - - # Misc. internal -diff --git a/bin/unpack b/bin/unpack -index 453317c..d4b7d0d 100755 ---- a/bin/unpack -+++ b/bin/unpack -@@ -3,7 +3,7 @@ - # - # See setup for user tweakables. - # --. ./setup -+. $TOP_BUILDDIR/bin/setup - - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -@@ -57,7 +57,10 @@ if test "z$SPLIT" = "zyes" ; then - if test "z$PIECE" != "z"; then - CORE_PKGS=$PIECE - else -- CORE_PKGS="sdk ure base calc help extras writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern libs-extern-sys components postprocess extensions" -+ CORE_PKGS="sdk ure base calc help extras writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern libs-extern-sys components postprocess" -+ if test "$ENABLE_EXTENSIONS" = "yes"; then -+ CORE_PKGS="$CORE_PKGS extensions" -+ fi - fi - for pkg in $CORE_PKGS; do - check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2" - -diff --git a/configure.in b/configure.in -index 090951b..f62b161 100644 ---- a/configure.in -+++ b/configure.in -@@ -418,8 +418,8 @@ AM_MAINTAINER_MODE - dnl - dnl Setup the misc. tweaks we need. - dnl --BASEDIR=`pwd` --TOOLSDIR=$BASEDIR -+TOP_BUILDDIR=`pwd` -+TOOLSDIR=$(cd $srcdir && pwd) - - # it will be modified by the --with-additional-sections but it might - # modified also by other options -@@ -528,7 +528,7 @@ warn_use_download=" ./download - " - AC_MSG_CHECKING( for directory where to download sources ) - if test "z$with_srcdir" = "z"; then -- SRCDIR=$BASEDIR/src -+ SRCDIR=$TOP_BUILDDIR/src - elif (echo "${with_srcdir}" | $GREP -v -q "^/"); then - AC_MSG_ERROR([--with-srcdir= must be an absolute path]); - else -@@ -536,7 +536,7 @@ else - fi - AC_MSG_RESULT([$SRCDIR]) - --BUILDDIR=$BASEDIR/build -+BUILDDIR=$TOP_BUILDDIR/build - if test "z$with_ooo_builddir" = "z"; then - OOBUILDDIR=$BUILDDIR/$CVSTAG - else -@@ -554,9 +554,10 @@ if test "z`uname -s`" != "zSunOS" -a "z$with_win32" != "z" -a "z`uname -o`" = "z - AC_MSG_RESULT([yes]) - fi - --rm -f $BASEDIR/stamp/patch.apply -+rm -f $TOP_BUILDDIR/stamp/patch.apply - - AC_SUBST(SRCDIR) -+AC_SUBST(TOP_BUILDDIR) - AC_SUBST(BUILDDIR) - AC_SUBST(TOOLSDIR) - AC_SUBST(OOBUILDDIR) -diff --git a/desktop/Makefile.am b/desktop/Makefile.am -index 1f5cd71..26fecc4 100644 ---- a/desktop/Makefile.am -+++ b/desktop/Makefile.am -@@ -1,6 +1,6 @@ - SUBDIRS=16x16 22x22 24x24 32x32 48x48 scalable mimetypes - --desktop_in_files = ${wildcard *.desktop.in.in} -+desktop_in_files = ${wildcard $(srcdir)/*.desktop.in.in} - - old_gnome_files = \ - openoffice.applications.in \ -diff --git a/patches/apply.pl.in b/patches/apply.pl.in -index 24bd678..e4f6e47 100755 ---- a/patches/apply.pl.in -+++ b/patches/apply.pl.in -@@ -12,6 +12,8 @@ sub get_search_paths() - my @paths = (); - my @search = split (/:/, $options{'PATCHPATH'}); - -+ # Some patches are now generated by configure from *.in into build dir. -+ push @paths, '@TOP_BUILDDIR@/patches/dev300'; - for my $stem (@search) { - push @paths, "$patch_dir/$stem"; - } ---- a/bin/install-dictionaries.pristine 2009-04-07 20:00:14.727496399 +0200 -+++ b/bin/install-dictionaries 2009-04-07 20:00:29.852582690 +0200 -@@ -3,7 +3,7 @@ - # - # See setup for user tweakables. - # --. ./setup -+. $TOP_BUILDDIR/bin/setup - - if test "z$1" != "z"; then - DICTDIR=$1; ---- a/bin/build-galleries.pristine 2009-04-07 20:01:37.997754136 +0200 -+++ b/bin/build-galleries 2009-04-07 20:01:28.843494950 +0200 -@@ -7,7 +7,7 @@ - # - # See setup for user tweakables. - # --. ./setup -+. $TOP_BUILDDIR/bin/setup - - # where to install the OOo-related files (thumbnails & points at the files, ...) - if test "z$1" != "z" ; then ---- a/bin/install-mono.pristine 2009-04-07 20:54:06.207993943 +0200 -+++ b/bin/install-mono 2009-04-07 20:54:28.233084561 +0200 -@@ -11,7 +11,7 @@ if test -n "$OO_TOOLSDIR" ; then - SRCDIR=$OO_TOOLSDIR/../src - split_build=yes - else -- . ./setup -+ . $TOP_BUILDDIR/bin/setup - split_build= - fi - ---- a/patches/dev300/layout-simple-dialogs-svx-no-gtk.diff~ 1970-01-01 01:00:00.000000000 +0100 -+++ b/patches/dev300/layout-simple-dialogs-svx-no-gtk.diff 2009-04-03 21:40:22.076002174 +0200 -@@ -0,0 +1,578 @@ -+diff --git svx/inc/srchdlg.hxx svx/inc/srchdlg.hxx -+index 6403206..69b5315 100644 -+--- svx/inc/srchdlg.hxx -++++ svx/inc/srchdlg.hxx -+@@ -116,12 +116,19 @@ public: -+ -+ // class SvxSearchDialogWrapper ------------------------------------------ -+ -++#include -++#include -++ -++class SvxSearchDialog; -+ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow -+ { -++ SvxSearchDialog *dialog; -+ public: -+ SvxSearchDialogWrapper( Window*pParent, USHORT nId, -+ SfxBindings* pBindings, SfxChildWinInfo* pInfo ); -+ -++ ~SvxSearchDialogWrapper (); -++ SvxSearchDialog *getDialog (); -+ SFX_DECL_CHILDWINDOW(SvxSearchDialogWrapper); -+ }; -+ -+@@ -234,7 +241,7 @@ private: -+ ULONG nModifyFlag; -+ String aStylesStr; -+ String aLayoutStr; -+- String aCalcStr; -++ LocalizedString aCalcStr; -+ -+ SvStringsDtor aSearchStrings; -+ SvStringsDtor aReplaceStrings; -+@@ -286,6 +293,8 @@ private: -+ #endif -+ }; -+ -++#include -++ -+ inline BOOL SvxSearchDialog::HasSearchAttributes() const -+ { -+ int bLen = aSearchAttrText.GetText().Len(); -+diff --git svx/source/dialog/makefile.mk svx/source/dialog/makefile.mk -+index 0bec229..38f7184 100644 -+--- svx/source/dialog/makefile.mk -++++ svx/source/dialog/makefile.mk -+@@ -39,8 +39,4 @@ ENABLE_EXCEPTIONS=TRUE -+ .INCLUDE : settings.mk -+ .INCLUDE : $(PRJ)$/util$/makefile.pmk -+ -+-.IF "$(ENABLE_LAYOUT)" == "TRUE" -+-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc -+-.ENDIF # ENABLE_LAYOUT == TRUE -+- -+ # --- Files -------------------------------------------------------- -+ -+ SRS1NAME=dialogs -+diff --git svx/source/dialog/srchdlg.cxx svx/source/dialog/srchdlg.cxx -+index 9f694b8..d57c0a1 100644 -+--- svx/source/dialog/srchdlg.cxx -++++ svx/source/dialog/srchdlg.cxx -+@@ -78,6 +78,8 @@ -+ -+ #include //CHINA001 -+ -++#include -++ -+ using namespace com::sun::star::i18n; -+ using namespace com::sun::star; -+ using namespace comphelper; -+@@ -110,6 +112,11 @@ SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem); -+ #define GetCheckBoxValue( rBox ) \ -+ rBox.IsEnabled() ? rBox.IsChecked() : FALSE -+ -++#if ENABLE_LAYOUT -++#undef SVX_RES -++#define SVX_RES(x) #x -++#endif /* ENABLE_LAYOUT */ -++ -+ struct SearchDlg_Impl -+ { -+ FixedText aSearchFormats; -+@@ -127,7 +134,11 @@ struct SearchDlg_Impl -+ util::URL aCommand1URL; -+ util::URL aCommand2URL; -+ -+- SearchDlg_Impl( Window* pParent ) : -++#if ENABLE_LAYOUT -++ SearchDlg_Impl( layout::Context* pParent ) : -++#else /* !ENABLE_LAYOUT */ -++ SearchDlg_Impl( Window* pParent ) : -++#endif /* !ENABLE_LAYOUT */ -+ aSearchFormats ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ), -+ aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ), -+ bMultiLineEdit ( FALSE ), -+@@ -317,9 +328,18 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings ) -+ pPage->SetTransliterationFlags( nSettings ); -+ } -+ */ //CHINA001 -+-#ifdef INI_LIST -++ -++#if ENABLE_LAYOUT -++#undef SfxModelessDialog -++#define SfxModelessDialog(bindings, child, parent, id) SfxDialog (parent, "find-and-replace.xml", id, bindings, child) -++#define SVX_RES_PLAIN(x) ResId (x, DIALOG_MGR ()) -++#define THIS_SVX_RES(x) this, #x -++#else /* !ENABLE_LAYOUT */ -++#define SVX_RES_PLAIN SVX_RES -++#define THIS_SVX_RES SVX_RES -++#endif /* !ENABLE_LAYOUT */ -++ -+ #undef INI_LIST -+-#endif -+ #define INI_LIST() \ -+ aSearchText ( this, SVX_RES( FT_SEARCH ) ), \ -+ aSearchLB ( this, SVX_RES( ED_SEARCH ) ), \ -+@@ -373,7 +393,7 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings ) -+ bReadOnly ( FALSE ), \ -+ bConstruct ( TRUE ), \ -+ nModifyFlag ( 0 ), \ -+- aCalcStr ( SVX_RES( STR_WORDCALC ) ), \ -++ aCalcStr ( THIS_SVX_RES( STR_WORDCALC ) ), \ -+ pImpl ( NULL ), \ -+ pSearchList ( NULL ), \ -+ pReplaceList ( NULL ), \ -+@@ -410,6 +430,10 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, Sf -+ } -+ -+ #undef INI_LIST -++#if ENABLE_LAYOUT -++#undef SVX_RES -++#define SVX_RES(x) ResId (x, DIALOG_MGR ()) -++#endif -+ -+ // ----------------------------------------------------------------------- -+ -+@@ -433,6 +457,11 @@ SvxSearchDialog::~SvxSearchDialog() -+ } -+ -+ // ----------------------------------------------------------------------- -++#if ENABLE_LAYOUT -++#undef Window -++#define Window layout::Window -++#endif /* !ENABLE_LAYOUT */ -++ -+ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) -+ { -+ Point aPos(rWindow.GetPosPixel()); -+@@ -442,16 +471,22 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) -+ -+ void SvxSearchDialog::Construct_Impl() -+ { -++#if ENABLE_LAYOUT -++ SetHelpId (SID_SEARCH_DLG); -++#endif /* ENABLE_LAYOUT */ -++ -+ // temporary to avoid incompatibility -+ pImpl = new SearchDlg_Impl( this ); -++#if !ENABLE_LAYOUT -+ pImpl->aSelectionTimer.SetTimeout( 500 ); -+ pImpl->aSelectionTimer.SetTimeoutHdl( -+ LINK( this, SvxSearchDialog, TimeoutHdl_Impl ) ); -+- -++#endif /* !ENABLE_LAYOUT */ -+ EnableControls_Impl( 0 ); -+ -+ // alten Text des aWordBtn's merken -+- ( aCalcStr += sal_Unicode('#') ) += aWordBtn.GetText(); -++ aCalcStr += sal_Unicode('#'); -++ aCalcStr += aWordBtn.GetText(); -+ -+ aLayoutStr = SVX_RESSTR( RID_SVXSTR_SEARCH_STYLES ); -+ aStylesStr = aLayoutBtn.GetText(); -+@@ -719,6 +754,7 @@ void SvxSearchDialog::InitControls_Impl() -+ aLink = LINK( this, SvxSearchDialog, LoseFocusHdl_Impl ); -+ aSearchLB.SetLoseFocusHdl( aLink ); -+ aReplaceLB.SetLoseFocusHdl( aLink ); -++ -+ aSearchTmplLB.SetLoseFocusHdl( aLink ); -+ aReplaceTmplLB.SetLoseFocusHdl( aLink ); -+ -+@@ -916,6 +952,8 @@ void SvxSearchDialog::CalculateDelta_Impl() -+ pMoreBtn->Enable(); -+ } -+ -++#undef Window -++ -+ // ----------------------------------------------------------------------- -+ -+ void SvxSearchDialog::Init_Impl( int bSearchPattern ) -+@@ -1530,7 +1568,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) -+ SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); -+ if(pFact) -+ { -+- AbstractSvxSearchSimilarityDialog* pDlg = pFact->CreateSvxSearchSimilarityDialog( this, -++ AbstractSvxSearchSimilarityDialog* pDlg = pFact->CreateSvxSearchSimilarityDialog( LAYOUT_THIS_WINDOW (this), -+ pSearchItem->IsLEVRelaxed(), -+ pSearchItem->GetLEVOther(), -+ pSearchItem->GetLEVShorter(), -+@@ -1556,7 +1594,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) -+ SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); -+ if(pFact) -+ { -+- AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, pSearchItem->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS ); -++ AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXPAGE_JSEARCH_OPTIONS, pSearchItem->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS ); -+ DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 -+ int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute(); -+ if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true -+@@ -1575,7 +1613,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) -+ pArgs[0].Name = ::rtl::OUString::createFromAscii("SearchString"); -+ pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText()); -+ pArgs[1].Name = ::rtl::OUString::createFromAscii("ParentWindow"); -+- pArgs[1].Value <<= VCLUnoHelper::GetInterface( this ); -++ pArgs[1].Value <<= VCLUnoHelper::GetInterface( LAYOUT_THIS_WINDOW (this) ); -+ if(pBtn == &aSearchComponent1PB) -+ { -+ if ( pImpl->xCommand1Dispatch.is() ) -+@@ -2091,6 +2129,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) -+ aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); -+ -+ ModifyHdl_Impl( (ComboBox*)pCtrl ); -++ -+ aLayoutBtn.SetText( bFormat && nTxtLen ? aLayoutStr : aStylesStr ); -+ return 0; -+ } -+@@ -2164,7 +2203,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) -+ SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); -+ if(pFact) -+ { -+- SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( this, aSet, RID_SVXDLG_SEARCHFORMAT ); -++ SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXDLG_SEARCHFORMAT ); -+ DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 -+ aTxt.Insert( pDlg->GetText(), 0 ); -+ pDlg->SetText( aTxt ); -+@@ -2241,7 +2280,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG ) -+ SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); -+ if(pFact) -+ { -+- VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges, RID_SVXDLG_SEARCHATTR ); -++ VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges, RID_SVXDLG_SEARCHATTR ); -+ DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 -+ pDlg->Execute(); -+ delete pDlg; -+@@ -2400,7 +2439,9 @@ void SvxSearchDialog::PaintAttrText_Impl() -+ -+ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) -+ { -+- if ( &aSearchLB == (ComboBox*)pCtrl ) -++ if (0) -++ ; -++ else if ( &aSearchLB == (ComboBox*)pCtrl ) -+ nModifyFlag |= MODIFY_SEARCH; -+ else if ( &aReplaceLB == (ComboBox*)pCtrl ) -+ nModifyFlag |= MODIFY_REPLACE; -+@@ -2490,25 +2531,38 @@ void SvxSearchDialog::SaveToModule_Impl() -+ -+ // class SvxSearchDialogWrapper ------------------------------------------ -+ -+-SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG) -++SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG); -+ -+ // ----------------------------------------------------------------------- -+ -+ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId, -+ SfxBindings* pBindings, -+- SfxChildWinInfo* pInfo ) : -+- SfxChildWindow( _pParent, nId ) -+- -++ SfxChildWinInfo* pInfo ) -++ : SfxChildWindow( _pParent, nId ) -++ , dialog (new SvxSearchDialog (_pParent, this, *pBindings)) -+ { -+- pWindow = new SvxSearchDialog( _pParent, this, *pBindings ); -+- ( (SvxSearchDialog*)pWindow )->Initialize( pInfo ); -++ pWindow = LAYOUT_THIS_WINDOW (dialog); -++ dialog->Initialize( pInfo ); -+ -+ pBindings->Update( SID_SEARCH_ITEM ); -+ pBindings->Update( SID_SEARCH_OPTIONS ); -+ pBindings->Update( SID_SEARCH_SEARCHSET ); -+ pBindings->Update( SID_SEARCH_REPLACESET ); -+ eChildAlignment = SFX_ALIGN_NOALIGNMENT; -+- ( (SvxSearchDialog*)pWindow )->bConstruct = FALSE; -++ dialog->bConstruct = FALSE; -++} -++ -++SvxSearchDialogWrapper::~SvxSearchDialogWrapper () -++{ -++#if ENABLE_LAYOUT -++ delete dialog; -++ pWindow = 0; -++#endif /* ENABLE_LAYOUT */ -++} -++ -++SvxSearchDialog *SvxSearchDialogWrapper::getDialog () -++{ -++ return dialog; -+ } -+ -+ // ----------------------------------------------------------------------- -+diff --git svx/source/dialog/zoom.cxx svx/source/dialog/zoom.cxx -+index ef1b8e2..50dc336 100644 -+--- svx/source/dialog/zoom.cxx -++++ svx/source/dialog/zoom.cxx -+@@ -56,6 +56,13 @@ -+ -+ #include -+ -++#if ENABLE_LAYOUT -++#undef SVX_RES -++#define SVX_RES(x) #x -++#undef SfxModalDialog -++#define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id ) -++#endif /* ENABLE_LAYOUT */ -++ -+ // static ---------------------------------------------------------------- -+ -+ static USHORT pRanges[] = -+@@ -217,6 +224,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : -+ bModified ( FALSE ) -+ -+ { -++#if ENABLE_LAYOUT -++ SetHelpId (SID_ATTR_ZOOM); -++#endif /* ENABLE_LAYOUT */ -+ Link aLink = LINK( this, SvxZoomDialog, UserHdl ); -+ a100Btn.SetClickHdl( aLink ); -+ aOptimalBtn.SetClickHdl( aLink ); -+diff --git svx/uiconfig/layout/find-and-replace.xml svx/uiconfig/layout/find-and-replace.xml -+new file mode 100644 -+index 0000000..ad5af2b -+--- /dev/null -++++ svx/uiconfig/layout/find-and-replace.xml -+@@ -0,0 +1,111 @@ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -+diff --git svx/uiconfig/layout/layout.mk svx/uiconfig/layout/layout.mk -+deleted file mode 100644 -+index 8c939b0..0000000 -+--- svx/uiconfig/layout/layout.mk -++++ /dev/null -+@@ -1,33 +0,0 @@ -+-# TODO: move to solenv/inc -+-# copies: sc/uiconfig/layout svx/uiconfig/layout sw/uiconfig/layout -+- -+-TRALAY=tralay -+-XML_DEST=$(DLLDEST) -+-XML_LANGS=$(alllangiso) -+- -+-ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j)) -+- -+-# Must remove the -j (no duplicate base file names) flag -+-ZIPUPDATE=-u -+-XML_ZIP = $(PRJNAME)-layout -+- -+-ALLTAR: $(XML_ZIP) -+- -+-$(XML_ZIP): $(ALL_XMLS) -+- -+-ZIP1DIR=$(XML_DEST) -+-ZIP1TARGET=$(XML_ZIP) -+-ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@) -+- -+-$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml -+- -$(MKDIR) $(@:d) -+- @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml -+- $(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $< -+- -+-$(XML_DEST)/%.xml: %.xml -+- -$(MKDIR) $(@:d) -+- $(COPY) $< $@ -+- -+-# Don't want to overwrite filled localize.sdf with empty template -+-template.sdf: -+- $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@ -+diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk -+index d22d6eb..ec4f833 100644 -+--- svx/uiconfig/layout/makefile.mk -++++ svx/uiconfig/layout/makefile.mk -+@@ -39,7 +39,10 @@ TARGET=layout -+ -+ all: ALLTAR -+ -+-XML_FILES=zoom.xml -++XML_FILES=\ -++ "find-and-replace.xml"\ -++ zoom.xml\ -++# -+ -+ .INCLUDE : layout.mk -+ -+@@ -48,3 +51,9 @@ all .PHONY: -+ .ENDIF # ENABLE_LAYOUT != TRUE -+ -+ .INCLUDE : target.mk -++ -++localize.sdf: $(PRJ)/source/dialog/localize.sdf -++ grep srchdlg.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@ -++ grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@ -++ echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@ -++ rm -f *-$@ -+diff --git svx/uiconfig/layout/zoom.xml svx/uiconfig/layout/zoom.xml -+index abed333..5938643 100644 -+--- svx/uiconfig/layout/zoom.xml -++++ svx/uiconfig/layout/zoom.xml -+@@ -7,18 +7,18 @@ -+ xmlns:cnt="http://openoffice.org/2007/layout/container" -+ id="RID_SVXDLG_ZOOM" _title="Zoom & View Layout" optimumsize="true" -+ help-id="SID_ATTR_ZOOM" -+- has_border="true" sizeable="true" moveable="true"> -++ has_border="true" sizeable="true" moveable="true" closeable="true"> -+ -+ -+ -+ -+- -+- -+- -+- -++ -++ -++ -++ -+ -+ -+- -++ -+ -+ -+ -+ -+ -+- -+- -++ -++ -+ -+ -+- -++ -+ -+ -+ -+ -+ -+- -++ -+ -+ -+ -+diff --git svx/util/makefile.pmk svx/util/makefile.pmk -+index f45826f..27f185e 100644 -+--- svx/util/makefile.pmk -++++ svx/util/makefile.pmk -+@@ -36,10 +36,4 @@ CDEFS += -DSVX_DLLIMPLEMENTATION -+ CFLAGS+=-DENABLE_GTK -+ .ENDIF -+ -+-.IF "$(ENABLE_LAYOUT)" == "TRUE" -+-CFLAGS+=-DENABLE_LAYOUT=1 -+-.ELSE -+-CFLAGS+=-DENABLE_LAYOUT=0 -+-.ENDIF # ENABLE_LAYOUT == TRUE -+- -+ VISIBILITY_HIDDEN=TRUE diff --git a/patches/openoffice-store-core.patch b/patches/openoffice-store-core.patch deleted file mode 100644 index 16b00c06f..000000000 --- a/patches/openoffice-store-core.patch +++ /dev/null @@ -1,4118 +0,0 @@ ---- ./store/inc/store/store.h.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/inc/store/store.h 2009-04-06 16:42:11.000000000 +0000 -@@ -95,7 +95,8 @@ storeError SAL_CALL store_openFile ( - rtl_uString *pFilename, - storeAccessMode eAccessMode, - sal_uInt16 nPageSize, -- storeFileHandle *phFile -+ storeFileHandle *phFile, -+ sal_uInt16 nFormatVersion = STORE_FORMAT_V1 - ) SAL_THROW_EXTERN_C(); - - ---- ./store/inc/store/store.hxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/inc/store/store.hxx 2009-04-06 16:42:11.000000000 +0000 -@@ -281,7 +281,8 @@ public: - inline storeError create ( - const rtl::OUString &rFilename, - storeAccessMode eAccessMode, -- sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE -+ sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE, -+ sal_uInt16 nFormatVersion = STORE_FORMAT_V1 - ) SAL_THROW(()); - - /** Open the temporary file in memory. ---- ./store/inc/store/store.inl.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/inc/store/store.inl 2009-04-06 16:42:11.000000000 +0000 -@@ -321,14 +321,15 @@ inline sal_Bool OStoreFile::isValid (voi - inline storeError OStoreFile::create ( - const rtl::OUString &rFilename, - storeAccessMode eAccessMode, -- sal_uInt16 nPageSize) SAL_THROW(()) -+ sal_uInt16 nPageSize, -+ sal_uInt16 nFormatVersion) SAL_THROW(()) - { - if (m_hImpl) - { - store_releaseHandle (m_hImpl); - m_hImpl = 0; - } -- return store_openFile (rFilename.pData, eAccessMode, nPageSize, &m_hImpl); -+ return store_openFile (rFilename.pData, eAccessMode, nPageSize, &m_hImpl, nFormatVersion); - } - - inline storeError OStoreFile::createInMemory ( ---- ./store/inc/store/types.h.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/inc/store/types.h 2009-04-06 16:42:11.000000000 +0000 -@@ -38,16 +38,26 @@ - extern "C" { - #endif - -+/* format version -+ V1 original rdb format, used publicly -+ V2 internal rdb format, which might change during time and -+ should be only used internally for services.rdb, types.rdb -+ and other rdb files shipped with OOo -+*/ -+ -+#define STORE_FORMAT_V1 1 -+#define STORE_FORMAT_V2 2 -+ - /** PageSize (recommended) default. - @see store_openFile() - */ --#define STORE_DEFAULT_PAGESIZE ((sal_uInt16)0x0400) -- -+#define STORE_DEFAULT_PAGESIZE ((sal_uInt16)0x200) - - /** PageSize (enforced) limits. - @see store_openFile() - */ --#define STORE_MINIMUM_PAGESIZE ((sal_uInt16)0x0200) -+#define STORE_MINIMUM_PAGESIZE_V1 ((sal_uInt16)0x200) -+#define STORE_MINIMUM_PAGESIZE_V2 ((sal_uInt16)0x80) - #define STORE_MAXIMUM_PAGESIZE ((sal_uInt16)0x8000) - - ---- ./store/source/filelckb.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/filelckb.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -623,7 +623,11 @@ storeError OFileLockBytes::writeAt ( - // Acquire exclusive access. - osl::MutexGuard aGuard (m_aMutex); - if (m_pImpl->isValid()) -- return m_pImpl->writeAt (nOffset, pBuffer, nBytes, rnDone); -+ { -+ storeError nErr; -+ nErr = m_pImpl->writeAt (nOffset, pBuffer, nBytes, rnDone); -+ return nErr; -+ } - else - return store_E_InvalidHandle; - } ---- ./store/source/storbase.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/storbase.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -51,6 +52,12 @@ - #include - #include - -+#ifdef WNT -+#include -+#else -+#include -+#endif -+ - using namespace store; - - /*======================================================================== -@@ -222,7 +229,9 @@ storeError OStorePageObject::verify (con - * OStoreSuperBlock. - * - *======================================================================*/ --#define STORE_MAGIC_SUPERBLOCK sal_uInt32(0x484D5343) -+#define STORE_MAGIC_SUPERBLOCK_V1 sal_uInt32(0x484D5343) -+#define STORE_MAGIC_SUPERBLOCK_V2 sal_uInt32(0x484D5344) -+#define STORE_VERSION 2 - - struct OStoreSuperBlock - { -@@ -250,7 +259,7 @@ struct OStoreSuperBlock - /** Construction. - */ - OStoreSuperBlock (void) -- : m_aGuard (STORE_MAGIC_SUPERBLOCK), -+ : m_aGuard (STORE_MAGIC_SUPERBLOCK_V2), - m_nMarked (0), - m_aMarked (0), - m_nUnused (0), -@@ -286,14 +295,21 @@ struct OStoreSuperBlock - (m_nMarked == rOther.m_nMarked) && - (m_aMarked == rOther.m_aMarked) && - (m_nUnused == rOther.m_nUnused) && -- (m_aUnused == rOther.m_aUnused) ); -+ (m_aUnused == rOther.m_aUnused) ); - } - - /** create. - */ -- void create (const D& rDescr) -+ void create (const D& rDescr, sal_uInt16 nFormatVersion) - { -- m_aGuard = G(STORE_MAGIC_SUPERBLOCK); -+ switch (nFormatVersion) { -+ case STORE_FORMAT_V1: -+ m_aGuard = G(STORE_MAGIC_SUPERBLOCK_V1); -+ break; -+ case STORE_FORMAT_V2: -+ m_aGuard = G(STORE_MAGIC_SUPERBLOCK_V2); -+ break; -+ } - m_aDescr = rDescr; - - m_nMarked = 0; -@@ -360,13 +376,14 @@ struct OStoreSuperBlock - - /** verify (external representation). - */ -- storeError verify (void) -+ storeError verify (sal_uInt32 nVersion) - { - sal_uInt32 nMagic = m_aGuard.m_nMagic; - #ifdef OSL_BIGENDIAN - nMagic = OSL_SWAPDWORD(nMagic); - #endif /* OSL_BIGENDIAN */ -- if (nMagic != STORE_MAGIC_SUPERBLOCK) -+ if ((nVersion == STORE_FORMAT_V1 && nMagic != STORE_MAGIC_SUPERBLOCK_V1) || -+ (nVersion == STORE_FORMAT_V2 && nMagic != STORE_MAGIC_SUPERBLOCK_V2)) - return store_E_WrongFormat; - - sal_uInt32 nCRC32 = 0; -@@ -380,6 +397,26 @@ struct OStoreSuperBlock - else - return store_E_None; - } -+ -+ /** return version of superblock, determined by magic number in guard -+ */ -+ sal_uInt32 version () -+ { -+ sal_uInt32 nVersion; -+ -+ switch (m_aGuard.m_nMagic) { -+ case STORE_MAGIC_SUPERBLOCK_V1: -+ nVersion = STORE_FORMAT_V1; -+ break; -+ case STORE_MAGIC_SUPERBLOCK_V2: -+ nVersion = STORE_FORMAT_V2; -+ break; -+ default: -+ nVersion = 0; -+ } -+ -+ return nVersion; -+ } - }; - - /*======================================================================== -@@ -471,6 +508,10 @@ struct OStoreSuperBlockPage - SuperBlock m_aSuperTwo; - StateBlock m_aState; - -+ /** version -+ */ -+ sal_uInt32 m_nVersion; -+ - /** size. - */ - static sal_uInt16 size (void) -@@ -492,7 +533,7 @@ struct OStoreSuperBlockPage - - /** Construction. - */ -- OStoreSuperBlockPage (void) -+ OStoreSuperBlockPage (sal_uInt16 nFormatVersion) : m_nVersion (nFormatVersion) - {} - - /** swap (internal and external representation). -@@ -518,6 +559,8 @@ struct OStoreSuperBlockPage - swap(); - #endif /* OSL_BIGENDIAN */ - -+ m_nVersion = m_aSuperOne.version (); -+ - // Done. - return eErrCode; - } -@@ -603,7 +646,7 @@ storeError OStoreSuperBlockPage::create - if (eErrCode == store_E_None) - { - // Setup 1st and 2nd SuperBlock copy. -- m_aSuperOne.create (rDescr); -+ m_aSuperOne.create (rDescr, m_nVersion); - m_aSuperTwo = m_aSuperOne; - - // Mark as modified. -@@ -729,11 +772,11 @@ storeError OStoreSuperBlockPage::verify - #endif /* OSL_BIGENDIAN */ - - // Verify 1st copy. -- storeError eErrCode = m_aSuperOne.verify(); -+ storeError eErrCode = m_aSuperOne.verify (m_nVersion); - if (eErrCode == store_E_None) - { - // Ok. Verify 2nd copy. -- eErrCode = m_aSuperTwo.verify(); -+ eErrCode = m_aSuperTwo.verify (m_nVersion); - if (eErrCode == store_E_None) - { - // Ok. Ensure identical copies (1st copy wins). -@@ -764,7 +807,7 @@ storeError OStoreSuperBlockPage::verify - else - { - // Failure. Verify 2nd copy. -- eErrCode = m_aSuperTwo.verify(); -+ eErrCode = m_aSuperTwo.verify (m_nVersion); - if (eErrCode == store_E_None) - { - // Ok. Replace 1st copy with 2nd copy. -@@ -979,7 +1022,7 @@ storeError OStorePageBIOS::verify (Super - if (rpSuper == 0) - { - // Allocate. -- if ((rpSuper = new SuperPage()) == 0) -+ if ((rpSuper = new SuperPage(version ())) == 0) - return store_E_OutOfMemory; - - // Load (w/o verification). -@@ -1090,7 +1133,7 @@ storeError OStorePageBIOS::initialize ( - * create (SuperBlock). - * Precond: initialized, writeable (store_AccessCreate). - */ --storeError OStorePageBIOS::create (sal_uInt16 nPageSize) -+storeError OStorePageBIOS::create (sal_uInt16 nPageSize, sal_uInt16 nFormatVersion) - { - // Acquire exclusive access. - osl::MutexGuard aGuard (m_aMutex); -@@ -1103,7 +1146,14 @@ storeError OStorePageBIOS::create (sal_u - - // Check PageSize. - sal_uInt16 nMinSize = SuperPage::size(); -- nMinSize = std::max (nMinSize, STORE_MINIMUM_PAGESIZE); -+ switch (nFormatVersion) { -+ case STORE_FORMAT_V1: -+ nMinSize = std::max (nMinSize, STORE_MINIMUM_PAGESIZE_V1); -+ break; -+ case STORE_FORMAT_V2: -+ nMinSize = std::max (nMinSize, STORE_MINIMUM_PAGESIZE_V2); -+ break; -+ } - - nPageSize = std::max (nPageSize, nMinSize); - nPageSize = std::min (nPageSize, STORE_MAXIMUM_PAGESIZE); -@@ -1118,7 +1168,7 @@ storeError OStorePageBIOS::create (sal_u - return eErrCode; - - // Check SuperBlock page allocation. -- if ((m_pSuper == 0) && ((m_pSuper = new SuperPage()) == 0)) -+ if ((m_pSuper == 0) && ((m_pSuper = new SuperPage(nFormatVersion)) == 0)) - { - // Cleanup and fail. - releaseLock (0, SuperPage::size()); -@@ -1465,7 +1515,12 @@ storeError OStorePageBIOS::allocate ( - if (aListHead.m_nAddr) - { - // Allocate from FreeList. -- OStorePageData aPageHead (OStorePageData::size()); -+#ifdef WNT -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) _alloca (OStorePageData::size()); -+#else -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) alloca (OStorePageData::size()); -+#endif -+ OStorePageData aPageHead (OStorePageData::size(), sizeof (OStorePageData), aPageHeadData); - aPageHead.location (aListHead.m_nAddr); - - // Load PageHead. -@@ -1478,9 +1533,9 @@ storeError OStorePageBIOS::allocate ( - - // Verify FreeList head. - OSL_PRECOND( -- aPageHead.m_aUnused.m_nAddr != STORE_PAGE_NULL, -+ aPageHead.PageHeader ().m_aUnused.m_nAddr != STORE_PAGE_NULL, - "OStorePageBIOS::allocate(): page not free"); -- if (aPageHead.m_aUnused.m_nAddr == STORE_PAGE_NULL) -+ if (aPageHead.PageHeader ().m_aUnused.m_nAddr == STORE_PAGE_NULL) - { - // Recovery: Reset FreeList. - m_pSuper->m_aSuperTwo.unusedReset(); -@@ -1501,11 +1556,11 @@ storeError OStorePageBIOS::allocate ( - - // Assign location. - OStorePageData &rData = rPage.getData(); -- rData.location (aPageHead.m_aDescr.m_nAddr); -+ rData.location (aPageHead.PageHeader ().m_aDescr.m_nAddr); - - // Pop from FreeList. -- aListHead.m_nAddr = aPageHead.m_aUnused.m_nAddr; -- rData.m_aUnused.m_nAddr = STORE_PAGE_NULL; -+ aListHead.m_nAddr = aPageHead.PageHeader ().m_aUnused.m_nAddr; -+ rData.PageHeader ().m_aUnused.m_nAddr = STORE_PAGE_NULL; - - // Save page. - eErrCode = poke (rPage); -@@ -1639,8 +1694,8 @@ storeError OStorePageBIOS::free (OStoreP - // Push onto FreeList. - OStorePageLink aListHead (m_pSuper->m_aSuperTwo.unusedHead()); - -- rData.m_aUnused.m_nAddr = aListHead.m_nAddr; -- aListHead.m_nAddr = rData.m_aDescr.m_nAddr; -+ rData.PageHeader ().m_aUnused.m_nAddr = aListHead.m_nAddr; -+ aListHead.m_nAddr = rData.PageHeader ().m_aDescr.m_nAddr; - - // Save PageHead. - eErrCode = poke (rData); -@@ -1678,14 +1733,14 @@ storeError OStorePageBIOS::load (OStoreP - - // Save PageDescriptor. - OStorePageData &rData = rPage.getData(); -- OStorePageDescriptor aDescr (rData.m_aDescr); -+ OStorePageDescriptor aDescr (rData.PageHeader ().m_aDescr); - - // Read page. -- storeError eErrCode = read (aDescr.m_nAddr, &rData, aDescr.m_nSize); -+ storeError eErrCode = read (aDescr.m_nAddr, rData.Data (), aDescr.m_nSize); - if (eErrCode != store_E_None) - { - // Restore PageDescriptor. -- rData.m_aDescr = aDescr; -+ rData.PageHeader ().m_aDescr = aDescr; - return eErrCode; - } - -@@ -1694,7 +1749,7 @@ storeError OStorePageBIOS::load (OStoreP - if (eErrCode != store_E_None) - { - // Restore PageDescriptor. -- rData.m_aDescr = aDescr; -+ rData.PageHeader ().m_aDescr = aDescr; - return eErrCode; - } - -@@ -1704,8 +1759,8 @@ storeError OStorePageBIOS::load (OStoreP - #endif /* OSL_BIGENDIAN */ - - // Verify PageDescriptor. -- if (!((aDescr == rData.m_aDescr) || -- (aDescr <= rData.m_aDescr) )) -+ if (!((aDescr == rData.PageHeader ().m_aDescr) || -+ (aDescr <= rData.PageHeader ().m_aDescr) )) - return store_E_InvalidAccess; - - // Mark page as clean. -@@ -1898,7 +1953,12 @@ storeError OStorePageBIOS::scanNext ( - return store_E_InvalidAccess; - - // Setup PageHead. -- OStorePageData aPageHead (OStorePageData::size()); -+#ifdef WNT -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) _alloca (OStorePageData::size()); -+#else -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) alloca (OStorePageData::size()); -+#endif -+ OStorePageData aPageHead (OStorePageData::size(), sizeof (OStorePageData), aPageHeadData); - - // Check context. - while (rCtx.isValid()) -@@ -1913,11 +1973,11 @@ storeError OStorePageBIOS::scanNext ( - continue; - - // Check PageHead Magic number. -- if (aPageHead.m_aGuard.m_nMagic != rCtx.m_nMagic) -+ if (aPageHead.PageHeader ().m_aGuard.m_nMagic != rCtx.m_nMagic) - continue; - - // Check PageHead Unused link. -- if (aPageHead.m_aUnused.m_nAddr != STORE_PAGE_NULL) -+ if (aPageHead.PageHeader ().m_aUnused.m_nAddr != STORE_PAGE_NULL) - continue; - - // Load page. -@@ -1941,14 +2001,14 @@ storeError OStorePageBIOS::scanNext ( - storeError OStorePageBIOS::peek (OStorePageData &rData) - { - // Save PageDescriptor. -- OStorePageDescriptor aDescr (rData.m_aDescr); -+ OStorePageDescriptor aDescr (rData.PageHeader ().m_aDescr); - - // Read PageHead. -- storeError eErrCode = read (aDescr.m_nAddr, &rData, rData.size()); -+ storeError eErrCode = read (aDescr.m_nAddr, rData.Data (), rData.size()); - if (eErrCode != store_E_None) - { - // Restore PageDescriptor. -- rData.m_aDescr = aDescr; -+ rData.PageHeader ().m_aDescr = aDescr; - return eErrCode; - } - -@@ -1957,7 +2017,7 @@ storeError OStorePageBIOS::peek (OStoreP - if (eErrCode != store_E_None) - { - // Restore PageDescriptor. -- rData.m_aDescr = aDescr; -+ rData.PageHeader ().m_aDescr = aDescr; - return eErrCode; - } - -@@ -1967,8 +2027,8 @@ storeError OStorePageBIOS::peek (OStoreP - #endif /* OSL_BIGENDIAN */ - - // Verify PageDescriptor. -- if (!((aDescr == rData.m_aDescr) || -- (aDescr <= rData.m_aDescr) )) -+ if (!((aDescr == rData.PageHeader ().m_aDescr) || -+ (aDescr <= rData.PageHeader ().m_aDescr) )) - return store_E_InvalidAccess; - else - return store_E_None; -@@ -1981,7 +2041,7 @@ storeError OStorePageBIOS::peek (OStoreP - storeError OStorePageBIOS::poke (OStorePageData &rData) - { - // Save PageDescriptor. -- OStorePageDescriptor aDescr (rData.m_aDescr); -+ OStorePageDescriptor aDescr (rData.PageHeader ().m_aDescr); - - #ifdef OSL_BIGENDIAN - // Swap to external representation. -@@ -1992,7 +2052,7 @@ storeError OStorePageBIOS::poke (OStoreP - rData.guard (); - - // Write PageHead. -- storeError eErrCode = write (aDescr.m_nAddr, &rData, rData.size()); -+ storeError eErrCode = write (aDescr.m_nAddr, rData.Data (), rData.size()); - - #ifdef OSL_BIGENDIAN - // Swap back to internal representation. -@@ -2011,7 +2071,7 @@ storeError OStorePageBIOS::poke (OStoreP - { - // Save PageDescriptor. - OStorePageData &rData = rPage.getData(); -- OStorePageDescriptor aDescr (rData.m_aDescr); -+ OStorePageDescriptor aDescr (rData.PageHeader ().m_aDescr); - - #ifdef OSL_BIGENDIAN - // Swap to external representation. -@@ -2022,7 +2082,7 @@ storeError OStorePageBIOS::poke (OStoreP - rPage.guard (aDescr); - - // Write page. -- storeError eErrCode = write (aDescr.m_nAddr, &rData, aDescr.m_nSize); -+ storeError eErrCode = write (aDescr.m_nAddr, rData.Data (), aDescr.m_nSize); - - #ifdef OSL_BIGENDIAN - // Swap back to internal representation. -@@ -2037,3 +2097,183 @@ storeError OStorePageBIOS::poke (OStoreP - return eErrCode; - } - -+sal_uInt32 OStorePageBIOS::version () -+{ -+ if (!m_pSuper) -+ return 0; -+ -+ return m_pSuper->m_nVersion; -+} -+ -+static void -+copyAndTerminate( sal_Char *pDest, const sal_Char *pSrc, sal_Int32 nBytes) -+{ -+ rtl_copyMemory (pDest, pSrc, nBytes); -+ pDest[nBytes] = '\0'; -+} -+ -+#define STORE_MAGIC_LONGNAME sal_uInt32 (0x12345678) -+ -+struct OStorePageLongNameData : public OStorePageData -+{ -+ typedef OStorePageData base; -+ -+ struct Representation { -+ sal_Char m_nData[1]; -+ }; -+ public: -+ OStorePageLongNameData(sal_uInt16 nPageSize, sal_uInt8 *pData) : -+ OStorePageData (nPageSize, sizeof (OStorePageLongNameData), pData) -+ { -+ base::PageHeader ().m_aGuard.m_nMagic = STORE_MAGIC_LONGNAME; -+ base::PageHeader ().m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >( -+ base::PageHeader ().m_aDescr.m_nUsed); -+ rtl_zeroMemory (&RepresentationData (), capacity()); -+ } -+ -+ /** capacity. -+ */ -+ sal_uInt16 capacity (void) -+ { -+ return (base::PageHeader ().m_aDescr.m_nSize - (base::size())); -+ } -+ -+ Representation& RepresentationData () -+ { -+ return *(Representation *) (Data () + base::size ()); -+ } -+}; -+ -+static sal_uInt16 -+lcl_getPageSize (OStorePageBIOS &rBIOS) -+{ -+ sal_uInt16 nPageSize = STORE_MAXIMUM_PAGESIZE; -+ rBIOS.getPageSize(nPageSize); -+// fprintf (stderr, "page size for extended names %d\n", nPageSize); -+ return nPageSize; -+} -+ -+#define USE_OTHER_BLOCK STORE_INTERNAL_MAX_NAMESIZE -+ -+storeError -+OStorePageNameBlockV1::SetName (const rtl_String *pName, OStorePageBIOS &rBIOS) -+{ -+ rtl_copyMemory (&m_pRepresentation->m_pData[0], -+ pName->buffer, pName->length); -+ rtl_zeroMemory (&m_pRepresentation->m_pData[pName->length], -+ STORE_MAXIMUM_NAMESIZE - pName->length); -+ return store_E_None; -+} -+ -+storeError -+OStorePageNameBlockV1::Name (rtl_String **pName, OStorePageBIOS &rBIOS) -+{ -+ sal_Int32 length = rtl_str_getLength(m_pRepresentation->m_pData); -+ rtl_string_new_WithLength (pName, length + 1); -+ (*pName)->length = length; -+ rtl_copyMemory ((*pName)->buffer, -+ &m_pRepresentation->m_pData[0], length); -+ (*pName)->buffer [length] = 0; -+ -+ return store_E_None; -+} -+ -+storeError -+OStorePageNameBlockV2::SetName (const rtl_String *pName, OStorePageBIOS &rBIOS) -+{ -+ storeError nRet; -+ sal_Char *pDest; -+ -+// fprintf (stderr, "setName '%s'\n", pName->buffer); -+ -+ if (!m_pRepresentation) -+ return store_E_NotExists; -+ -+ m_pRepresentation->m_nNameLength = pName->length; -+ -+ if (pName->length >= USE_OTHER_BLOCK) -+ { -+ sal_uInt16 nSize = lcl_getPageSize(rBIOS); -+#ifdef WNT -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) _alloca (nSize); -+#else -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) alloca (nSize); -+#endif -+ OStorePageLongNameData aNameData (nSize, aPageHeadData); -+ OStorePageObject aNamePage(aNameData); -+ if (!m_pRepresentation->m_nNameBlock) -+ { -+ if ((nRet = rBIOS.allocate (aNamePage)) != store_E_None) -+ { -+ fprintf (stderr, "failed to allocate name page %d\n", nRet); -+ return nRet; -+ } -+ m_pRepresentation->m_nNameBlock = aNameData.location(); -+ } -+ else -+ { -+ aNameData.location (m_pRepresentation->m_nNameBlock); -+ if ((nRet = rBIOS.load(aNamePage)) != store_E_None) -+ { -+ fprintf (stderr, "failed to load name page %d\n", nRet); -+ return nRet; -+ } -+ } -+ copyAndTerminate (m_pRepresentation->m_pNameData, pName->buffer, USE_OTHER_BLOCK - 1); -+ copyAndTerminate (aNameData.RepresentationData ().m_nData, pName->buffer + USE_OTHER_BLOCK - 1, -+ pName->length - (USE_OTHER_BLOCK - 1)); -+ -+ if ((nRet = rBIOS.save (aNamePage)) != store_E_None) -+ { -+ fprintf (stderr, "failed to save name page %d\n", nRet); -+ return nRet; -+ } -+ } -+ else -+ copyAndTerminate (m_pRepresentation->m_pNameData, pName->buffer, pName->length); -+ -+ return store_E_None; -+} -+ -+storeError -+OStorePageNameBlockV2::Name (rtl_String **pName, OStorePageBIOS &rBIOS) -+{ -+ storeError nRet; -+ -+// fprintf (stderr, "get!Name (%d)...\n", m_nNameLength); -+ -+ if (!m_pRepresentation) -+ return store_E_NotExists; -+ -+ rtl_string_new_WithLength (pName, m_pRepresentation->m_nNameLength + 1); -+ (*pName)->length = m_pRepresentation->m_nNameLength; -+ -+ if (m_pRepresentation->m_nNameLength >= USE_OTHER_BLOCK) -+ { -+ sal_uInt16 nSize = lcl_getPageSize(rBIOS); -+#ifdef WNT -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) _alloca (nSize); -+#else -+ sal_uInt8 *aPageHeadData = (sal_uInt8 *) alloca (nSize); -+#endif -+ OStorePageLongNameData aNameData (nSize, aPageHeadData); -+ OStorePageObject aNamePage(aNameData); -+ aNameData.location (m_pRepresentation->m_nNameBlock); -+ -+ if ((nRet = rBIOS.load(aNamePage)) != store_E_None) -+ { -+ fprintf (stderr, "failed to load name page %d\n", nRet); -+ return nRet; -+ } -+ -+ copyAndTerminate ((*pName)->buffer, m_pRepresentation->m_pNameData, USE_OTHER_BLOCK - 1); -+ copyAndTerminate ((*pName)->buffer + USE_OTHER_BLOCK - 1, -+ aNameData.RepresentationData ().m_nData, m_pRepresentation->m_nNameLength - (USE_OTHER_BLOCK - 1)); -+ } -+ else -+ copyAndTerminate ((*pName)->buffer, m_pRepresentation->m_pNameData, m_pRepresentation->m_nNameLength); -+ -+// fprintf (stderr, "... returns '%s'\n", (*pName)->buffer); -+ -+ return store_E_None; -+} ---- ./store/source/storbase.hxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/storbase.hxx 2009-04-06 16:42:11.000000000 +0000 -@@ -28,6 +28,8 @@ - * - ************************************************************************/ - -+#include -+ - #ifndef _STORE_STORBASE_HXX_ - #define _STORE_STORBASE_HXX_ "$Revision: 1.10 $" - -@@ -45,12 +47,18 @@ - #include - #define INCLUDED_CSTDDEF - #endif -+#ifndef _RTL_MEMORY_H_ -+#include -+#endif - - #ifndef INCLUDED_CSTRING - #include - #define INCLUDED_CSTRING - #endif - -+// #define STORE_INTERNAL_MAX_NAMESIZE 96-4 -+#define STORE_INTERNAL_MAX_NAMESIZE 32 -+ - /*======================================================================== - * - * store common internals. -@@ -350,26 +358,101 @@ struct OStorePageLink - } - }; - -+ - /*======================================================================== - * - * OStorePageNameBlock. - * - *======================================================================*/ --struct OStorePageNameBlock -+ -+class OStorePageBIOS; -+ -+struct OStorePageNameBlockA - { -- typedef OStorePageGuard G; - typedef OStorePageKey K; -+ typedef OStorePageGuard G; - -- /** Representation. -+ /** initialize. - */ -- G m_aGuard; -- K m_aKey; -- sal_uInt32 m_nAttrib; -- sal_Char m_pData[STORE_MAXIMUM_NAMESIZE]; -+ virtual void initialize (void) = 0; -+ -+ /** Comparison. -+ */ -+ sal_Bool operator== (const OStorePageNameBlockA& rOther) const -+ { -+ return (Guard () == rOther.Guard ()); -+ } - - /** size. - */ -- static sal_uInt16 size (void) -+ virtual sal_uInt16 size (void) = 0; -+ -+ /** swap (internal and external representation). -+ */ -+ virtual void swap (void) = 0; -+ -+ /** guard (external representation). -+ */ -+ virtual void guard (void) = 0; -+ -+ /** verify (external representation). -+ */ -+ virtual storeError verify (void) = 0; -+ -+ /** namei. -+ */ -+ static storeError namei ( -+ const rtl_String *pPath, const rtl_String *pName, K &rKey) -+ { -+ // Check parameter. -+ if (!(pPath && pName)) -+ return store_E_InvalidParameter; -+ -+ // Check name length. -+ if (pName->length >= STORE_MAXIMUM_NAMESIZE) -+ return store_E_NameTooLong; -+ -+ // Transform pathname into key. -+ rKey.m_nLow = G::crc32 (0, pName->buffer, pName->length); -+ rKey.m_nHigh = G::crc32 (0, pPath->buffer, pPath->length); -+ -+ // Done. -+ return store_E_None; -+ } -+ -+ /** Properties. -+ */ -+ -+ virtual G Guard () const = 0; -+ -+ virtual sal_uInt32 Attrib () = 0; -+ virtual void SetAttrib (sal_uInt32 nAttrib) = 0; -+ virtual K Key () = 0; -+ virtual void SetKey (K aKey) = 0; -+ -+ virtual storeError SetName (const rtl_String *pName, OStorePageBIOS &rBIOS) = 0; -+ virtual storeError Name (rtl_String **pName, OStorePageBIOS &rBIOS) = 0; -+}; -+ -+struct OStorePageNameBlockV1 : OStorePageNameBlockA -+{ -+ typedef OStorePageGuard G; -+ typedef OStorePageKey K; -+ -+ struct Representation { -+ G m_aGuard; -+ K m_aKey; -+ sal_uInt32 m_nAttrib; -+ sal_Char m_pData[STORE_MAXIMUM_NAMESIZE]; -+ }; -+ -+private: -+ Representation* m_pRepresentation; -+ -+public: -+ /** size. -+ */ -+ sal_uInt16 size (void) - { - return sal_uInt16(sizeof(G) + sizeof(K) + sizeof(sal_uInt32) + - sizeof(sal_Char[STORE_MAXIMUM_NAMESIZE])); -@@ -379,25 +462,25 @@ struct OStorePageNameBlock - */ - void initialize (void) - { -- m_aGuard = G(); -- m_aKey = K(); -- m_nAttrib = 0; -- __store_memset (m_pData, 0, sizeof(m_pData)); -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard = G(); -+ m_pRepresentation->m_aKey = K(); -+ m_pRepresentation->m_nAttrib = 0; -+ __store_memset (m_pRepresentation->m_pData, 0, sizeof(m_pRepresentation->m_pData)); -+ } - } - -+ - /** Construction. - */ -- OStorePageNameBlock (void) -- : m_nAttrib (0) -+ OStorePageNameBlockV1 (sal_uInt8 *data) -+ : m_pRepresentation ((Representation *) data) - { -- __store_memset (m_pData, 0, sizeof(m_pData)); - } - -- /** Comparison. -- */ -- sal_Bool operator== (const OStorePageNameBlock& rOther) const -+ OStorePageNameBlockV1 (void) -+ : m_pRepresentation (NULL) - { -- return (m_aGuard == rOther.m_aGuard); - } - - /** swap (internal and external representation). -@@ -405,9 +488,11 @@ struct OStorePageNameBlock - void swap (void) - { - #ifdef OSL_BIGENDIAN -- m_aGuard.swap(); -- m_aKey.swap(); -- m_nAttrib = OSL_SWAPDWORD(m_nAttrib); -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard.swap(); -+ m_pRepresentation->m_aKey.swap(); -+ m_pRepresentation->m_nAttrib = OSL_SWAPDWORD(m_pRepresentation->m_nAttrib); -+ } - #endif /* OSL_BIGENDIAN */ - } - -@@ -415,51 +500,215 @@ struct OStorePageNameBlock - */ - void guard (void) - { -- sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, &m_aKey, size() - sizeof(G)); -+ if (m_pRepresentation) { -+ sal_uInt32 nCRC32 = 0; -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aKey, size() - sizeof(G)); - #ifdef OSL_BIGENDIAN -- nCRC32 = OSL_SWAPDWORD(nCRC32); -+ nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- m_aGuard.m_nCRC32 = nCRC32; -+ m_pRepresentation->m_aGuard.m_nCRC32 = nCRC32; -+ } - } - - /** verify (external representation). - */ - storeError verify (void) - { -+ if (!m_pRepresentation) -+ return store_E_NotExists; -+ - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, &m_aKey, size() - sizeof(G)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aKey, size() - sizeof(G)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- if (m_aGuard.m_nCRC32 != nCRC32) -+ if (m_pRepresentation->m_aGuard.m_nCRC32 != nCRC32) - return store_E_InvalidChecksum; - else - return store_E_None; - } - -- /** namei. -+ /** Properties. -+ */ -+ -+ G Guard () const -+ { -+ return m_pRepresentation->m_aGuard; -+ } -+ -+ sal_uInt32 Attrib () -+ { -+ if (m_pRepresentation) -+ return m_pRepresentation->m_nAttrib; -+ else -+ return 0; -+ } -+ -+ void SetAttrib (sal_uInt32 nAttrib) -+ { -+ if (m_pRepresentation) -+ m_pRepresentation->m_nAttrib = nAttrib; -+ } -+ -+ K Key () -+ { -+ if (m_pRepresentation) -+ return m_pRepresentation->m_aKey; -+ else -+ return K (0, 0); -+ } -+ -+ void SetKey (K aKey) -+ { -+ if (m_pRepresentation) -+ m_pRepresentation->m_aKey = aKey; -+ } -+ -+ storeError SetName (const rtl_String *pName, OStorePageBIOS &rBIOS); -+ storeError Name (rtl_String **pName, OStorePageBIOS &rBIOS); -+}; -+ -+struct OStorePageNameBlockV2 : OStorePageNameBlockA -+{ -+ typedef OStorePageGuard G; -+ typedef OStorePageKey K; -+ -+ struct Representation { -+ G m_aGuard; -+ K m_aKey; -+ sal_uInt32 m_nAttrib; -+ sal_Char m_pNameData[STORE_INTERNAL_MAX_NAMESIZE]; -+ sal_uInt32 m_nNameLength; -+ sal_uInt32 m_nNameBlock; -+ }; -+ -+ Representation* m_pRepresentation; -+ -+ /** size. - */ -- static storeError namei ( -- const rtl_String *pPath, const rtl_String *pName, K &rKey) -+ sal_uInt16 size (void) - { -- // Check parameter. -- if (!(pPath && pName)) -- return store_E_InvalidParameter; -+ return sal_uInt16 (sizeof(G) + sizeof(K) + 3*sizeof(sal_uInt32) + -+ sizeof(sal_Char[STORE_INTERNAL_MAX_NAMESIZE])); -+ } - -- // Check name length. -- if (!(pName->length < STORE_MAXIMUM_NAMESIZE)) -- return store_E_NameTooLong; -+ /** initialize. -+ */ -+ void initialize (void) -+ { -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard = G(); -+ m_pRepresentation->m_aKey = K(); -+ m_pRepresentation->m_nAttrib = 0; -+ m_pRepresentation->m_nNameLength = 0; -+ m_pRepresentation->m_nNameBlock = 0; -+ __store_memset (m_pRepresentation->m_pNameData, 0, sizeof(sal_Char[STORE_INTERNAL_MAX_NAMESIZE])); -+ } -+ } - -- // Transform pathname into key. -- rKey.m_nLow = G::crc32 (0, pName->buffer, pName->length); -- rKey.m_nHigh = G::crc32 (0, pPath->buffer, pPath->length); -+ /** Construction. -+ */ -+ OStorePageNameBlockV2 (sal_uInt8 *data) -+ : m_pRepresentation ((Representation *) data) -+ { -+ } - -- // Done. -- return store_E_None; -+ OStorePageNameBlockV2 (void) -+ : m_pRepresentation (NULL) -+ // : m_nAttrib (0), m_nNameBlock (0), m_nNameLength (0) -+ { -+ // __store_memset (m_pNameData, 0, sizeof(m_pNameData)); -+ } -+ -+ /** swap (internal and external representation). -+ */ -+ void swap (void) -+ { -+#ifdef OSL_BIGENDIAN -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard.swap(); -+ m_pRepresentation->m_aKey.swap(); -+ m_pRepresentation->m_nAttrib = OSL_SWAPDWORD(m_pRepresentation->m_nAttrib); -+ m_pRepresentation->m_nNameLength = OSL_SWAPDWORD(m_pRepresentation->m_nNameLength); -+ m_pRepresentation->m_nNameBlock = OSL_SWAPDWORD(m_pRepresentation->m_nNameBlock); -+ } -+#endif /* OSL_BIGENDIAN */ -+ } -+ -+ /** guard (external representation). -+ */ -+ void guard (void) -+ { -+ if (m_pRepresentation) { -+ sal_uInt32 nCRC32 = 0; -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aKey, size() - sizeof(G)); -+#ifdef OSL_BIGENDIAN -+ nCRC32 = OSL_SWAPDWORD(nCRC32); -+#endif /* OSL_BIGENDIAN */ -+ m_pRepresentation->m_aGuard.m_nCRC32 = nCRC32; -+ } -+ } -+ -+ /** verify (external representation). -+ */ -+ storeError verify (void) -+ { -+ if (!m_pRepresentation) -+ return store_E_NotExists; -+ -+ sal_uInt32 nCRC32 = 0; -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aKey, size() - sizeof(G)); -+#ifdef OSL_BIGENDIAN -+ nCRC32 = OSL_SWAPDWORD(nCRC32); -+#endif /* OSL_BIGENDIAN */ -+ if (m_pRepresentation->m_aGuard.m_nCRC32 != nCRC32) -+ return store_E_InvalidChecksum; -+ else -+ return store_E_None; - } -+ -+ /** Properties. -+ */ -+ -+ G Guard () const -+ { -+ return m_pRepresentation->m_aGuard; -+ } -+ -+ sal_uInt32 Attrib () -+ { -+ if (m_pRepresentation) -+ return m_pRepresentation->m_nAttrib; -+ else -+ return 0; -+ } -+ -+ void SetAttrib (sal_uInt32 nAttrib) -+ { -+ if (m_pRepresentation) -+ m_pRepresentation->m_nAttrib = nAttrib; -+ } -+ -+ K Key () -+ { -+ if (m_pRepresentation) -+ return m_pRepresentation->m_aKey; -+ else -+ return K (0, 0); -+ } -+ -+ void SetKey (K aKey) -+ { -+ if (m_pRepresentation) -+ m_pRepresentation->m_aKey = aKey; -+ } -+ -+ storeError SetName (const rtl_String *pName, OStorePageBIOS &rBIOS); -+ storeError Name (rtl_String **pName, OStorePageBIOS &rBIOS); - }; - - /*======================================================================== -@@ -475,10 +724,30 @@ struct OStorePageData - - /** Representation. - */ -- G m_aGuard; -- D m_aDescr; -- L m_aMarked; -- L m_aUnused; -+ struct Representation { -+ G m_aGuard; -+ D m_aDescr; -+ L m_aMarked; -+ L m_aUnused; -+ }; -+ -+private: -+ -+ Representation* m_pPageHeader; -+ -+public: -+ -+ inline Representation& PageHeader () const -+ { -+ return *m_pPageHeader; -+ } -+ -+ /** Representation. -+ */ -+ inline sal_uInt8* Data () const -+ { -+ return (sal_uInt8*) m_pPageHeader; -+ } - - /** size. - */ -@@ -491,24 +760,30 @@ struct OStorePageData - */ - sal_uInt32 location (void) const - { -- return m_aDescr.m_nAddr; -+ return PageHeader ().m_aDescr.m_nAddr; - } - - void location (sal_uInt32 nAddr) - { -- m_aDescr.m_nAddr = nAddr; -+ PageHeader ().m_aDescr.m_nAddr = nAddr; - } - - /** Allocation. - */ - static void* operator new (size_t n) - { -+ fprintf (stderr, "warning: OStorePageData allocated without additional space\n"); -+ - return rtl_allocateMemory (n); - } - -- static void* operator new (size_t, sal_uInt16 nPageSize) -+ static void* operator new (size_t n, sal_uInt16 nPageSize) - { -- return rtl_allocateMemory (nPageSize); -+ void* mem = rtl_allocateMemory (n + nPageSize); -+ -+ rtl_zeroMemory (((sal_uInt8 *)mem) + n, nPageSize); -+ -+ return mem; - } - - static void operator delete (void *p) -@@ -523,18 +798,23 @@ struct OStorePageData - - /** Construction. - */ -- OStorePageData (sal_uInt16 nPageSize) -+ -+ OStorePageData (sal_uInt16 nPageSize, sal_uInt32 nDataOffset, sal_uInt8* pData = NULL) - { -- m_aDescr.m_nSize = nPageSize; -- m_aDescr.m_nUsed = size(); -+ if (pData) -+ m_pPageHeader = (Representation *) pData; -+ else -+ m_pPageHeader = (Representation *) (((sal_uInt8*) this) + nDataOffset); -+ PageHeader ().m_aDescr.m_nSize = nPageSize; -+ PageHeader ().m_aDescr.m_nUsed = size(); - } - - OStorePageData& operator= (const OStorePageData& rOther) - { -- m_aGuard = rOther.m_aGuard; -- m_aDescr = rOther.m_aDescr; -- m_aMarked = rOther.m_aMarked; -- m_aUnused = rOther.m_aUnused; -+ PageHeader ().m_aGuard = rOther.PageHeader ().m_aGuard; -+ PageHeader ().m_aDescr = rOther.PageHeader ().m_aDescr; -+ PageHeader ().m_aMarked = rOther.PageHeader ().m_aMarked; -+ PageHeader ().m_aUnused = rOther.PageHeader ().m_aUnused; - return *this; - } - -@@ -542,10 +822,10 @@ struct OStorePageData - */ - sal_Bool operator== (const OStorePageData& rOther) const - { -- return ((m_aGuard == rOther.m_aGuard ) && -- (m_aDescr == rOther.m_aDescr ) && -- (m_aMarked == rOther.m_aMarked) && -- (m_aUnused == rOther.m_aUnused) ); -+ return ((PageHeader ().m_aGuard == rOther.PageHeader ().m_aGuard ) && -+ (PageHeader ().m_aDescr == rOther.PageHeader ().m_aDescr ) && -+ (PageHeader ().m_aMarked == rOther.PageHeader ().m_aMarked) && -+ (PageHeader ().m_aUnused == rOther.PageHeader ().m_aUnused) ); - } - - /** swap (internal and external representation). -@@ -553,10 +833,10 @@ struct OStorePageData - void swap () - { - #ifdef OSL_BIGENDIAN -- m_aGuard.swap(); -- m_aDescr.swap(); -- m_aMarked.swap(); -- m_aUnused.swap(); -+ PageHeader ().m_aGuard.swap(); -+ PageHeader ().m_aDescr.swap(); -+ PageHeader ().m_aMarked.swap(); -+ PageHeader ().m_aUnused.swap(); - #endif /* OSL_BIGENDIAN */ - } - -@@ -565,12 +845,12 @@ struct OStorePageData - void guard () - { - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, &m_aDescr, size() - sizeof(G)); -+ nCRC32 = G::crc32 (nCRC32, &PageHeader ().m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &PageHeader ().m_aDescr, size() - sizeof(G)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- m_aGuard.m_nCRC32 = nCRC32; -+ PageHeader ().m_aGuard.m_nCRC32 = nCRC32; - } - - /** verify (external representation). -@@ -578,12 +858,12 @@ struct OStorePageData - storeError verify () - { - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, &m_aDescr, size() - sizeof(G)); -+ nCRC32 = G::crc32 (nCRC32, &PageHeader ().m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &PageHeader ().m_aDescr, size() - sizeof(G)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- if (m_aGuard.m_nCRC32 != nCRC32) -+ if (PageHeader ().m_aGuard.m_nCRC32 != nCRC32) - return store_E_InvalidChecksum; - else - return store_E_None; -@@ -834,6 +1114,10 @@ public: - ScanContext &rCtx, - OStorePageObject &rPage); - -+ /** version -+ */ -+ sal_uInt32 version (); -+ - protected: - /** Destruction (OReference). - */ -@@ -842,7 +1126,8 @@ protected: - /** create (SuperBlock). - */ - storeError create ( -- sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE); -+ sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE, -+ sal_uInt16 nFormatVersion = STORE_FORMAT_V1); - - /** Page Maintenance. - */ ---- ./store/source/storcach.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/storcach.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -60,7 +60,8 @@ namespace store - struct OStorePageCacheEntry - { - typedef OStorePageCacheEntry self; -- typedef OStorePageData data; -+ typedef OStorePageData PD; -+ typedef sal_uInt8 data; - typedef OStorePageDescriptor D; - - /** Representation. -@@ -83,34 +84,33 @@ struct OStorePageCacheEntry - - /** Construction. - */ -- OStorePageCacheEntry (const D& rDescr, const data& rData) -+ OStorePageCacheEntry (const D& rDescr, const PD& rData) - : m_aDescr (rDescr) - { -- sal_uInt16 nSize = m_aDescr.m_nSize; -- m_pData = new(nSize) data(nSize); -- __store_memcpy (m_pData, &rData, nSize); -+ m_pData = (data*) rtl_allocateMemory (m_aDescr.m_nSize); -+ __store_memcpy (m_pData, rData.Data (), m_aDescr.m_nSize); - m_pNext = m_pPrev = this; - } - - /** Data assignment. - */ -- void assign (const D& rDescr, const data& rData) -+ void assign (const D& rDescr, const PD& rData) - { - m_aDescr.m_nAddr = rDescr.m_nAddr; - if (!(m_aDescr.m_nSize == rDescr.m_nSize)) - { -- delete m_pData; -- m_pData = new(rDescr.m_nSize) data(rDescr.m_nSize); -+ rtl_freeMemory (m_pData); -+ m_pData = (data*) rtl_allocateMemory (m_aDescr.m_nSize); - m_aDescr.m_nSize = rDescr.m_nSize; - } -- __store_memcpy (m_pData, &rData, m_aDescr.m_nSize); -+ __store_memcpy (m_pData, rData.Data (), m_aDescr.m_nSize); - } - - /** Destruction. - */ - ~OStorePageCacheEntry (void) - { -- delete m_pData; -+ rtl_freeMemory (m_pData); - } - - /** Comparison. -@@ -506,7 +506,7 @@ storeError OStorePageCache::load ( - } - - // Load data and Leave. -- __store_memcpy (&rData, m_pHead->m_pData, rDescr.m_nSize); -+ __store_memcpy (rData.Data (), m_pHead->m_pData, rDescr.m_nSize); - STORE_METHOD_LEAVE(pMutex, store_E_None); - } - } -@@ -516,7 +516,7 @@ storeError OStorePageCache::load ( - - // Load data. - storeError eErrCode = rBIOS.read ( -- rDescr.m_nAddr, &rData, rDescr.m_nSize); -+ rDescr.m_nAddr, rData.Data (), rDescr.m_nSize); - if (eErrCode != store_E_None) - STORE_METHOD_LEAVE(pMutex, eErrCode); - -@@ -576,7 +576,7 @@ storeError OStorePageCache::update ( - m_pHead->dirty(); - - // Update data and leave. -- __store_memcpy (m_pHead->m_pData, &rData, rDescr.m_nSize); -+ __store_memcpy (m_pHead->m_pData, rData.Data (), rDescr.m_nSize); - STORE_METHOD_LEAVE(pMutex, store_E_None); - } - } ---- ./store/source/stordata.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/stordata.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -51,7 +51,7 @@ using namespace store; - * OStoreIndirectionPageData. - */ - OStoreIndirectionPageData::OStoreIndirectionPageData (sal_uInt16 nPageSize) -- : OStorePageData (nPageSize) -+ : OStorePageData (nPageSize, sizeof (self)) - { - initialize(); - } -@@ -61,14 +61,14 @@ OStoreIndirectionPageData::OStoreIndirec - */ - void OStoreIndirectionPageData::initialize (void) - { -- base::m_aGuard.m_nMagic = STORE_MAGIC_INDIRECTPAGE; -- base::m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >( -- base::m_aDescr.m_nUsed + self::size()); -- self::m_aGuard.m_nMagic = 0; -+ base::PageHeader ().m_aGuard.m_nMagic = STORE_MAGIC_INDIRECTPAGE; -+ base::PageHeader ().m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >( -+ base::PageHeader ().m_aDescr.m_nUsed + self::size()); -+ self::DataRepresentation ().m_aGuard.m_nMagic = 0; - - sal_uInt16 i, n = capacityCount(); - for (i = 0; i < n; i++) -- m_pData[i] = STORE_PAGE_NULL; -+ DataRepresentation ().m_pData[i] = STORE_PAGE_NULL; - } - - /* -@@ -82,11 +82,11 @@ void OStoreIndirectionPageData::swap ( - ) - { - #ifdef OSL_BIGENDIAN -- m_aGuard.swap(); -+ DataRepresentation ().m_aGuard.swap(); - - sal_uInt16 i, n = capacityCount (rDescr); - for (i = 0; i < n; i++) -- m_pData[i] = OSL_SWAPDWORD(m_pData[i]); -+ DataRepresentation ().m_pData[i] = OSL_SWAPDWORD(DataRepresentation ().m_pData[i]); - #endif /* OSL_BIGENDIAN */ - } - -@@ -149,7 +149,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, store_E_InvalidAccess); - - // Obtain data page location. -- sal_uInt32 nAddr = m_rPage.m_pData[nSingle]; -+ sal_uInt32 nAddr = m_rPage.DataRepresentation ().m_pData[nSingle]; - if (nAddr == STORE_PAGE_NULL) - STORE_METHOD_LEAVE(pMutex, store_E_NotExists); - -@@ -181,19 +181,19 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, store_E_InvalidAccess); - - // Check single indirect page location. -- if (m_rPage.m_pData[nDouble] == STORE_PAGE_NULL) -+ if (m_rPage.DataRepresentation ().m_pData[nDouble] == STORE_PAGE_NULL) - STORE_METHOD_LEAVE(pMutex, store_E_NotExists); - - // Check single indirect page buffer. - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) page(nPageSize); - } - - // Load single indirect page. - OStoreIndirectionPageObject aSingle (*rpSingle); -- aSingle.location (m_rPage.m_pData[nDouble]); -+ aSingle.location (m_rPage.DataRepresentation ().m_pData[nDouble]); - - storeError eErrCode = rBIOS.load (aSingle); - if (eErrCode != store_E_None) -@@ -229,19 +229,19 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, store_E_InvalidAccess); - - // Check double indirect page location. -- if (m_rPage.m_pData[nTriple] == STORE_PAGE_NULL) -+ if (m_rPage.DataRepresentation ().m_pData[nTriple] == STORE_PAGE_NULL) - STORE_METHOD_LEAVE(pMutex, store_E_NotExists); - - // Check double indirect page buffer. - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) page(nPageSize); - } - - // Load double indirect page. - OStoreIndirectionPageObject aDouble (*rpDouble); -- aDouble.location (m_rPage.m_pData[nTriple]); -+ aDouble.location (m_rPage.DataRepresentation ().m_pData[nTriple]); - - storeError eErrCode = rBIOS.load (aDouble); - if (eErrCode != store_E_None) -@@ -272,7 +272,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, eErrCode); - - // Obtain data page location. -- rData.location (m_rPage.m_pData[nSingle]); -+ rData.location (m_rPage.DataRepresentation ().m_pData[nSingle]); - if (rData.location() == STORE_PAGE_NULL) - { - // Allocate data page. -@@ -281,7 +281,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, eErrCode); - - // Save data page location. -- m_rPage.m_pData[nSingle] = rData.location(); -+ m_rPage.DataRepresentation ().m_pData[nSingle] = rData.location(); - touch(); - - // Save this page. -@@ -322,13 +322,13 @@ storeError OStoreIndirectionPageObject:: - // Check single indirect page buffer. - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) page(nPageSize); - } - - // Obtain single indirect page location. - OStoreIndirectionPageObject aSingle (*rpSingle); -- aSingle.location (m_rPage.m_pData[nDouble]); -+ aSingle.location (m_rPage.DataRepresentation ().m_pData[nDouble]); - if (aSingle.location() == STORE_PAGE_NULL) - { - // Initialize single indirect page buffer. -@@ -340,7 +340,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, eErrCode); - - // Save single indirect page location. -- m_rPage.m_pData[nDouble] = aSingle.location(); -+ m_rPage.DataRepresentation ().m_pData[nDouble] = aSingle.location(); - touch(); - - // Save this page. -@@ -389,13 +389,13 @@ storeError OStoreIndirectionPageObject:: - // Check double indirect page buffer. - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) page(nPageSize); - } - - // Obtain double indirect page location. - OStoreIndirectionPageObject aDouble (*rpDouble); -- aDouble.location (m_rPage.m_pData[nTriple]); -+ aDouble.location (m_rPage.DataRepresentation ().m_pData[nTriple]); - if (aDouble.location() == STORE_PAGE_NULL) - { - // Initialize double indirect page buffer. -@@ -407,7 +407,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, eErrCode); - - // Save double indirect page location. -- m_rPage.m_pData[nTriple] = aDouble.location(); -+ m_rPage.DataRepresentation ().m_pData[nTriple] = aDouble.location(); - touch(); - - // Save this page. -@@ -448,7 +448,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, store_E_InvalidAccess); - - // Save PageDescriptor. -- D aDescr (m_rPage.m_aDescr); -+ D aDescr (m_rPage.PageHeader ().m_aDescr); - - // Acquire Lock. - storeError eErrCode = rBIOS.acquireLock (aDescr.m_nAddr, aDescr.m_nSize); -@@ -459,7 +459,7 @@ storeError OStoreIndirectionPageObject:: - for (i = n; i > nSingle; i--) - { - // Obtain data page location. -- sal_uInt32 nAddr = m_rPage.m_pData[i - 1]; -+ sal_uInt32 nAddr = m_rPage.DataRepresentation ().m_pData[i - 1]; - if (nAddr == STORE_PAGE_NULL) continue; - - // Free data page. -@@ -472,7 +472,7 @@ storeError OStoreIndirectionPageObject:: - } - - // Clear pointer to data page. -- m_rPage.m_pData[i - 1] = STORE_PAGE_NULL; -+ m_rPage.DataRepresentation ().m_pData[i - 1] = STORE_PAGE_NULL; - touch(); - } - -@@ -517,7 +517,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, store_E_InvalidAccess); - - // Save PageDescriptor. -- D aDescr (m_rPage.m_aDescr); -+ D aDescr (m_rPage.PageHeader ().m_aDescr); - - // Acquire Lock. - storeError eErrCode = rBIOS.acquireLock (aDescr.m_nAddr, aDescr.m_nSize); -@@ -529,13 +529,13 @@ storeError OStoreIndirectionPageObject:: - for (i = n; i > nDouble + 1; i--) - { - // Obtain single indirect page location. -- sal_uInt32 nAddr = m_rPage.m_pData[i - 1]; -+ sal_uInt32 nAddr = m_rPage.DataRepresentation ().m_pData[i - 1]; - if (nAddr == STORE_PAGE_NULL) continue; - - // Check single indirect page buffer. - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) page(nPageSize); - } - -@@ -572,18 +572,18 @@ storeError OStoreIndirectionPageObject:: - } - - // Clear pointer to single indirect page. -- m_rPage.m_pData[i - 1] = STORE_PAGE_NULL; -+ m_rPage.DataRepresentation ().m_pData[i - 1] = STORE_PAGE_NULL; - touch(); - } - - // Obtain last single indirect page location. -- sal_uInt32 nAddr = m_rPage.m_pData[nDouble]; -+ sal_uInt32 nAddr = m_rPage.DataRepresentation ().m_pData[nDouble]; - if (nAddr != STORE_PAGE_NULL) - { - // Check single indirect page buffer. - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) page(nPageSize); - } - -@@ -623,7 +623,7 @@ storeError OStoreIndirectionPageObject:: - } - - // Clear pointer to last single indirect page. -- m_rPage.m_pData[nDouble] = STORE_PAGE_NULL; -+ m_rPage.DataRepresentation ().m_pData[nDouble] = STORE_PAGE_NULL; - touch(); - } - } -@@ -672,7 +672,7 @@ storeError OStoreIndirectionPageObject:: - STORE_METHOD_LEAVE(pMutex, store_E_InvalidAccess); - - // Save PageDescriptor. -- D aDescr (m_rPage.m_aDescr); -+ D aDescr (m_rPage.PageHeader ().m_aDescr); - - // Acquire Lock. - storeError eErrCode = rBIOS.acquireLock (aDescr.m_nAddr, aDescr.m_nSize); -@@ -684,13 +684,13 @@ storeError OStoreIndirectionPageObject:: - for (i = n; i > nTriple + 1; i--) - { - // Obtain double indirect page location. -- sal_uInt32 nAddr = m_rPage.m_pData[i - 1]; -+ sal_uInt32 nAddr = m_rPage.DataRepresentation ().m_pData[i - 1]; - if (nAddr == STORE_PAGE_NULL) continue; - - // Check double indirect page buffer. - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) page(nPageSize); - } - -@@ -728,18 +728,18 @@ storeError OStoreIndirectionPageObject:: - } - - // Clear pointer to double indirect page. -- m_rPage.m_pData[i - 1] = STORE_PAGE_NULL; -+ m_rPage.DataRepresentation ().m_pData[i - 1] = STORE_PAGE_NULL; - touch(); - } - - // Obtain last double indirect page location. -- sal_uInt32 nAddr = m_rPage.m_pData[nTriple]; -+ sal_uInt32 nAddr = m_rPage.DataRepresentation ().m_pData[nTriple]; - if (nAddr != STORE_PAGE_NULL) - { - // Check double indirect page buffer. - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) page(nPageSize); - } - -@@ -780,7 +780,7 @@ storeError OStoreIndirectionPageObject:: - } - - // Clear pointer to last double indirect page. -- m_rPage.m_pData[nTriple] = STORE_PAGE_NULL; -+ m_rPage.DataRepresentation ().m_pData[nTriple] = STORE_PAGE_NULL; - touch(); - } - } -@@ -808,13 +808,13 @@ storeError OStoreIndirectionPageObject:: - - /*======================================================================== - * -- * OStoreDirectoryDataBlock::LinkTable implementation. -+ * OStoreDirectoryDataBlockV1::LinkTable implementation. - * - *======================================================================*/ - /* - * LinkTable::LinkTable. - */ --OStoreDirectoryDataBlock::LinkTable::LinkTable (void) -+OStoreDirectoryDataBlockV1::LinkTable::LinkTable (void) - { - initialize(); - } -@@ -822,39 +822,87 @@ OStoreDirectoryDataBlock::LinkTable::Lin - /* - * LinkTable::initialize. - */ --void OStoreDirectoryDataBlock::LinkTable::initialize (void) -+void OStoreDirectoryDataBlockV1::LinkTable::initialize (void) - { - sal_Int32 i; -- for (i = 0; i < STORE_LIMIT_DATAPAGE_DIRECT; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DIRECT_V1; i++) - m_pDirect[i] = STORE_PAGE_NULL; -- for (i = 0; i < STORE_LIMIT_DATAPAGE_SINGLE; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_SINGLE_V1; i++) - m_pSingle[i] = STORE_PAGE_NULL; -- for (i = 0; i < STORE_LIMIT_DATAPAGE_DOUBLE; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DOUBLE_V1; i++) - m_pDouble[i] = STORE_PAGE_NULL; -- for (i = 0; i < STORE_LIMIT_DATAPAGE_TRIPLE; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_TRIPLE_V1; i++) - m_pTriple[i] = STORE_PAGE_NULL; - } - - /* - * LinkTable::swap. - */ --void OStoreDirectoryDataBlock::LinkTable::swap (void) -+void OStoreDirectoryDataBlockV1::LinkTable::swap (void) - { - #ifdef OSL_BIGENDIAN - sal_Int32 i; -- for (i = 0; i < STORE_LIMIT_DATAPAGE_DIRECT; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DIRECT_V1; i++) - m_pDirect[i] = OSL_SWAPDWORD(m_pDirect[i]); -- for (i = 0; i < STORE_LIMIT_DATAPAGE_SINGLE; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_SINGLE_V1; i++) - m_pSingle[i] = OSL_SWAPDWORD(m_pSingle[i]); -- for (i = 0; i < STORE_LIMIT_DATAPAGE_DOUBLE; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DOUBLE_V1; i++) - m_pDouble[i] = OSL_SWAPDWORD(m_pDouble[i]); -- for (i = 0; i < STORE_LIMIT_DATAPAGE_TRIPLE; i++) -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_TRIPLE_V1; i++) - m_pTriple[i] = OSL_SWAPDWORD(m_pTriple[i]); - #endif /* OSL_BIGENDIAN */ - } - - /*======================================================================== - * -+ * OStoreDirectoryDataBlockV2::LinkTable implementation. -+ * -+ *======================================================================*/ -+/* -+ * LinkTable::LinkTable. -+ */ -+OStoreDirectoryDataBlockV2::LinkTable::LinkTable (void) -+{ -+ initialize(); -+} -+ -+/* -+ * LinkTable::initialize. -+ */ -+void OStoreDirectoryDataBlockV2::LinkTable::initialize (void) -+{ -+ sal_Int32 i; -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DIRECT_V2; i++) -+ m_pDirect[i] = STORE_PAGE_NULL; -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_SINGLE_V2; i++) -+ m_pSingle[i] = STORE_PAGE_NULL; -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DOUBLE_V2; i++) -+ m_pDouble[i] = STORE_PAGE_NULL; -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_TRIPLE_V2; i++) -+ m_pTriple[i] = STORE_PAGE_NULL; -+} -+ -+/* -+ * LinkTable::swap. -+ */ -+void OStoreDirectoryDataBlockV2::LinkTable::swap (void) -+{ -+#ifdef OSL_BIGENDIAN -+ sal_Int32 i; -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DIRECT_V2; i++) -+ m_pDirect[i] = OSL_SWAPDWORD(m_pDirect[i]); -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_SINGLE_V2; i++) -+ m_pSingle[i] = OSL_SWAPDWORD(m_pSingle[i]); -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_DOUBLE_V2; i++) -+ m_pDouble[i] = OSL_SWAPDWORD(m_pDouble[i]); -+ for (i = 0; i < STORE_LIMIT_DATAPAGE_TRIPLE_V2; i++) -+ m_pTriple[i] = OSL_SWAPDWORD(m_pTriple[i]); -+#endif /* OSL_BIGENDIAN */ -+} -+ -+ -+/*======================================================================== -+ * - * OStoreDirectoryPageObject implementation. - * - *======================================================================*/ -@@ -901,13 +949,13 @@ storeError OStoreDirectoryPageObject::ve - OStoreDirectoryPageData::ChunkScope - OStoreDirectoryPageObject::scope ( - sal_uInt32 nPage, -- page::DataBlock::LinkDescriptor &rDescr) const -+ page::DataBlockT::LinkDescriptor &rDescr) const - { - typedef OStoreIndirectionPageData indrct; - sal_uInt32 index0, index1, index2, index3; - - // direct. -- sal_uInt32 nCount = m_rPage.m_aDataBlock.directCount(); -+ sal_uInt32 nCount = m_rPage.DataBlock ().directCount(); - sal_uInt32 nLimit = nCount; - if (nPage < nLimit) - { -@@ -923,8 +971,8 @@ OStoreDirectoryPageObject::scope ( - nPage -= nLimit; - - // single indirect. -- sal_uInt32 nCapacity = indrct::capacityCount(m_rPage.m_aDescr); -- nCount = m_rPage.m_aDataBlock.singleCount(); -+ sal_uInt32 nCapacity = indrct::capacityCount(m_rPage.PageHeader ().m_aDescr); -+ nCount = m_rPage.DataBlock ().singleCount(); - nLimit = nCount * nCapacity; - if (nPage < nLimit) - { -@@ -951,7 +999,7 @@ OStoreDirectoryPageObject::scope ( - nPage -= nLimit; - - // double indirect. -- nCount = m_rPage.m_aDataBlock.doubleCount(); -+ nCount = m_rPage.DataBlock ().doubleCount(); - nLimit = nCount * nCapacity * nCapacity; - if (nPage < nLimit) - { -@@ -984,7 +1032,7 @@ OStoreDirectoryPageObject::scope ( - nPage -= nLimit; - - // triple indirect. -- nCount = m_rPage.m_aDataBlock.tripleCount(); -+ nCount = m_rPage.DataBlock ().tripleCount(); - nLimit = nCount * nCapacity * nCapacity * nCapacity; - if (nPage < nLimit) - { -@@ -1041,7 +1089,7 @@ storeError OStoreDirectoryPageObject::ge - STORE_METHOD_ENTER(pMutex); - - // Determine scope and link indices. -- page::DataBlock::LinkDescriptor aLink; -+ page::DataBlockT::LinkDescriptor aLink; - page::ChunkScope eScope = scope (nPage, aLink); - - storeError eErrCode = store_E_None; -@@ -1062,7 +1110,7 @@ storeError OStoreDirectoryPageObject::ge - - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) indirect(nPageSize); - } - -@@ -1085,7 +1133,7 @@ storeError OStoreDirectoryPageObject::ge - - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) indirect(nPageSize); - } - -@@ -1110,7 +1158,7 @@ storeError OStoreDirectoryPageObject::ge - - if (rpTriple == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpTriple = new(nPageSize) indirect(nPageSize); - } - -@@ -1161,7 +1209,7 @@ storeError OStoreDirectoryPageObject::pu - STORE_METHOD_ENTER(pMutex); - - // Determine scope and link indices. -- page::DataBlock::LinkDescriptor aLink; -+ page::DataBlockT::LinkDescriptor aLink; - page::ChunkScope eScope = scope (nPage, aLink); - - storeError eErrCode = store_E_None; -@@ -1185,7 +1233,7 @@ storeError OStoreDirectoryPageObject::pu - { - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) indirect(nPageSize); - } - -@@ -1216,7 +1264,7 @@ storeError OStoreDirectoryPageObject::pu - { - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) indirect(nPageSize); - } - -@@ -1249,7 +1297,7 @@ storeError OStoreDirectoryPageObject::pu - { - if (rpTriple == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpTriple = new(nPageSize) indirect(nPageSize); - } - -@@ -1312,7 +1360,7 @@ storeError OStoreDirectoryPageObject::tr - STORE_METHOD_ENTER(pMutex); - - // Determine scope and link indices. -- page::DataBlock::LinkDescriptor aLink; -+ page::DataBlockT::LinkDescriptor aLink; - page::ChunkScope eScope = scope (nPage, aLink); - - storeError eErrCode = store_E_None; -@@ -1381,7 +1429,7 @@ storeError OStoreDirectoryPageObject::tr - // Check single indirect page buffer. - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) indirect(nPageSize); - } - -@@ -1438,7 +1486,7 @@ storeError OStoreDirectoryPageObject::tr - // Check double indirect page buffer. - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) indirect(nPageSize); - } - -@@ -1489,7 +1537,7 @@ storeError OStoreDirectoryPageObject::tr - // Check triple indirect page buffer. - if (rpTriple == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpTriple = new(nPageSize) indirect(nPageSize); - } - -@@ -1560,7 +1608,7 @@ storeError OStoreDirectoryPageObject::tr - if (eScope == page::SCOPE_DIRECT) - { - // Truncate direct data pages. -- sal_uInt16 i, n = m_rPage.m_aDataBlock.directCount(); -+ sal_uInt16 i, n = m_rPage.DataBlock ().directCount(); - for (i = n; i > nRemain; i--) - { - // Obtain data page location. -@@ -1584,7 +1632,7 @@ storeError OStoreDirectoryPageObject::tr - if (eScope == page::SCOPE_SINGLE) - { - // Truncate single indirect pages. -- sal_uInt16 i, n = m_rPage.m_aDataBlock.singleCount(); -+ sal_uInt16 i, n = m_rPage.DataBlock ().singleCount(); - for (i = n; i > nRemain; i--) - { - // Obtain single indirect page location. -@@ -1594,7 +1642,7 @@ storeError OStoreDirectoryPageObject::tr - // Check single indirect page buffer. - if (rpSingle == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpSingle = new(nPageSize) indirect(nPageSize); - } - -@@ -1628,7 +1676,7 @@ storeError OStoreDirectoryPageObject::tr - if (eScope == page::SCOPE_DOUBLE) - { - // Truncate double indirect pages. -- sal_uInt16 i, n = m_rPage.m_aDataBlock.doubleCount(); -+ sal_uInt16 i, n = m_rPage.DataBlock ().doubleCount(); - for (i = n; i > nRemain; i--) - { - // Obtain double indirect page location. -@@ -1638,7 +1686,7 @@ storeError OStoreDirectoryPageObject::tr - // Check double indirect page buffer. - if (rpDouble == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpDouble = new(nPageSize) indirect(nPageSize); - } - -@@ -1672,7 +1720,7 @@ storeError OStoreDirectoryPageObject::tr - if (eScope == page::SCOPE_TRIPLE) - { - // Truncate triple indirect pages. -- sal_uInt16 i, n = m_rPage.m_aDataBlock.tripleCount(); -+ sal_uInt16 i, n = m_rPage.DataBlock ().tripleCount(); - for (i = n; i > nRemain; i--) - { - // Obtain triple indirect page location. -@@ -1682,7 +1730,7 @@ storeError OStoreDirectoryPageObject::tr - // Check triple indirect page buffer. - if (rpTriple == NULL) - { -- sal_uInt16 nPageSize = m_rPage.m_aDescr.m_nSize; -+ sal_uInt16 nPageSize = m_rPage.PageHeader ().m_aDescr.m_nSize; - rpTriple = new(nPageSize) indirect(nPageSize); - } - ---- ./store/source/stordata.hxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/stordata.hxx 2009-04-06 16:42:11.000000000 +0000 -@@ -55,10 +55,6 @@ struct OStoreDataPageData : public store - - typedef OStorePageDescriptor D; - -- /** Representation. -- */ -- sal_uInt8 m_pData[1]; -- - /** size. - */ - static sal_uInt16 size (void) -@@ -66,6 +62,11 @@ struct OStoreDataPageData : public store - return sal_uInt16(0); - } - -+ sal_uInt8* RepresentationData () -+ { -+ return base::Data () + base::size (); -+ } -+ - /** capacity. - */ - static sal_uInt16 capacity (const D& rDescr) -@@ -75,7 +76,7 @@ struct OStoreDataPageData : public store - - sal_uInt16 capacity (void) const - { -- return self::capacity (base::m_aDescr); -+ return self::capacity (base::PageHeader ().m_aDescr); - } - - /** usage. -@@ -87,23 +88,23 @@ struct OStoreDataPageData : public store - - sal_uInt16 usage (void) const - { -- return self::usage (base::m_aDescr); -+ return self::usage (base::PageHeader ().m_aDescr); - } - - /** initialize. - */ - void initialize (void) - { -- base::m_aGuard.m_nMagic = STORE_MAGIC_DATAPAGE; -- base::m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >( -- base::m_aDescr.m_nUsed + self::size()); -- rtl_zeroMemory (m_pData, capacity()); -+ base::PageHeader ().m_aGuard.m_nMagic = STORE_MAGIC_DATAPAGE; -+ base::PageHeader ().m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >( -+ base::PageHeader ().m_aDescr.m_nUsed + self::size()); -+ rtl_zeroMemory (RepresentationData (), capacity()); - } - - /** Construction. - */ - OStoreDataPageData (sal_uInt16 nPageSize) -- : base (nPageSize) -+ : base (nPageSize, sizeof (self)) - { - initialize(); - } -@@ -152,8 +153,15 @@ struct OStoreIndirectionPageData : publi - - /** Representation. - */ -- G m_aGuard; -- sal_uInt32 m_pData[1]; -+ struct Representation { -+ G m_aGuard; -+ sal_uInt32 m_pData[1]; -+ }; -+ -+ inline Representation& DataRepresentation () const -+ { -+ return *(Representation *) (Data () + base::size ()); -+ } - - /** size. - */ -@@ -170,7 +178,7 @@ struct OStoreIndirectionPageData : publi - } - sal_uInt16 capacity (void) const - { -- return self::capacity (base::m_aDescr); -+ return self::capacity (base::PageHeader ().m_aDescr); - } - - /** capacityCount. -@@ -193,7 +201,7 @@ struct OStoreIndirectionPageData : publi - */ - sal_Bool operator== (const OStoreIndirectionPageData& rOther) const - { -- return (base::operator==(rOther) && (m_aGuard == rOther.m_aGuard)); -+ return (base::operator==(rOther) && (DataRepresentation ().m_aGuard == rOther.DataRepresentation ().m_aGuard)); - } - - /** swap (internal and external representation). -@@ -205,12 +213,12 @@ struct OStoreIndirectionPageData : publi - void guard (const D& rDescr) - { - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, m_pData, capacity(rDescr)); -+ nCRC32 = G::crc32 (nCRC32, &DataRepresentation ().m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, DataRepresentation ().m_pData, capacity(rDescr)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- m_aGuard.m_nCRC32 = nCRC32; -+ DataRepresentation ().m_aGuard.m_nCRC32 = nCRC32; - } - - /** verify (external representation). -@@ -218,12 +226,12 @@ struct OStoreIndirectionPageData : publi - storeError verify (const D& rDescr) - { - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, m_pData, capacity(rDescr)); -+ nCRC32 = G::crc32 (nCRC32, &DataRepresentation ().m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, DataRepresentation ().m_pData, capacity(rDescr)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- if (m_aGuard.m_nCRC32 != nCRC32) -+ if (DataRepresentation ().m_aGuard.m_nCRC32 != nCRC32) - return store_E_InvalidChecksum; - else - return store_E_None; -@@ -347,12 +355,17 @@ inline OStoreIndirectionPageObject::OSto - * OStoreDirectoryDataBlock. - * - *======================================================================*/ --#define STORE_LIMIT_DATAPAGE_DIRECT 16 --#define STORE_LIMIT_DATAPAGE_SINGLE 8 --#define STORE_LIMIT_DATAPAGE_DOUBLE 1 --#define STORE_LIMIT_DATAPAGE_TRIPLE 1 -+#define STORE_LIMIT_DATAPAGE_DIRECT_V1 16 -+#define STORE_LIMIT_DATAPAGE_SINGLE_V1 8 -+#define STORE_LIMIT_DATAPAGE_DOUBLE_V1 1 -+#define STORE_LIMIT_DATAPAGE_TRIPLE_V1 1 -+ -+#define STORE_LIMIT_DATAPAGE_DIRECT_V2 4 -+#define STORE_LIMIT_DATAPAGE_SINGLE_V2 2 -+#define STORE_LIMIT_DATAPAGE_DOUBLE_V2 1 -+#define STORE_LIMIT_DATAPAGE_TRIPLE_V2 1 - --struct OStoreDirectoryDataBlock -+struct OStoreDirectoryDataBlockA - { - typedef OStorePageGuard G; - -@@ -377,16 +390,83 @@ struct OStoreDirectoryDataBlock - {} - }; - -+ /** initialize. -+ */ -+ virtual void initialize (void) = 0; -+ -+ /** Comparison. -+ */ -+ sal_Bool operator== (const OStoreDirectoryDataBlockA& rOther) const -+ { -+ return (Guard () == rOther.Guard ()); -+ } -+ -+ /** size. -+ */ -+ virtual sal_uInt16 size (void) = 0; -+ -+ /** Properties. -+ */ -+ virtual G Guard () const = 0; -+ -+ virtual sal_uInt32 DataLen () = 0; -+ virtual void SetDataLen (sal_uInt32 len) = 0; -+ -+// /** Comparison. -+// */ -+// virtual sal_Bool operator== (const OStoreDirectoryDataBlockV2& rOther) const = 0; -+ -+ /** swap (internal and external representation). -+ */ -+ virtual void swap (void) = 0; -+ -+ /** guard (external representation). -+ */ -+ virtual void guard (void) = 0; -+ -+ /** verify (external representation). -+ */ -+ virtual storeError verify (void) = 0; -+ -+ /** direct. -+ */ -+ virtual sal_uInt16 directCount (void) const = 0; -+ virtual sal_uInt32 directLink (sal_uInt16 nIndex) const = 0; -+ virtual void directLink (sal_uInt16 nIndex, sal_uInt32 nAddr) = 0; -+ -+ /** single. -+ */ -+ virtual sal_uInt16 singleCount (void) const = 0; -+ virtual sal_uInt32 singleLink (sal_uInt16 nIndex) const = 0; -+ virtual void singleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) = 0; -+ -+ /** double. -+ */ -+ virtual sal_uInt16 doubleCount (void) const = 0; -+ virtual sal_uInt32 doubleLink (sal_uInt16 nIndex) const = 0; -+ virtual void doubleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) = 0; -+ -+ /** triple. -+ */ -+ virtual sal_uInt16 tripleCount (void) const = 0; -+ virtual sal_uInt32 tripleLink (sal_uInt16 nIndex) const = 0; -+ virtual void tripleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) = 0; -+}; -+ -+struct OStoreDirectoryDataBlockV1 : OStoreDirectoryDataBlockA -+{ -+ typedef OStorePageGuard G; -+ - /** LinkTable. - */ - struct LinkTable - { - /** Representation. - */ -- sal_uInt32 m_pDirect[STORE_LIMIT_DATAPAGE_DIRECT]; -- sal_uInt32 m_pSingle[STORE_LIMIT_DATAPAGE_SINGLE]; -- sal_uInt32 m_pDouble[STORE_LIMIT_DATAPAGE_DOUBLE]; -- sal_uInt32 m_pTriple[STORE_LIMIT_DATAPAGE_TRIPLE]; -+ sal_uInt32 m_pDirect[STORE_LIMIT_DATAPAGE_DIRECT_V1]; -+ sal_uInt32 m_pSingle[STORE_LIMIT_DATAPAGE_SINGLE_V1]; -+ sal_uInt32 m_pDouble[STORE_LIMIT_DATAPAGE_DOUBLE_V1]; -+ sal_uInt32 m_pTriple[STORE_LIMIT_DATAPAGE_TRIPLE_V1]; - - /** Construction. - */ -@@ -398,15 +478,235 @@ struct OStoreDirectoryDataBlock - void swap (void); - }; - -- /** Representation. -+ struct Representation { -+ G m_aGuard; -+ LinkTable m_aTable; -+ sal_uInt32 m_nDataLen; -+ }; -+ -+ Representation* m_pRepresentation; -+ -+ /** size. - */ -- G m_aGuard; -- LinkTable m_aTable; -- sal_uInt32 m_nDataLen; -+ sal_uInt16 size (void) -+ { -+ return sal_uInt16(sizeof(G) + sizeof(LinkTable) + sizeof(sal_uInt32)); -+ } -+ -+ /** initialize. -+ */ -+ void initialize (void) -+ { -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard = G(); -+ m_pRepresentation->m_aTable.initialize(); -+ m_pRepresentation->m_nDataLen = 0; -+ } -+ } -+ -+ /** Construction. -+ */ -+ OStoreDirectoryDataBlockV1 (sal_uInt8 *data) -+ : m_pRepresentation ((Representation *) data) -+ { -+ initialize (); -+ } -+ -+ /** Properties. -+ */ -+ G Guard () const -+ { -+ return m_pRepresentation->m_aGuard; -+ } -+ -+ sal_uInt32 DataLen () -+ { -+ if (m_pRepresentation) -+ return m_pRepresentation->m_nDataLen; -+ else -+ return 0; -+ } -+ -+ void SetDataLen (sal_uInt32 len) -+ { -+ if (m_pRepresentation) -+ m_pRepresentation->m_nDataLen = len; -+ } -+ -+ /** Comparison. -+ */ -+ sal_Bool operator== (const OStoreDirectoryDataBlockV1& rOther) const -+ { -+ if (m_pRepresentation == NULL && rOther.m_pRepresentation == NULL) -+ return sal_True; -+ -+ if (m_pRepresentation == NULL || rOther.m_pRepresentation == NULL) -+ return sal_False; -+ -+ return (m_pRepresentation->m_aGuard == rOther.m_pRepresentation->m_aGuard); -+ } -+ -+ /** swap (internal and external representation). -+ */ -+ void swap (void) -+ { -+#ifdef OSL_BIGENDIAN -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard.swap(); -+ m_pRepresentation->m_aTable.swap(); -+ m_pRepresentation->m_nDataLen = OSL_SWAPDWORD(m_pRepresentation->m_nDataLen); -+ } -+#endif /* OSL_BIGENDIAN */ -+ } -+ -+ /** guard (external representation). -+ */ -+ void guard (void) -+ { -+ if (!m_pRepresentation) -+ return; -+ -+ sal_uInt32 nCRC32 = 0; -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aTable, size() - sizeof(G)); -+#ifdef OSL_BIGENDIAN -+ nCRC32 = OSL_SWAPDWORD(nCRC32); -+#endif /* OSL_BIGENDIAN */ -+ m_pRepresentation->m_aGuard.m_nCRC32 = nCRC32; -+ } -+ -+ /** verify (external representation). -+ */ -+ storeError verify (void) -+ { -+ if (!m_pRepresentation) -+ return store_E_NotExists; -+ -+ sal_uInt32 nCRC32 = 0; -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aTable, size() - sizeof(G)); -+#ifdef OSL_BIGENDIAN -+ nCRC32 = OSL_SWAPDWORD(nCRC32); -+#endif /* OSL_BIGENDIAN */ -+ if (m_pRepresentation->m_aGuard.m_nCRC32 != nCRC32) -+ return store_E_InvalidChecksum; -+ else -+ return store_E_None; -+ } -+ -+ /** direct. -+ */ -+ virtual sal_uInt16 directCount (void) const -+ { -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_DIRECT_V1)); -+ } -+ virtual sal_uInt32 directLink (sal_uInt16 nIndex) const -+ { -+ if (m_pRepresentation && nIndex < directCount()) -+ return m_pRepresentation->m_aTable.m_pDirect[nIndex]; -+ else -+ return STORE_PAGE_NULL; -+ } -+ virtual void directLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ { -+ if (m_pRepresentation && nIndex < directCount()) -+ m_pRepresentation->m_aTable.m_pDirect[nIndex] = nAddr; -+ } -+ -+ /** single. -+ */ -+ virtual sal_uInt16 singleCount (void) const -+ { -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_SINGLE_V1)); -+ } -+ virtual sal_uInt32 singleLink (sal_uInt16 nIndex) const -+ { -+ if (m_pRepresentation && nIndex < singleCount()) -+ return m_pRepresentation->m_aTable.m_pSingle[nIndex]; -+ else -+ return STORE_PAGE_NULL; -+ } -+ virtual void singleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ { -+ if (m_pRepresentation && nIndex < singleCount()) -+ m_pRepresentation->m_aTable.m_pSingle[nIndex] = nAddr; -+ } -+ -+ /** double. -+ */ -+ virtual sal_uInt16 doubleCount (void) const -+ { -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_DOUBLE_V1)); -+ } -+ virtual sal_uInt32 doubleLink (sal_uInt16 nIndex) const -+ { -+ if (m_pRepresentation && nIndex < doubleCount()) -+ return m_pRepresentation->m_aTable.m_pDouble[nIndex]; -+ else -+ return STORE_PAGE_NULL; -+ } -+ virtual void doubleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ { -+ if (m_pRepresentation && nIndex < doubleCount()) -+ m_pRepresentation->m_aTable.m_pDouble[nIndex] = nAddr; -+ } -+ -+ /** triple. -+ */ -+ virtual sal_uInt16 tripleCount (void) const -+ { -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_TRIPLE_V1)); -+ } -+ virtual sal_uInt32 tripleLink (sal_uInt16 nIndex) const -+ { -+ if (m_pRepresentation && nIndex < tripleCount()) -+ return m_pRepresentation->m_aTable.m_pTriple[nIndex]; -+ else -+ return STORE_PAGE_NULL; -+ } -+ virtual void tripleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ { -+ if (m_pRepresentation && nIndex < tripleCount()) -+ m_pRepresentation->m_aTable.m_pTriple[nIndex] = nAddr; -+ } -+}; -+ -+struct OStoreDirectoryDataBlockV2 : OStoreDirectoryDataBlockA -+{ -+ typedef OStorePageGuard G; -+ -+ /** LinkTable. -+ */ -+ struct LinkTable -+ { -+ /** Representation. -+ */ -+ sal_uInt32 m_pDirect[STORE_LIMIT_DATAPAGE_DIRECT_V2]; -+ sal_uInt32 m_pSingle[STORE_LIMIT_DATAPAGE_SINGLE_V2]; -+ sal_uInt32 m_pDouble[STORE_LIMIT_DATAPAGE_DOUBLE_V2]; -+ sal_uInt32 m_pTriple[STORE_LIMIT_DATAPAGE_TRIPLE_V2]; -+ -+ /** Construction. -+ */ -+ LinkTable (void); -+ void initialize (void); -+ -+ /** swap (internal and external representation). -+ */ -+ void swap (void); -+ }; -+ -+ struct Representation { -+ G m_aGuard; -+ LinkTable m_aTable; -+ sal_uInt32 m_nDataLen; -+ }; -+ -+ Representation* m_pRepresentation; - - /** size. - */ -- static sal_uInt16 size (void) -+ sal_uInt16 size (void) - { - return sal_uInt16(sizeof(G) + sizeof(LinkTable) + sizeof(sal_uInt32)); - } -@@ -415,22 +715,53 @@ struct OStoreDirectoryDataBlock - */ - void initialize (void) - { -- m_aGuard = G(); -- m_aTable.initialize(); -- m_nDataLen = 0; -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard = G(); -+ m_pRepresentation->m_aTable.initialize(); -+ m_pRepresentation->m_nDataLen = 0; -+ } - } - - /** Construction. - */ -- OStoreDirectoryDataBlock (void) -- : m_nDataLen (0) -- {} -+ OStoreDirectoryDataBlockV2 (sal_uInt8 *data) -+ : m_pRepresentation ((Representation *) data) -+ { -+ initialize (); -+ } -+ -+ /** Properties. -+ */ -+ G Guard () const -+ { -+ return m_pRepresentation->m_aGuard; -+ } -+ -+ sal_uInt32 DataLen () -+ { -+ if (m_pRepresentation) -+ return m_pRepresentation->m_nDataLen; -+ else -+ return 0; -+ } -+ -+ void SetDataLen (sal_uInt32 len) -+ { -+ if (m_pRepresentation) -+ m_pRepresentation->m_nDataLen = len; -+ } - - /** Comparison. - */ -- sal_Bool operator== (const OStoreDirectoryDataBlock& rOther) const -+ sal_Bool operator== (const OStoreDirectoryDataBlockV2& rOther) const - { -- return (m_aGuard == rOther.m_aGuard); -+ if (m_pRepresentation == NULL && rOther.m_pRepresentation == NULL) -+ return sal_True; -+ -+ if (m_pRepresentation == NULL || rOther.m_pRepresentation == NULL) -+ return sal_False; -+ -+ return (m_pRepresentation->m_aGuard == rOther.m_pRepresentation->m_aGuard); - } - - /** swap (internal and external representation). -@@ -438,9 +769,11 @@ struct OStoreDirectoryDataBlock - void swap (void) - { - #ifdef OSL_BIGENDIAN -- m_aGuard.swap(); -- m_aTable.swap(); -- m_nDataLen = OSL_SWAPDWORD(m_nDataLen); -+ if (m_pRepresentation) { -+ m_pRepresentation->m_aGuard.swap(); -+ m_pRepresentation->m_aTable.swap(); -+ m_pRepresentation->m_nDataLen = OSL_SWAPDWORD(m_pRepresentation->m_nDataLen); -+ } - #endif /* OSL_BIGENDIAN */ - } - -@@ -448,26 +781,32 @@ struct OStoreDirectoryDataBlock - */ - void guard (void) - { -+ if (!m_pRepresentation) -+ return; -+ - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, &m_aTable, size() - sizeof(G)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aTable, size() - sizeof(G)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- m_aGuard.m_nCRC32 = nCRC32; -+ m_pRepresentation->m_aGuard.m_nCRC32 = nCRC32; - } - - /** verify (external representation). - */ - storeError verify (void) - { -+ if (!m_pRepresentation) -+ return store_E_NotExists; -+ - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, &m_aTable, size() - sizeof(G)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, &m_pRepresentation->m_aTable, size() - sizeof(G)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- if (m_aGuard.m_nCRC32 != nCRC32) -+ if (m_pRepresentation->m_aGuard.m_nCRC32 != nCRC32) - return store_E_InvalidChecksum; - else - return store_E_None; -@@ -475,78 +814,78 @@ struct OStoreDirectoryDataBlock - - /** direct. - */ -- static sal_uInt16 directCount (void) -+ virtual sal_uInt16 directCount (void) const - { -- return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_DIRECT)); -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_DIRECT_V2)); - } -- sal_uInt32 directLink (sal_uInt16 nIndex) const -+ virtual sal_uInt32 directLink (sal_uInt16 nIndex) const - { -- if (nIndex < directCount()) -- return m_aTable.m_pDirect[nIndex]; -+ if (m_pRepresentation && nIndex < directCount()) -+ return m_pRepresentation->m_aTable.m_pDirect[nIndex]; - else - return STORE_PAGE_NULL; - } -- void directLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ virtual void directLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- if (nIndex < directCount()) -- m_aTable.m_pDirect[nIndex] = nAddr; -+ if (m_pRepresentation && nIndex < directCount()) -+ m_pRepresentation->m_aTable.m_pDirect[nIndex] = nAddr; - } - - /** single. - */ -- static sal_uInt16 singleCount (void) -+ virtual sal_uInt16 singleCount (void) const - { -- return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_SINGLE)); -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_SINGLE_V2)); - } -- sal_uInt32 singleLink (sal_uInt16 nIndex) const -+ virtual sal_uInt32 singleLink (sal_uInt16 nIndex) const - { -- if (nIndex < singleCount()) -- return m_aTable.m_pSingle[nIndex]; -+ if (m_pRepresentation && nIndex < singleCount()) -+ return m_pRepresentation->m_aTable.m_pSingle[nIndex]; - else - return STORE_PAGE_NULL; - } -- void singleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ virtual void singleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- if (nIndex < singleCount()) -- m_aTable.m_pSingle[nIndex] = nAddr; -+ if (m_pRepresentation && nIndex < singleCount()) -+ m_pRepresentation->m_aTable.m_pSingle[nIndex] = nAddr; - } - - /** double. - */ -- static sal_uInt16 doubleCount (void) -+ virtual sal_uInt16 doubleCount (void) const - { -- return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_DOUBLE)); -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_DOUBLE_V2)); - } -- sal_uInt32 doubleLink (sal_uInt16 nIndex) const -+ virtual sal_uInt32 doubleLink (sal_uInt16 nIndex) const - { -- if (nIndex < doubleCount()) -- return m_aTable.m_pDouble[nIndex]; -+ if (m_pRepresentation && nIndex < doubleCount()) -+ return m_pRepresentation->m_aTable.m_pDouble[nIndex]; - else - return STORE_PAGE_NULL; - } -- void doubleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ virtual void doubleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- if (nIndex < doubleCount()) -- m_aTable.m_pDouble[nIndex] = nAddr; -+ if (m_pRepresentation && nIndex < doubleCount()) -+ m_pRepresentation->m_aTable.m_pDouble[nIndex] = nAddr; - } - - /** triple. - */ -- static sal_uInt16 tripleCount (void) -+ virtual sal_uInt16 tripleCount (void) const - { -- return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_TRIPLE)); -+ return ((sal_uInt16)(STORE_LIMIT_DATAPAGE_TRIPLE_V2)); - } -- sal_uInt32 tripleLink (sal_uInt16 nIndex) const -+ virtual sal_uInt32 tripleLink (sal_uInt16 nIndex) const - { -- if (nIndex < tripleCount()) -- return m_aTable.m_pTriple[nIndex]; -+ if (m_pRepresentation && nIndex < tripleCount()) -+ return m_pRepresentation->m_aTable.m_pTriple[nIndex]; - else - return STORE_PAGE_NULL; - } -- void tripleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) -+ virtual void tripleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- if (nIndex < tripleCount()) -- m_aTable.m_pTriple[nIndex] = nAddr; -+ if (m_pRepresentation && nIndex < tripleCount()) -+ m_pRepresentation->m_aTable.m_pTriple[nIndex] = nAddr; - } - }; - -@@ -562,76 +901,124 @@ struct OStoreDirectoryPageData : public - typedef OStorePageData base; - typedef OStoreDirectoryPageData self; - -- typedef OStorePageDescriptor D; -- typedef OStorePageNameBlock NameBlock; -- typedef OStoreDirectoryDataBlock DataBlock; -+ typedef OStorePageDescriptor D; -+ typedef OStorePageNameBlockA NameBlockT; -+ typedef OStoreDirectoryDataBlockA DataBlockT; - - /** Representation. - */ -- NameBlock m_aNameBlock; -- DataBlock m_aDataBlock; -- sal_uInt8 m_pData[1]; -+ OStorePageNameBlockA* m_pNameBlock; -+ OStoreDirectoryDataBlockA* m_pDataBlock; -+ sal_uInt8* m_pData; - - /** size. - */ -- static sal_uInt16 size (void) -+ sal_uInt16 size () const - { -- return (NameBlock::size() + DataBlock::size()); -+ return m_pNameBlock->size () + m_pDataBlock->size (); - } - - /** capacity. - */ -- static sal_uInt16 capacity (const D& rDescr) -+ sal_uInt16 capacity (const D& rDescr) const - { -- return (rDescr.m_nSize - (base::size() + self::size())); -+ return (rDescr.m_nSize - (base::size() + size())); - } - sal_uInt16 capacity (void) const - { -- return self::capacity (base::m_aDescr); -+ return capacity (base::PageHeader ().m_aDescr); - } - - /** usage. - */ -- static sal_uInt16 usage (const D& rDescr) -+ sal_uInt16 usage (const D& rDescr) const - { -- return (rDescr.m_nUsed - (base::size() + self::size())); -+ return (rDescr.m_nUsed - (base::size() + size())); - } - sal_uInt16 usage (void) const - { -- return self::usage (base::m_aDescr); -+ return usage (base::PageHeader ().m_aDescr); - } - - /** initialize. - */ - void initialize (void) - { -- base::m_aGuard.m_nMagic = STORE_MAGIC_DIRECTORYPAGE; -- base::m_aDescr.m_nUsed = base::size() + self::size(); -+ base::PageHeader ().m_aGuard.m_nMagic = STORE_MAGIC_DIRECTORYPAGE; -+ base::PageHeader ().m_aDescr.m_nUsed = base::size() + self::size(); - -- m_aNameBlock.initialize(); -- m_aDataBlock.initialize(); -+ m_pNameBlock->initialize(); -+ m_pDataBlock->initialize(); - -- rtl_zeroMemory (m_pData, capacity()); -+ rtl_zeroMemory (m_pData, capacity()); - } - - /** Construction. - */ -- OStoreDirectoryPageData (sal_uInt16 nPageSize) -- : base (nPageSize) -+ OStoreDirectoryPageData (sal_uInt16 nPageSize, OStorePageBIOS* pBIOS) -+ : base (nPageSize, sizeof (self)) - { -- base::m_aGuard.m_nMagic = STORE_MAGIC_DIRECTORYPAGE; -- base::m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >( -- base::m_aDescr.m_nUsed + self::size()); -+ base::PageHeader ().m_aGuard.m_nMagic = STORE_MAGIC_DIRECTORYPAGE; -+ -+ sal_uInt8* pMem = ((sal_uInt8*) this) + sizeof (self) + base::size (); -+ -+ switch (pBIOS->version ()) { -+ case 1: -+ m_pNameBlock = new OStorePageNameBlockV1 (pMem); -+ m_pDataBlock = new OStoreDirectoryDataBlockV1 (pMem + m_pNameBlock->size ()); -+ m_pData = pMem + m_pNameBlock->size () + m_pDataBlock->size (); -+ break; -+ case 2: -+ m_pNameBlock = new OStorePageNameBlockV2 (pMem); -+ m_pDataBlock = new OStoreDirectoryDataBlockV2 (pMem + m_pNameBlock->size ()); -+ m_pData = pMem + m_pNameBlock->size () + m_pDataBlock->size (); -+ break; -+ default: -+ OSL_TRACE("wrong store BIOS/SuperPage version"); -+ *((int *)NULL) = 0; -+ m_pNameBlock = NULL; -+ m_pDataBlock = NULL; -+ m_pData = NULL; -+ } -+ - rtl_zeroMemory (m_pData, capacity()); - } - -+ ~OStoreDirectoryPageData () -+ { -+ if (m_pNameBlock) { -+ delete m_pNameBlock; -+ m_pNameBlock = NULL; -+ } -+ -+ if (m_pDataBlock) { -+ delete m_pDataBlock; -+ m_pDataBlock = NULL; -+ } -+ } -+ -+ inline OStoreDirectoryDataBlockA& DataBlock () const -+ { -+ return *m_pDataBlock; -+ } -+ -+ inline OStorePageNameBlockA& NameBlock () const -+ { -+ return *m_pNameBlock; -+ } -+ -+ inline sal_uInt8* Data () const -+ { -+ return m_pData; -+ } -+ - /** Comparsion. - */ - sal_Bool operator== (const OStoreDirectoryPageData& rOther) const - { - return ((base::operator==(rOther) ) && -- (m_aNameBlock == rOther.m_aNameBlock) && -- (m_aDataBlock == rOther.m_aDataBlock) ); -+ (NameBlock () == rOther.NameBlock ()) && -+ (DataBlock () == rOther.DataBlock ())); - } - - /** swap (internal and external representation). -@@ -639,8 +1026,8 @@ struct OStoreDirectoryPageData : public - void swap () - { - #ifdef OSL_BIGENDIAN -- m_aNameBlock.swap(); -- m_aDataBlock.swap(); -+ NameBlock ().swap(); -+ DataBlock ().swap(); - #endif /* OSL_BIGENDIAN */ - } - -@@ -648,17 +1035,17 @@ struct OStoreDirectoryPageData : public - */ - void guard () - { -- m_aNameBlock.guard(); -- m_aDataBlock.guard(); -+ m_pNameBlock->guard(); -+ m_pDataBlock->guard(); - } - - /** verify (external representation). - */ - storeError verify () - { -- storeError eErrCode = m_aNameBlock.verify(); -+ storeError eErrCode = m_pNameBlock->verify(); - if (eErrCode == store_E_None) -- eErrCode = m_aDataBlock.verify(); -+ eErrCode = m_pDataBlock->verify(); - return eErrCode; - } - -@@ -736,11 +1123,11 @@ public: - */ - sal_uInt32 attrib (void) const - { -- return m_rPage.m_aNameBlock.m_nAttrib; -+ return m_rPage.NameBlock ().Attrib (); - } - void attrib (sal_uInt32 nAttrib) - { -- m_rPage.m_aNameBlock.m_nAttrib = nAttrib; -+ m_rPage.NameBlock ().SetAttrib (nAttrib); - touch(); - } - -@@ -748,11 +1135,11 @@ public: - */ - sal_uInt32 dataLength (void) const - { -- return m_rPage.m_aDataBlock.m_nDataLen; -+ return m_rPage.DataBlock ().DataLen (); - } - void dataLength (sal_uInt32 nLength) - { -- m_rPage.m_aDataBlock.m_nDataLen = nLength; -+ m_rPage.DataBlock ().SetDataLen (nLength); - touch(); - } - -@@ -760,11 +1147,11 @@ public: - */ - sal_uInt32 directLink (sal_uInt16 nIndex) const - { -- return m_rPage.m_aDataBlock.directLink (nIndex); -+ return m_rPage.DataBlock ().directLink (nIndex); - } - void directLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- m_rPage.m_aDataBlock.directLink (nIndex, nAddr); -+ m_rPage.DataBlock ().directLink (nIndex, nAddr); - touch(); - } - -@@ -772,11 +1159,11 @@ public: - */ - sal_uInt32 singleLink (sal_uInt16 nIndex) const - { -- return m_rPage.m_aDataBlock.singleLink (nIndex); -+ return m_rPage.DataBlock ().singleLink (nIndex); - } - void singleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- m_rPage.m_aDataBlock.singleLink (nIndex, nAddr); -+ m_rPage.DataBlock ().singleLink (nIndex, nAddr); - touch(); - } - -@@ -784,11 +1171,11 @@ public: - */ - sal_uInt32 doubleLink (sal_uInt16 nIndex) const - { -- return m_rPage.m_aDataBlock.doubleLink (nIndex); -+ return m_rPage.DataBlock ().doubleLink (nIndex); - } - void doubleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- m_rPage.m_aDataBlock.doubleLink (nIndex, nAddr); -+ m_rPage.DataBlock ().doubleLink (nIndex, nAddr); - touch(); - } - -@@ -796,11 +1183,11 @@ public: - */ - sal_uInt32 tripleLink (sal_uInt16 nIndex) const - { -- return m_rPage.m_aDataBlock.tripleLink (nIndex); -+ return m_rPage.DataBlock ().tripleLink (nIndex); - } - void tripleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) - { -- m_rPage.m_aDataBlock.tripleLink (nIndex, nAddr); -+ m_rPage.DataBlock ().tripleLink (nIndex, nAddr); - touch(); - } - -@@ -808,7 +1195,7 @@ public: - */ - page::ChunkScope scope ( - sal_uInt32 nPage, -- page::DataBlock::LinkDescriptor &rDescr) const; -+ page::DataBlockT::LinkDescriptor &rDescr) const; - - /** get (external data page). - */ ---- ./store/source/store.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/store.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -132,7 +132,7 @@ storeError SAL_CALL store_createMemoryFi - return store_E_OutOfMemory; - - storeError eErrCode = xManager->initializeManager ( -- &*xLockBytes, store_AccessCreate, nPageSize); -+ &*xLockBytes, store_AccessCreate, nPageSize, STORE_FORMAT_V2); - if (eErrCode != store_E_None) - return eErrCode; - -@@ -149,7 +149,8 @@ storeError SAL_CALL store_openFile ( - rtl_uString *pFilename, - storeAccessMode eAccessMode, - sal_uInt16 nPageSize, -- storeFileHandle *phFile -+ storeFileHandle *phFile, -+ sal_uInt16 nFormatVersion - ) SAL_THROW_EXTERN_C() - { - if (phFile) -@@ -171,7 +172,7 @@ storeError SAL_CALL store_openFile ( - return store_E_OutOfMemory; - - eErrCode = xManager->initializeManager ( -- &*xLockBytes, eAccessMode, nPageSize); -+ &*xLockBytes, eAccessMode, nPageSize, nFormatVersion); - if (eErrCode != store_E_None) - return eErrCode; - -@@ -581,7 +582,7 @@ storeError SAL_CALL store_attrib ( - OString aName (pName->buffer, pName->length, RTL_TEXTENCODING_UTF8); - OStorePageKey aKey; - -- eErrCode = OStorePageNameBlock::namei (aPath.pData, aName.pData, aKey); -+ eErrCode = OStorePageNameBlockA::namei (aPath.pData, aName.pData, aKey); - if (eErrCode != store_E_None) - return eErrCode; - -@@ -622,7 +623,7 @@ storeError SAL_CALL store_link ( - pSrcName->buffer, pSrcName->length, RTL_TEXTENCODING_UTF8); - OStorePageKey aSrcKey; - -- eErrCode = OStorePageNameBlock::namei ( -+ eErrCode = OStorePageNameBlockA::namei ( - aSrcPath.pData, aSrcName.pData, aSrcKey); - if (eErrCode != store_E_None) - return eErrCode; -@@ -634,7 +635,7 @@ storeError SAL_CALL store_link ( - pDstName->buffer, pDstName->length, RTL_TEXTENCODING_UTF8); - OStorePageKey aDstKey; - -- eErrCode = OStorePageNameBlock::namei ( -+ eErrCode = OStorePageNameBlockA::namei ( - aDstPath.pData, aDstName.pData, aDstKey); - if (eErrCode != store_E_None) - return eErrCode; -@@ -672,7 +673,7 @@ storeError SAL_CALL store_symlink ( - pDstName->buffer, pDstName->length, RTL_TEXTENCODING_UTF8); - OStorePageKey aDstKey; - -- eErrCode = OStorePageNameBlock::namei ( -+ eErrCode = OStorePageNameBlockA::namei ( - aDstPath.pData, aDstName.pData, aDstKey); - if (eErrCode != store_E_None) - return eErrCode; -@@ -715,7 +716,7 @@ storeError SAL_CALL store_rename ( - pSrcName->buffer, pSrcName->length, RTL_TEXTENCODING_UTF8); - OStorePageKey aSrcKey; - -- eErrCode = OStorePageNameBlock::namei ( -+ eErrCode = OStorePageNameBlockA::namei ( - aSrcPath.pData, aSrcName.pData, aSrcKey); - if (eErrCode != store_E_None) - return eErrCode; -@@ -753,7 +754,7 @@ storeError SAL_CALL store_remove ( - OString aName (pName->buffer, pName->length, RTL_TEXTENCODING_UTF8); - OStorePageKey aKey; - -- eErrCode = OStorePageNameBlock::namei (aPath.pData, aName.pData, aKey); -+ eErrCode = OStorePageNameBlockA::namei (aPath.pData, aName.pData, aKey); - if (eErrCode != store_E_None) - return eErrCode; - ---- ./store/source/storlckb.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/storlckb.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -88,7 +88,7 @@ static storeError __store_iget ( - { - // Setup inode page key. - OStorePageKey aKey; -- storeError eErrCode = OStorePageNameBlock::namei (pPath, pName, aKey); -+ storeError eErrCode = OStorePageNameBlockA::namei (pPath, pName, aKey); - if (eErrCode != store_E_None) - return eErrCode; - -@@ -117,12 +117,9 @@ static storeError __store_iget ( - return store_E_AccessViolation; - - // Setup inode nameblock. -- rNode.m_aNameBlock.m_aKey = aKey; -- rNode.m_aNameBlock.m_nAttrib = nAttrib; -- -- rtl_copyMemory ( -- &rNode.m_aNameBlock.m_pData[0], -- pName->buffer, pName->length); -+ rNode.NameBlock ().SetKey (aKey); -+ rNode.NameBlock ().SetAttrib (nAttrib); -+ rNode.NameBlock ().SetName (pName, rManager); - - // Save inode page. - eErrCode = rManager.save (aKey, aPage); -@@ -135,7 +132,7 @@ static storeError __store_iget ( - { - // Obtain 'Destination' page key. - OStorePageKey aDstKey; -- rtl_copyMemory (&aDstKey, &rNode.m_pData[0], sizeof(aDstKey)); -+ rtl_copyMemory (&aDstKey, rNode.Data (), sizeof(aDstKey)); - - #ifdef OSL_BIGENDIAN - // Swap to internal representation. -@@ -218,7 +215,7 @@ storeError OStoreDirectory::create ( - return eErrCode; - - delete m_pNode; -- m_pNode = new(m_aDescr.m_nSize) inode(m_aDescr.m_nSize); -+ m_pNode = new(m_aDescr.m_nSize) inode(m_aDescr.m_nSize, pManager); - if (!m_pNode) - return store_E_OutOfMemory; - -@@ -231,21 +228,24 @@ storeError OStoreDirectory::create ( - if (eErrCode != store_E_None) - return eErrCode; - -- sal_uInt32 nAttrib = m_pNode->m_aNameBlock.m_nAttrib; -+ sal_uInt32 nAttrib = m_pNode->NameBlock ().Attrib (); - if (!(nAttrib & STORE_ATTRIB_ISDIR)) - return store_E_NotDirectory; - -- m_aDescr = m_pNode->m_aDescr; -+ m_aDescr = m_pNode->PageHeader ().m_aDescr; - eErrCode = xManager->acquirePage (m_aDescr, store_AccessReadOnly); - if (eErrCode == store_E_None) - { - // Evaluate iteration path from NameBlock. - typedef OStorePageGuard G; -- sal_Char *pszName = m_pNode->m_aNameBlock.m_pData; -+ rtl_String *pItemName = NULL; -+ if ((eErrCode = m_pNode->NameBlock ().Name (&pItemName, *pManager)) != store_E_None) -+ return eErrCode; - -- m_nPath = m_pNode->m_aNameBlock.m_aKey.m_nHigh; -- m_nPath = G::crc32 (m_nPath, pszName, rtl_str_getLength(pszName)); -+ m_nPath = m_pNode->NameBlock ().Key ().m_nHigh; -+ m_nPath = G::crc32 (m_nPath, pItemName->buffer, pItemName->length); - m_nPath = G::crc32 (m_nPath, "/", 1); -+ rtl_string_release (pItemName); - - // Accept page manager. - m_xManager = xManager; -@@ -290,8 +290,13 @@ storeError OStoreDirectory::iterate (sto - if (eErrCode == store_E_None) - { - // Setup FindData. -- sal_Char *p = m_pNode->m_aNameBlock.m_pData; -- sal_Size n = rtl_str_getLength (p); -+ -+ rtl_String *pItemName = NULL; -+ if ((eErrCode = m_pNode->NameBlock ().Name (&pItemName, *m_xManager)) != store_E_None) -+ return eErrCode; -+ -+ sal_Char *p = pItemName->buffer; -+ sal_Size n = pItemName->length; - sal_Size k = rFindData.m_nLength; - - n = __store_convertTextToUnicode ( -@@ -302,6 +307,7 @@ storeError OStoreDirectory::iterate (sto - k = (k - n) * sizeof(sal_Unicode); - rtl_zeroMemory (&rFindData.m_pszName[n], k); - } -+ rtl_string_release (pItemName); - - rFindData.m_nLength = n; - rFindData.m_nAttrib |= aPage.attrib(); -@@ -356,7 +362,7 @@ OStoreLockBytes::~OStoreLockBytes (void) - osl::MutexGuard aGuard (*m_xManager); - if (m_pNode) - { -- OStorePageDescriptor aDescr (m_pNode->m_aDescr); -+ OStorePageDescriptor aDescr (m_pNode->PageHeader ().m_aDescr); - m_xManager->releasePage (aDescr); - } - } -@@ -415,7 +421,7 @@ storeError OStoreLockBytes::create ( - return eErrCode; - - delete m_pNode; -- m_pNode = new(m_nPageSize) inode(m_nPageSize); -+ m_pNode = new(m_nPageSize) inode(m_nPageSize, pManager); - if (!m_pNode) - return store_E_OutOfMemory; - -@@ -428,7 +434,7 @@ storeError OStoreLockBytes::create ( - if (eErrCode != store_E_None) - return eErrCode; - -- sal_uInt32 nAttrib = m_pNode->m_aNameBlock.m_nAttrib; -+ sal_uInt32 nAttrib = m_pNode->NameBlock ().Attrib (); - if (!(nAttrib & STORE_ATTRIB_ISFILE)) - { - // No ISFILE in older versions (backward compatibility). -@@ -437,7 +443,7 @@ storeError OStoreLockBytes::create ( - } - - // ... -- OStorePageDescriptor aDescr (m_pNode->m_aDescr); -+ OStorePageDescriptor aDescr (m_pNode->PageHeader ().m_aDescr); - if (eMode != store_AccessReadOnly) - eErrCode = xManager->acquirePage (aDescr, store_AccessReadWrite); - else -@@ -504,7 +510,7 @@ storeError OStoreLockBytes::readAt ( - - rtl_copyMemory ( - &pData[rnDone], -- &m_pNode->m_pData[aDescr.m_nOffset], -+ m_pNode->Data () + aDescr.m_nOffset, - nLength); - - // Adjust counters. -@@ -543,7 +549,7 @@ storeError OStoreLockBytes::readAt ( - { - rtl_copyMemory ( - &pData[rnDone], -- &m_pData->m_pData[aDescr.m_nOffset], -+ &m_pData->RepresentationData ()[aDescr.m_nOffset], - nLength); - } - -@@ -601,7 +607,7 @@ storeError OStoreLockBytes::writeAt ( - nLength = SAL_MIN(nLength, nBytes); - - rtl_copyMemory ( -- &m_pNode->m_pData[aDescr.m_nOffset], -+ m_pNode->Data () + aDescr.m_nOffset, - &pData[rnDone], nLength); - - // Mark inode dirty. -@@ -641,7 +647,7 @@ storeError OStoreLockBytes::writeAt ( - return eErrCode; - - rtl_zeroMemory ( -- &m_pData->m_pData[0], -+ m_pData->RepresentationData (), - m_pData->capacity()); - } - } -@@ -650,7 +656,7 @@ storeError OStoreLockBytes::writeAt ( - nLength = SAL_MIN(nLength, nBytes); - - rtl_copyMemory ( -- &m_pData->m_pData[aDescr.m_nOffset], -+ m_pData->RepresentationData () + aDescr.m_nOffset, - &pData[rnDone], nLength); - - // Save data page. -@@ -740,7 +746,7 @@ storeError OStoreLockBytes::setSize (sal - // Truncate internal data page. - inode::ChunkDescriptor aDescr (nSize, m_pNode->capacity()); - rtl_zeroMemory ( -- &m_pNode->m_pData[aDescr.m_nOffset], -+ m_pNode->Data () + aDescr.m_nOffset, - aDescr.m_nLength); - } - else -@@ -784,7 +790,7 @@ storeError OStoreLockBytes::stat (sal_uI - if (!m_xManager.is()) - return store_E_InvalidAccess; - -- rnSize = m_pNode->m_aDataBlock.m_nDataLen; -+ rnSize = m_pNode->DataBlock ().DataLen (); - return store_E_None; - } - ---- ./store/source/storpage.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/storpage.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -112,7 +112,8 @@ sal_Bool SAL_CALL OStorePageManager::isK - storeError OStorePageManager::initializeManager ( - ILockBytes *pLockBytes, - storeAccessMode eAccessMode, -- sal_uInt16 nPageSize) -+ sal_uInt16 nPageSize, -+ sal_uInt16 nFormatVersion) - { - // Acquire exclusive access. - osl::MutexGuard aGuard(*this); -@@ -135,7 +136,7 @@ storeError OStorePageManager::initialize - return store_E_NotExists; - - // Create. -- eErrCode = base::create (nPageSize); -+ eErrCode = base::create (nPageSize, nFormatVersion); - if (eErrCode != store_E_None) - return eErrCode; - } -@@ -194,10 +195,10 @@ storeError OStorePageManager::free (OSto - - // Check for cacheable page. - OStorePageData &rData = rPage.getData(); -- if (rData.m_aGuard.m_nMagic == STORE_MAGIC_BTREENODE) -+ if (rData.PageHeader ().m_aGuard.m_nMagic == STORE_MAGIC_BTREENODE) - { - // Invalidate cache entry. -- storeError eErrCode = m_pCache->invalidate (rData.m_aDescr); -+ storeError eErrCode = m_pCache->invalidate (rData.PageHeader ().m_aDescr); - if (eErrCode != store_E_None) - return eErrCode; - } -@@ -221,10 +222,10 @@ storeError OStorePageManager::load (OSto - - // Check for cacheable page. - OStorePageData &rData = rPage.getData(); -- if (rData.m_aGuard.m_nMagic == STORE_MAGIC_BTREENODE) -+ if (rData.PageHeader ().m_aGuard.m_nMagic == STORE_MAGIC_BTREENODE) - { - // Save PageDescriptor. -- OStorePageDescriptor aDescr (rData.m_aDescr); -+ OStorePageDescriptor aDescr (rData.PageHeader ().m_aDescr); - - // Load (cached) page. - storeError eErrCode = m_pCache->load (aDescr, rData, *this); -@@ -271,10 +272,10 @@ storeError OStorePageManager::save (OSto - - // Check for cacheable page. - OStorePageData &rData = rPage.getData(); -- if (rData.m_aGuard.m_nMagic == STORE_MAGIC_BTREENODE) -+ if (rData.PageHeader ().m_aGuard.m_nMagic == STORE_MAGIC_BTREENODE) - { - // Save PageDescriptor. -- OStorePageDescriptor aDescr (rData.m_aDescr); -+ OStorePageDescriptor aDescr (rData.PageHeader ().m_aDescr); - - #ifdef OSL_BIGENDIAN - // Swap to external representation. -@@ -365,7 +366,7 @@ storeError OStorePageManager::find (cons - } - - // Check address. -- sal_uInt32 nAddr = rPage.m_pData[i].m_aLink.m_nAddr; -+ sal_uInt32 nAddr = rPage.DataRepresentation ().m_pData[i].m_aLink.m_nAddr; - if (nAddr == STORE_PAGE_NULL) - { - // Path to entry not exists (Must not happen(?)). -@@ -405,7 +406,7 @@ storeError OStorePageManager::find ( - - // Pre-allocate left most entry (ugly, but we can't insert to left). - rPage.insert (0, entry()); -- rPage.m_pData[0].m_aKey.m_nLow = OStorePageGuard::crc32 (0, "/", 1); -+ rPage.DataRepresentation ().m_pData[0].m_aKey.m_nLow = OStorePageGuard::crc32 (0, "/", 1); - - // Allocate RootNode. - eErrCode = base::allocate (aRoot, ALLOCATE_EOF); -@@ -436,7 +437,7 @@ storeError OStorePageManager::find ( - } - - // Check address. -- sal_uInt32 nAddr = rPage.m_pData[i].m_aLink.m_nAddr; -+ sal_uInt32 nAddr = rPage.DataRepresentation ().m_pData[i].m_aLink.m_nAddr; - if (nAddr == STORE_PAGE_NULL) - { - // Path to entry not exists (Must not happen(?)). -@@ -499,13 +500,13 @@ storeError OStorePageManager::remove ( - } - - // Compare entry. -- entry::CompareResult result = rEntry.compare (rPage.m_pData[i]); -+ entry::CompareResult result = rEntry.compare (rPage.DataRepresentation ().m_pData[i]); - - // Iterate down until equal match. - while ((result == entry::COMPARE_GREATER) && (rPage.depth() > 0)) - { - // Check link address. -- sal_uInt32 nAddr = rPage.m_pData[i].m_aLink.m_nAddr; -+ sal_uInt32 nAddr = rPage.DataRepresentation ().m_pData[i].m_aLink.m_nAddr; - if (nAddr == STORE_PAGE_NULL) - { - // Path to entry not exists (Must not happen(?)). -@@ -529,7 +530,7 @@ storeError OStorePageManager::remove ( - } - - // Compare entry. -- result = rEntry.compare (rPage.m_pData[i]); -+ result = rEntry.compare (rPage.DataRepresentation ().m_pData[i]); - } - - OSL_POSTCOND( -@@ -581,14 +582,14 @@ storeError OStorePageManager::load ( - } - - // Check for exact match. -- if (!(e.compare (m_pNode[0]->m_pData[i]) == entry::COMPARE_EQUAL)) -+ if (!(e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]) == entry::COMPARE_EQUAL)) - { - // Page not present. - return store_E_NotExists; - } - - // Existing entry. Check address. -- sal_uInt32 nAddr = m_pNode[0]->m_pData[i].m_aLink.m_nAddr; -+ sal_uInt32 nAddr = m_pNode[0]->DataRepresentation ().m_pData[i].m_aLink.m_nAddr; - if (nAddr == STORE_PAGE_NULL) - { - // Page not present. -@@ -632,7 +633,7 @@ storeError OStorePageManager::save ( - if (i < n) - { - // Compare entry. -- entry::CompareResult result = e.compare (m_pNode[0]->m_pData[i]); -+ entry::CompareResult result = e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]); - OSL_POSTCOND( - result != entry::COMPARE_LESS, - "OStorePageManager::save(): find failed"); -@@ -647,7 +648,7 @@ storeError OStorePageManager::save ( - if (result == entry::COMPARE_EQUAL) - { - // Existing entry. Check address. -- sal_uInt32 nAddr = m_pNode[0]->m_pData[i].m_aLink.m_nAddr; -+ sal_uInt32 nAddr = m_pNode[0]->DataRepresentation ().m_pData[i].m_aLink.m_nAddr; - if (nAddr == STORE_PAGE_NULL) - { - // Allocate page. -@@ -656,7 +657,7 @@ storeError OStorePageManager::save ( - return eErrCode; - - // Modify page address. -- m_pNode[0]->m_pData[i].m_aLink.m_nAddr = rPage.location(); -+ m_pNode[0]->DataRepresentation ().m_pData[i].m_aLink.m_nAddr = rPage.location(); - - // Save modified NodePage. - node aNode (*m_pNode[0]); -@@ -720,14 +721,14 @@ storeError OStorePageManager::attrib ( - } - - // Check for exact match. -- if (!(e.compare (m_pNode[0]->m_pData[i]) == entry::COMPARE_EQUAL)) -+ if (!(e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]) == entry::COMPARE_EQUAL)) - { - // Page not present. - return store_E_NotExists; - } - - // Existing entry. -- e = m_pNode[0]->m_pData[i]; -+ e = m_pNode[0]->DataRepresentation ().m_pData[i]; - if (nMask1 != nMask2) - { - // Evaluate new attributes. -@@ -743,7 +744,7 @@ storeError OStorePageManager::attrib ( - { - // Set new attributes. - e.m_nAttrib = nAttrib; -- m_pNode[0]->m_pData[i] = e; -+ m_pNode[0]->DataRepresentation ().m_pData[i] = e; - - // Save modified NodePage. - node aNode (*m_pNode[0]); -@@ -798,14 +799,14 @@ storeError OStorePageManager::link ( - } - - // Check for exact match. -- if (!(e.compare (m_pNode[0]->m_pData[i]) == entry::COMPARE_EQUAL)) -+ if (!(e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]) == entry::COMPARE_EQUAL)) - { - // Page not present. - return store_E_NotExists; - } - - // Existing entry. Check address. -- e = m_pNode[0]->m_pData[i]; -+ e = m_pNode[0]->DataRepresentation ().m_pData[i]; - if (e.m_aLink.m_nAddr == STORE_PAGE_NULL) - { - // Page not present. -@@ -826,7 +827,7 @@ storeError OStorePageManager::link ( - if (i < n) - { - // Compare entry. -- entry::CompareResult result = e.compare (m_pNode[0]->m_pData[i]); -+ entry::CompareResult result = e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]); - OSL_POSTCOND( - result != entry::COMPARE_LESS, - "OStorePageManager::link(): find failed"); -@@ -878,7 +879,7 @@ storeError OStorePageManager::symlink ( - - // Setup 'Source' page key. - OStorePageKey aSrcKey; -- eErrCode = OStorePageNameBlock::namei (pSrcPath, pSrcName, aSrcKey); -+ eErrCode = OStorePageNameBlockA::namei (pSrcPath, pSrcName, aSrcKey); - if (eErrCode != store_E_None) - return eErrCode; - -@@ -896,7 +897,7 @@ storeError OStorePageManager::symlink ( - if (i < n) - { - // Compare entry. -- entry::CompareResult result = e.compare (m_pNode[0]->m_pData[i]); -+ entry::CompareResult result = e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]); - OSL_POSTCOND( - result != entry::COMPARE_LESS, - "OStorePageManager::symlink(): find failed"); -@@ -919,22 +920,20 @@ storeError OStorePageManager::symlink ( - if (m_pDirect) - m_pDirect->initialize(); - if (!m_pDirect) -- m_pDirect = new(m_nPageSize) inode(m_nPageSize); -+ m_pDirect = new(m_nPageSize) inode(m_nPageSize, this); - if (!m_pDirect) - return store_E_OutOfMemory; - - // Setup as 'Source' directory page. -- m_pDirect->m_aNameBlock.m_aKey = aSrcKey; -- rtl_copyMemory ( -- &m_pDirect->m_aNameBlock.m_pData[0], -- pSrcName->buffer, pSrcName->length); -+ m_pDirect->NameBlock ().SetKey (aSrcKey); -+ m_pDirect->NameBlock ().SetName (pSrcName, *this); - - // Store 'Destination' page key. - OStorePageKey aDstKey (rDstKey); - #ifdef OSL_BIGENDIAN - aDstKey.swap(); // Swap to external representation. - #endif /* OSL_BIGENDIAN */ -- rtl_copyMemory (&m_pDirect->m_pData[0], &aDstKey, sizeof(aDstKey)); -+ rtl_copyMemory (m_pDirect->Data (), &aDstKey, sizeof(aDstKey)); - - // Mark 'Source' as symbolic link to 'Destination'. - OStoreDirectoryPageObject aPage (*m_pDirect); -@@ -981,7 +980,7 @@ storeError OStorePageManager::rename ( - - // Setup 'Destination' page key. - OStorePageKey aDstKey; -- eErrCode = OStorePageNameBlock::namei (pDstPath, pDstName, aDstKey); -+ eErrCode = OStorePageNameBlockA::namei (pDstPath, pDstName, aDstKey); - if (eErrCode != store_E_None) - return eErrCode; - -@@ -1003,14 +1002,14 @@ storeError OStorePageManager::rename ( - } - - // Check for exact match. -- if (!(e.compare (m_pNode[0]->m_pData[i]) == entry::COMPARE_EQUAL)) -+ if (!(e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]) == entry::COMPARE_EQUAL)) - { - // Page not present. - return store_E_NotExists; - } - - // Existing 'Source' entry. Check address. -- e = m_pNode[0]->m_pData[i]; -+ e = m_pNode[0]->DataRepresentation ().m_pData[i]; - if (e.m_aLink.m_nAddr == STORE_PAGE_NULL) - { - // Page not present. -@@ -1022,7 +1021,7 @@ storeError OStorePageManager::rename ( - { - // Check directory page buffer. - if (!m_pDirect) -- m_pDirect = new(m_nPageSize) inode(m_nPageSize); -+ m_pDirect = new(m_nPageSize) inode(m_nPageSize, this); - if (!m_pDirect) - return store_E_OutOfMemory; - -@@ -1055,7 +1054,7 @@ storeError OStorePageManager::rename ( - if (i < n) - { - // Compare entry. -- entry::CompareResult result = e.compare (m_pNode[0]->m_pData[i]); -+ entry::CompareResult result = e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]); - OSL_POSTCOND( - result != entry::COMPARE_LESS, - "OStorePageManager::rename(): find failed"); -@@ -1086,14 +1085,8 @@ storeError OStorePageManager::rename ( - if (!(e.m_nAttrib & STORE_ATTRIB_ISLINK)) - { - // Setup 'Destination' NameBlock. -- sal_Int32 nDstLen = pDstName->length; -- rtl_copyMemory ( -- &m_pDirect->m_aNameBlock.m_pData[0], -- pDstName->buffer, nDstLen); -- rtl_zeroMemory ( -- &m_pDirect->m_aNameBlock.m_pData[nDstLen], -- STORE_MAXIMUM_NAMESIZE - nDstLen); -- m_pDirect->m_aNameBlock.m_aKey = e.m_aKey; -+ m_pDirect->NameBlock ().SetName (pDstName, *this); -+ m_pDirect->NameBlock ().SetKey (e.m_aKey); - - // Save directory page. - OStoreDirectoryPageObject aPage (*m_pDirect); -@@ -1143,14 +1136,14 @@ storeError OStorePageManager::remove (co - } - - // Check for exact match. -- if (!(e.compare (m_pNode[0]->m_pData[i]) == entry::COMPARE_EQUAL)) -+ if (!(e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]) == entry::COMPARE_EQUAL)) - { - // Page not present. - return store_E_NotExists; - } - - // Existing entry. Check address. -- e = m_pNode[0]->m_pData[i]; -+ e = m_pNode[0]->DataRepresentation ().m_pData[i]; - if (e.m_aLink.m_nAddr == STORE_PAGE_NULL) - { - // Page not present. -@@ -1162,7 +1155,7 @@ storeError OStorePageManager::remove (co - { - // Check directory page buffer. - if (!m_pDirect) -- m_pDirect = new(m_nPageSize) inode(m_nPageSize); -+ m_pDirect = new(m_nPageSize) inode(m_nPageSize, this); - if (!m_pDirect) - return store_E_OutOfMemory; - -@@ -1175,7 +1168,7 @@ storeError OStorePageManager::remove (co - return eErrCode; - - // Acquire page write access. -- OStorePageDescriptor aDescr (m_pDirect->m_aDescr); -+ OStorePageDescriptor aDescr (m_pDirect->PageHeader ().m_aDescr); - eErrCode = base::acquirePage (aDescr, store_AccessReadWrite); - if (eErrCode != store_E_None) - return eErrCode; -@@ -1202,7 +1195,7 @@ storeError OStorePageManager::remove (co - } - - // Truncate internal data page. -- rtl_zeroMemory (&m_pDirect->m_pData[0], m_pDirect->capacity()); -+ rtl_zeroMemory (m_pDirect->Data (), m_pDirect->capacity()); - aPage.dataLength (0); - } - -@@ -1252,7 +1245,7 @@ storeError OStorePageManager::iterate ( - } - - // Compare entry. -- entry::CompareResult result = e.compare (m_pNode[0]->m_pData[i]); -+ entry::CompareResult result = e.compare (m_pNode[0]->DataRepresentation ().m_pData[i]); - OSL_POSTCOND( - result != entry::COMPARE_LESS, - "OStorePageManager::iterate(): find failed"); -@@ -1265,7 +1258,7 @@ storeError OStorePageManager::iterate ( - } - - // GreaterEqual. Found next entry. -- e = m_pNode[0]->m_pData[i]; -+ e = m_pNode[0]->DataRepresentation ().m_pData[i]; - - // Setup result. - rKey = e.m_aKey; -@@ -1359,20 +1352,20 @@ storeError OStorePageManager::rebuild ( - return eErrCode; - - // Initialize as 'Destination' with 'Source' page size. -- eErrCode = self::initializeManager (pDstLB, store_AccessCreate, nPageSize); -+ eErrCode = self::initializeManager (pDstLB, store_AccessCreate, nPageSize, version ()); - if (eErrCode != store_E_None) - return eErrCode; - - // Initialize directory and data page buffers. - if (!m_pDirect) -- m_pDirect = new(m_nPageSize) inode(m_nPageSize); -+ m_pDirect = new(m_nPageSize) inode(m_nPageSize, this); - if (!m_pData) - m_pData = new(m_nPageSize) data(m_nPageSize); - if (!(m_pDirect && m_pData)) - return store_E_OutOfMemory; - - // Initialize 'Source' directory page. -- inode *pDirect = new(m_nPageSize) inode(m_nPageSize); -+ inode *pDirect = new(m_nPageSize) inode(m_nPageSize, this); - if (!pDirect) - return store_E_OutOfMemory; - -@@ -1381,8 +1374,8 @@ storeError OStorePageManager::rebuild ( - while ((eErrCode = aCtx.load(aSrcPage)) == store_E_None) - { - // Obtain page key and data length. -- OStorePageKey aKey (pDirect->m_aNameBlock.m_aKey); -- sal_uInt32 nDataLen = pDirect->m_aDataBlock.m_nDataLen; -+ OStorePageKey aKey (pDirect->NameBlock ().Key ()); -+ sal_uInt32 nDataLen = pDirect->DataBlock ().DataLen (); - - // Determine data page scope. - inode::ChunkScope eScope = pDirect->scope (nDataLen); -@@ -1399,8 +1392,8 @@ storeError OStorePageManager::rebuild ( - OStoreDirectoryPageObject aDstPage (*m_pDirect); - rtl_copyMemory (m_pDirect, pDirect, m_nPageSize); - -- m_pDirect->m_aDataBlock.initialize(); -- m_pDirect->m_aDataBlock.m_nDataLen = m_pDirect->capacity(); -+ m_pDirect->DataBlock ().initialize(); -+ m_pDirect->DataBlock ().SetDataLen (m_pDirect->capacity()); - - // Insert 'Destination' directory page. - eErrCode = save (aKey, aDstPage); -@@ -1419,7 +1412,7 @@ storeError OStorePageManager::rebuild ( - for (i = 0; i < n; i++) - { - // Re-initialize data page size. -- m_pData->m_aDescr.m_nSize = m_nPageSize; -+ m_pData->PageHeader ().m_aDescr.m_nSize = m_nPageSize; - - // Read 'Source' data page. - OStorePageBIOS &rBIOS = *(aCtx.m_xBIOS); -@@ -1438,7 +1431,7 @@ storeError OStorePageManager::rebuild ( - } - - // Update 'Destination' directory page. -- m_pDirect->m_aDataBlock.m_nDataLen = nDataLen; -+ m_pDirect->DataBlock ().SetDataLen (nDataLen); - eErrCode = base::save (aDstPage); - } - } -@@ -1460,17 +1453,17 @@ storeError OStorePageManager::rebuild ( - sal_uInt16 i, n = pNode->usageCount(); - for (i = 0; i < n; i++) - { -- e = pNode->m_pData[i]; -+ e = pNode->DataRepresentation ().m_pData[i]; - if (e.m_nAttrib & STORE_ATTRIB_ISLINK) - { - // Hard link. - aSrcPage.location (e.m_aLink.m_nAddr); -- pDirect->m_aDescr.m_nSize = m_nPageSize; -+ pDirect->PageHeader ().m_aDescr.m_nSize = m_nPageSize; - - eErrCode = aCtx.m_xBIOS->load (aSrcPage); - if (eErrCode == store_E_None) - { -- OStorePageKey aDstKey (pDirect->m_aNameBlock.m_aKey); -+ OStorePageKey aDstKey (pDirect->NameBlock ().Key ()); - eErrCode = link (e.m_aKey, aDstKey); - } - e.m_nAttrib &= ~STORE_ATTRIB_ISLINK; ---- ./store/source/storpage.hxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/storpage.hxx 2009-04-06 16:42:11.000000000 +0000 -@@ -66,7 +66,8 @@ public: - storeError initializeManager ( - ILockBytes *pLockBytes, - storeAccessMode eAccessMode, -- sal_uInt16 nPageSize); -+ sal_uInt16 nPageSize, -+ sal_uInt16 nFormatVersion); - - /** isValid. - * @return sal_True upon successful initialization, ---- ./store/source/stortree.cxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/stortree.cxx 2009-04-06 16:42:11.000000000 +0000 -@@ -55,7 +55,7 @@ using namespace store; - * OStoreBTreeNodeData. - */ - OStoreBTreeNodeData::OStoreBTreeNodeData (sal_uInt16 nPageSize) -- : OStorePageData (nPageSize) -+ : OStorePageData (nPageSize, sizeof (self)) - { - initialize(); - } -@@ -65,15 +65,15 @@ OStoreBTreeNodeData::OStoreBTreeNodeData - */ - void OStoreBTreeNodeData::initialize (void) - { -- base::m_aGuard.m_nMagic = STORE_MAGIC_BTREENODE; -- base::m_aDescr.m_nUsed = base::size() + self::size(); -- self::m_aGuard.m_nMagic = 0; -+ base::PageHeader ().m_aGuard.m_nMagic = STORE_MAGIC_BTREENODE; -+ base::PageHeader ().m_aDescr.m_nUsed = base::size() + self::size(); -+ self::PageHeader ().m_aGuard.m_nMagic = 0; - - sal_uInt16 i, n = capacityCount(); - T t; - - for (i = 1; i < n; i++) -- m_pData[i] = t; -+ DataRepresentation ().m_pData[i] = t; - } - - /* -@@ -87,11 +87,11 @@ void OStoreBTreeNodeData::swap ( - ) - { - #ifdef OSL_BIGENDIAN -- m_aGuard.swap(); -+ DataRepresentation ().m_aGuard.swap(); - - sal_uInt16 i, n = sal_uInt16(capacity(rDescr) / sizeof(T)); - for (i = 0; i < n; i++) -- m_pData[i].swap(); -+ DataRepresentation ().m_pData[i].swap(); - #endif /* OSL_BIGENDIAN */ - } - -@@ -107,16 +107,16 @@ sal_uInt16 OStoreBTreeNodeData::find (co - { - register sal_Int32 m = ((l + r) >> 1); - -- if (t.m_aKey == m_pData[m].m_aKey) -+ if (t.m_aKey == DataRepresentation ().m_pData[m].m_aKey) - return ((sal_uInt16)(m)); -- if (t.m_aKey < m_pData[m].m_aKey) -+ if (t.m_aKey < DataRepresentation ().m_pData[m].m_aKey) - r = m - 1; - else - l = m + 1; - } - - sal_uInt16 k = ((sal_uInt16)(r)); -- if ((k < capacityCount()) && (t.m_aKey < m_pData[k].m_aKey)) -+ if ((k < capacityCount()) && (t.m_aKey < DataRepresentation ().m_pData[k].m_aKey)) - return(k - 1); - else - return(k); -@@ -132,11 +132,11 @@ void OStoreBTreeNodeData::insert (sal_uI - if ((n < m) && (i < m)) - { - // shift right. -- rtl_moveMemory (&m_pData[i + 1], &m_pData[i], (n - i) * sizeof(T)); -+ rtl_moveMemory (&DataRepresentation ().m_pData[i + 1], &DataRepresentation ().m_pData[i], (n - i) * sizeof(T)); - - // insert. -- m_pData[i] = t; -- base::m_aDescr.m_nUsed += sal_uInt16(sizeof(T)); -+ DataRepresentation ().m_pData[i] = t; -+ base::PageHeader ().m_aDescr.m_nUsed += sal_uInt16(sizeof(T)); - } - } - -@@ -150,11 +150,11 @@ void OStoreBTreeNodeData::remove (sal_uI - { - // shift left. - rtl_moveMemory ( -- &m_pData[i], &m_pData[i + 1], (n - i - 1) * sizeof(T)); -+ &DataRepresentation ().m_pData[i], &DataRepresentation ().m_pData[i + 1], (n - i - 1) * sizeof(T)); - - // truncate. -- m_pData[n - 1] = T(); -- base::m_aDescr.m_nUsed -= sal_uInt16(sizeof(T)); -+ DataRepresentation ().m_pData[n - 1] = T(); -+ base::PageHeader ().m_aDescr.m_nUsed -= sal_uInt16(sizeof(T)); - } - } - -@@ -167,7 +167,7 @@ void OStoreBTreeNodeData::merge (const s - { - sal_uInt16 n = usageCount(); - sal_uInt16 m = rPageR.usageCount(); -- rtl_copyMemory (&m_pData[n], &rPageR.m_pData[0], m * sizeof(T)); -+ rtl_copyMemory (&DataRepresentation ().m_pData[n], &rPageR.DataRepresentation ().m_pData[0], m * sizeof(T)); - usageCount (n + m); - } - } -@@ -178,7 +178,7 @@ void OStoreBTreeNodeData::merge (const s - void OStoreBTreeNodeData::split (const self& rPageL) - { - sal_uInt16 h = capacityCount() / 2; -- rtl_copyMemory (&m_pData[0], &rPageL.m_pData[h], h * sizeof(T)); -+ rtl_copyMemory (&DataRepresentation ().m_pData[0], &rPageL.DataRepresentation ().m_pData[h], h * sizeof(T)); - truncate (h); - } - -@@ -191,7 +191,7 @@ void OStoreBTreeNodeData::truncate (sal_ - T t; - - for (sal_uInt16 i = n; i < m; i++) -- m_pData[i] = t; -+ DataRepresentation ().m_pData[i] = t; - usageCount (n); - } - -@@ -255,7 +255,7 @@ storeError OStoreBTreeNodeObject::split - STORE_METHOD_ENTER(pMutex); - - // Save PageDescriptor. -- D aDescr (m_rPage.m_aDescr); -+ D aDescr (m_rPage.PageHeader ().m_aDescr); - - // Acquire Lock. - storeError eErrCode = rBIOS.acquireLock (aDescr.m_nAddr, aDescr.m_nSize); -@@ -297,7 +297,7 @@ storeError OStoreBTreeNodeObject::split - - // Insert right page. - T entry; -- entry.m_aKey = rPageR.m_pData[0].m_aKey; -+ entry.m_aKey = rPageR.DataRepresentation ().m_pData[0].m_aKey; - entry.m_aLink.m_nAddr = rPageR.location(); - - m_rPage.insert (nIndexL + 1, entry); -@@ -340,7 +340,7 @@ storeError OStoreBTreeNodeObject::remove - STORE_METHOD_ENTER(pMutex); - - // Save PageDescriptor. -- D aDescr (m_rPage.m_aDescr); -+ D aDescr (m_rPage.PageHeader ().m_aDescr); - - // Acquire Lock. - storeError eErrCode = rBIOS.acquireLock (aDescr.m_nAddr, aDescr.m_nSize); -@@ -351,7 +351,7 @@ storeError OStoreBTreeNodeObject::remove - if (m_rPage.depth()) - { - // Check link entry. -- if (!(rEntryL.compare (m_rPage.m_pData[nIndexL]) == T::COMPARE_EQUAL)) -+ if (!(rEntryL.compare (m_rPage.DataRepresentation ().m_pData[nIndexL]) == T::COMPARE_EQUAL)) - { - rBIOS.releaseLock (aDescr.m_nAddr, aDescr.m_nSize); - STORE_METHOD_LEAVE(pMutex, store_E_InvalidAccess); -@@ -359,7 +359,7 @@ storeError OStoreBTreeNodeObject::remove - - // Load link node. - self aNodeL (rPageL); -- aNodeL.location (m_rPage.m_pData[nIndexL].m_aLink.m_nAddr); -+ aNodeL.location (m_rPage.DataRepresentation ().m_pData[nIndexL].m_aLink.m_nAddr); - - eErrCode = rBIOS.load (aNodeL); - if (eErrCode != store_E_None) -@@ -429,21 +429,21 @@ storeError OStoreBTreeNodeObject::remove - #endif /* NYI */ - - // Relink. -- m_rPage.m_pData[nIndexL].m_aKey = rPageL.m_pData[0].m_aKey; -+ m_rPage.DataRepresentation ().m_pData[nIndexL].m_aKey = rPageL.DataRepresentation ().m_pData[0].m_aKey; - touch(); - } - } - else - { - // Check leaf entry. -- if (!(rEntryL.compare (m_rPage.m_pData[nIndexL]) == T::COMPARE_EQUAL)) -+ if (!(rEntryL.compare (m_rPage.DataRepresentation ().m_pData[nIndexL]) == T::COMPARE_EQUAL)) - { - rBIOS.releaseLock (aDescr.m_nAddr, aDescr.m_nSize); - STORE_METHOD_LEAVE(pMutex, store_E_NotExists); - } - - // Save leaf entry. -- rEntryL = m_rPage.m_pData[nIndexL]; -+ rEntryL = m_rPage.DataRepresentation ().m_pData[nIndexL]; - - // Remove leaf index. - m_rPage.remove (nIndexL); -@@ -488,7 +488,7 @@ storeError OStoreBTreeRootObject::change - STORE_METHOD_ENTER(pMutex); - - // Save PageDescriptor. -- OStorePageDescriptor aDescr (m_rPage.m_aDescr); -+ OStorePageDescriptor aDescr (m_rPage.PageHeader ().m_aDescr); - - // Acquire Lock. - storeError eErrCode = rBIOS.acquireLock (aDescr.m_nAddr, aDescr.m_nSize); -@@ -507,8 +507,8 @@ storeError OStoreBTreeRootObject::change - STORE_METHOD_LEAVE(pMutex, eErrCode); - } - -- m_rPage.m_pData[0].m_aKey = rPageL.m_pData[0].m_aKey; -- m_rPage.m_pData[0].m_aLink.m_nAddr = rPageL.location(); -+ m_rPage.DataRepresentation ().m_pData[0].m_aKey = rPageL.DataRepresentation ().m_pData[0].m_aKey; -+ m_rPage.DataRepresentation ().m_pData[0].m_aLink.m_nAddr = rPageL.location(); - - m_rPage.truncate (1); - m_rPage.depth (m_rPage.depth() + 1); ---- ./store/source/stortree.hxx.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/source/stortree.hxx 2009-04-06 16:42:11.000000000 +0000 -@@ -128,8 +128,15 @@ struct OStoreBTreeNodeData : public stor - - /** Representation. - */ -- G m_aGuard; -- T m_pData[1]; -+ struct Representation { -+ G m_aGuard; -+ T m_pData[1]; -+ }; -+ -+ inline Representation& DataRepresentation () const -+ { -+ return *(Representation *) (Data () + base::size ()); -+ } - - /** size. - */ -@@ -146,7 +153,7 @@ struct OStoreBTreeNodeData : public stor - } - sal_uInt16 capacity (void) const - { -- return self::capacity (base::m_aDescr); -+ return self::capacity (base::PageHeader ().m_aDescr); - } - - /** capacityCount (must be even). -@@ -164,7 +171,7 @@ struct OStoreBTreeNodeData : public stor - } - sal_uInt16 usage (void) const - { -- return self::usage (base::m_aDescr); -+ return self::usage (base::PageHeader ().m_aDescr); - } - - /** usageCount. -@@ -175,7 +182,7 @@ struct OStoreBTreeNodeData : public stor - } - void usageCount (sal_uInt16 nCount) - { -- base::m_aDescr.m_nUsed = base::size() + self::size() + -+ base::PageHeader ().m_aDescr.m_nUsed = base::size() + self::size() + - sal_uInt16(nCount * sizeof(T)); - } - -@@ -190,8 +197,8 @@ struct OStoreBTreeNodeData : public stor - { - base::operator= (rOther); - -- m_aGuard = rOther.m_aGuard; -- rtl_copyMemory (m_pData, rOther.m_pData, capacity()); -+ DataRepresentation ().m_aGuard = rOther.DataRepresentation ().m_aGuard; -+ rtl_copyMemory (DataRepresentation ().m_pData, rOther.DataRepresentation ().m_pData, capacity()); - } - return *this; - } -@@ -200,7 +207,7 @@ struct OStoreBTreeNodeData : public stor - */ - sal_Bool operator== (const self& rOther) const - { -- return (base::operator==(rOther) && (m_aGuard == rOther.m_aGuard)); -+ return (base::operator==(rOther) && (DataRepresentation ().m_aGuard == rOther.DataRepresentation ().m_aGuard)); - } - - /** swap (external and internal representation). -@@ -212,12 +219,12 @@ struct OStoreBTreeNodeData : public stor - void guard (const D& rDescr) - { - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, m_pData, capacity(rDescr)); -+ nCRC32 = G::crc32 (nCRC32, &DataRepresentation ().m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, DataRepresentation ().m_pData, capacity(rDescr)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- m_aGuard.m_nCRC32 = nCRC32; -+ DataRepresentation ().m_aGuard.m_nCRC32 = nCRC32; - } - - /** verify (external representation). -@@ -225,12 +232,12 @@ struct OStoreBTreeNodeData : public stor - storeError verify (const D& rDescr) - { - sal_uInt32 nCRC32 = 0; -- nCRC32 = G::crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32)); -- nCRC32 = G::crc32 (nCRC32, m_pData, capacity(rDescr)); -+ nCRC32 = G::crc32 (nCRC32, &DataRepresentation ().m_aGuard.m_nMagic, sizeof(sal_uInt32)); -+ nCRC32 = G::crc32 (nCRC32, DataRepresentation ().m_pData, capacity(rDescr)); - #ifdef OSL_BIGENDIAN - nCRC32 = OSL_SWAPDWORD(nCRC32); - #endif /* OSL_BIGENDIAN */ -- if (m_aGuard.m_nCRC32 != nCRC32) -+ if (DataRepresentation ().m_aGuard.m_nCRC32 != nCRC32) - return store_E_InvalidChecksum; - else - return store_E_None; -@@ -240,11 +247,11 @@ struct OStoreBTreeNodeData : public stor - */ - sal_uInt32 depth (void) const - { -- return self::m_aGuard.m_nMagic; -+ return self::DataRepresentation ().m_aGuard.m_nMagic; - } - void depth (sal_uInt32 nDepth) - { -- self::m_aGuard.m_nMagic = nDepth; -+ self::DataRepresentation ().m_aGuard.m_nMagic = nDepth; - } - - /** queryMerge. ---- ./store/workben/makefile.mk.old 2009-04-02 10:44:48.000000000 +0000 -+++ ./store/workben/makefile.mk 2009-04-06 16:42:11.000000000 +0000 -@@ -62,12 +62,14 @@ CFLAGS+= -I..$/source - CXXFILES= \ - t_file.cxx \ - t_base.cxx \ -- t_store.cxx -+ t_store.cxx \ -+ t_shell.cxx - - OBJFILES= \ - $(OBJ)$/t_file.obj \ - $(OBJ)$/t_base.obj \ -- $(OBJ)$/t_store.obj -+ $(OBJ)$/t_store.obj \ -+ $(OBJ)$/t_shell.obj - - APP1TARGET= t_file - APP1OBJS= $(OBJ)$/t_file.obj -@@ -93,6 +95,14 @@ APP3DEPN= \ - $(SLB)$/store.lib \ - $(L)$/isal.lib - -+APP4TARGET= t_shell -+APP4OBJS= $(OBJ)$/t_shell.obj -+APP4STDLIBS= $(STORELIB) -+APP4STDLIBS+= $(SALLIB) -+APP4DEPN= \ -+ $(SLB)$/store.lib \ -+ $(L)$/isal.lib -+ - # --- Targets --- - - .INCLUDE : target.mk diff --git a/patches/openoffice-store-registry.patch b/patches/openoffice-store-registry.patch deleted file mode 100644 index f5ad17345..000000000 --- a/patches/openoffice-store-registry.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- ./registry/inc/registry/registry.h.store-registry~ 2008-07-07 21:53:26.583846279 +0200 -+++ ./registry/inc/registry/registry.h 2008-07-07 22:05:39.641847088 +0200 -@@ -410,7 +410,7 @@ RegError REGISTRY_CALLTYPE reg_mergeKey( - @return REG_NO_ERROR if succeeds else an error code. - */ - RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, -- RegHandle* phRegistry); -+ RegHandle* phRegistry, bool bInternal = false); - - - /** This function opens the root key of a registry. ---- ./registry/source/regimpl.cxx.store-registry~ 2008-07-07 21:53:24.154848251 +0200 -+++ ./registry/source/regimpl.cxx 2008-07-07 22:04:50.955847680 +0200 -@@ -483,7 +483,7 @@ ORegistry::~ORegistry() - //********************************************************************* - // initRegistry - // --RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMode) -+RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMode, bool bInternal) - { - OStoreFile rRegFile; - storeAccessMode sAccessMode = REG_MODE_OPEN; -@@ -506,7 +506,10 @@ RegError ORegistry::initRegistry(const O - } - else - { -- errCode = rRegFile.create(regName, sAccessMode, REG_PAGESIZE); -+ if (bInternal) -+ errCode = rRegFile.create(regName, sAccessMode, REG_PAGESIZE_INTERNAL, REG_RDB_FORMAT_2); -+ else -+ errCode = rRegFile.create(regName, sAccessMode, REG_PAGESIZE_PUBLIC, REG_RDB_FORMAT_1); - } - - if (errCode) ---- ./registry/source/regimpl.hxx.store-registry~ 2008-04-11 12:50:09.000000000 +0200 -+++ ./registry/source/regimpl.hxx 2008-07-07 22:04:50.957847096 +0200 -@@ -36,7 +36,11 @@ - #include - #include - --#define REG_PAGESIZE 512 -+#define REG_PAGESIZE_PUBLIC 512 -+#define REG_PAGESIZE_INTERNAL 128 -+ -+#define REG_RDB_FORMAT_1 STORE_FORMAT_V1 -+#define REG_RDB_FORMAT_2 STORE_FORMAT_V2 - - #define REG_MODE_CREATE store_AccessCreate - #define REG_MODE_OPEN store_AccessReadWrite -@@ -93,7 +97,8 @@ public: - { return --m_refCount; } - - RegError initRegistry(const OUString& name, -- RegAccessMode accessMode); -+ RegAccessMode accessMode, -+ bool bInternal = false); - - RegError closeRegistry(); - ---- ./registry/source/registry.cxx.store-registry~ 2008-04-11 12:50:37.000000000 +0200 -+++ ./registry/source/registry.cxx 2008-07-07 22:04:50.959846582 +0200 -@@ -637,12 +637,13 @@ RegError REGISTRY_CALLTYPE reg_mergeKey( - // reg_createRegistry - // - RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, -- RegHandle* phRegistry) -+ RegHandle* phRegistry, -+ bool bInternal) - { - RegError ret; - - ORegistry* pReg = new ORegistry(); -- if ((ret = pReg->initRegistry(registryName, REG_CREATE))) -+ if ((ret = pReg->initRegistry(registryName, REG_CREATE, bInternal))) - { - *phRegistry = NULL; - return ret; ---- ./registry/tools/regmerge.cxx.store-registry~ 2008-04-11 12:58:26.000000000 +0200 -+++ ./registry/tools/regmerge.cxx 2008-07-07 22:04:50.962846684 +0200 -@@ -98,15 +98,16 @@ static void dumpHelp() - { - fprintf(stderr, "using: regmerge [-v|--verbose] mergefile mergeKeyName regfile_1 ... regfile_n\n"); - fprintf(stderr, " regmerge @regcmds\nOptions:\n"); -- fprintf(stderr, " -v, --verbose : verbose output on stdout.\n"); -- fprintf(stderr, " mergefile : specifies the merged registry file. If this file doesn't exists,\n"); -- fprintf(stderr, " it is created.\n"); -- fprintf(stderr, " mergeKeyName : specifies the merge key, everything is merged under this key.\n"); -- fprintf(stderr, " If this key doesn't exists, it is created.\n"); -- fprintf(stderr, " regfile_1..n : specifies one or more registry files which are merged.\n"); -+ fprintf(stderr, " -i, --internal : use internal private format.\n"); -+ fprintf(stderr, " -v, --verbose : verbose output on stdout.\n"); -+ fprintf(stderr, " mergefile : specifies the merged registry file. If this file doesn't exists,\n"); -+ fprintf(stderr, " it is created.\n"); -+ fprintf(stderr, " mergeKeyName : specifies the merge key, everything is merged under this key.\n"); -+ fprintf(stderr, " If this key doesn't exists, it is created.\n"); -+ fprintf(stderr, " regfile_1..n : specifies one or more registry files which are merged.\n"); - } - --static bool checkCommandFile(char* cmdfile) -+static bool checkCommandFile(char* cmdfile, bool& bInternal) - { - FILE *commandfile; - char option[256]; -@@ -122,13 +123,17 @@ static bool checkCommandFile(char* cmdfi - { - if (option[0]== '@') - { -- bool bRet = checkCommandFile(option); -+ bool bRet = checkCommandFile(option, bInternal); - // ensure that the option will not be overwritten - if ( !bRet ) - bVerbose = bRet; - } else { - if (option[0]== '-') { -- if (strncmp(option, "-v", 2) == 0 || -+ if (strncmp(option, "-i", 2) == 0 || -+ strncmp(option, "--internal", 10) == 0) -+ { -+ bInternal = true; -+ } else if (strncmp(option, "-v", 2) == 0 || - strncmp(option, "--verbose", 9) == 0) - { - bVerbose = true; -@@ -155,23 +160,28 @@ static bool checkCommandFile(char* cmdfi - return bVerbose; - } - --static bool checkCommandArgs(int argc, char **argv) -+static bool checkCommandArgs(int argc, char **argv, bool &bInternal) - { - bool bVerbose = false; - -+ bInternal = false; - realargc = 0; - - for (int i=0; i --#include -+#include -+#include - #include - - ---- svx/source/engine3d/scene3d.cxx.pristine 2009-02-16 10:47:03.000000000 +0100 -+++ svx/source/engine3d/scene3d.cxx 2009-02-16 10:45:14.000000000 +0100 -@@ -260,7 +260,7 @@ void E3dScene::SetDefaultAttributes(E3dD - #endif - - // Fuer WIN95/NT die FP-Exceptions abschalten --#if defined(WNT) || defined(WIN) -+#if (defined(WNT) || defined(WIN)) && !defined (__MINGW32__) - #define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 ) - #define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) - SC_FPEXCEPTIONS_OFF(); diff --git a/patches/openoffice-sw-disable-vba-consistency.patch b/patches/openoffice-sw-disable-vba-consistency.patch deleted file mode 100644 index 5e5317567..000000000 --- a/patches/openoffice-sw-disable-vba-consistency.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- sw/util/makefile.mk.pristine 2009-04-06 16:16:26.727997047 +0200 -+++ sw/util/makefile.mk 2009-04-06 16:16:02.788069269 +0200 -@@ -348,6 +348,7 @@ SHL4STDLIBS= \ - $(BASICLIB) \ - $(I18NUTILLIB) - -+.IF "$(ENABLE_VBA)"=="YES" # correspond with source/ui/vba/makefile.mk - #target vba - TARGET_VBA=vbaswobj - SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno -@@ -376,5 +377,6 @@ SHL5STDLIBS= \ - - SHL5DEPN=$(SHL1TARGETN) - SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib -+.ENDIF #"$(ENABLE_VBA)"!="YES" - - .INCLUDE : target.mk diff --git a/patches/openoffice-sysui-mingw.patch b/patches/openoffice-sysui-mingw.patch deleted file mode 100644 index 7fe7db17a..000000000 --- a/patches/openoffice-sysui-mingw.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sysui/source/win32/QuickStart/QuickStart.cpp.~1.7.~ 2006-06-20 07:01:42.000000000 +0200 -+++ sysui/source/win32/QuickStart/QuickStart.cpp 2008-10-29 17:12:35.000000000 +0100 -@@ -1,7 +1,6 @@ - // QuickStart.cpp : Defines the entry point for the application. - // - --#include "stdafx.h" - #include "resource.h" - #include - #include diff --git a/patches/openoffice-tools-mingw.patch b/patches/openoffice-tools-mingw.patch deleted file mode 100644 index bac8f7a2a..000000000 --- a/patches/openoffice-tools-mingw.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- tools/source/fsys/wntmsc.hxx.pristine 2008-10-29 23:44:36.000000000 +0100 -+++ tools/source/fsys/wntmsc.hxx 2008-10-28 19:13:59.000000000 +0100 -@@ -36,8 +36,8 @@ - #ifndef ICC - #include - #endif --#include --#include -+#include -+#include - #include - - #include ---- tools/inc/tools/solar.h.pristine 2008-10-29 23:44:36.000000000 +0100 -+++ tools/inc/tools/solar.h 2008-10-31 12:54:34.000000000 +0100 -@@ -57,6 +57,12 @@ - /* Previous typedefs from before sal convergence are in comments */ - /* to the right of the new types. */ - -+#ifdef __MINGW32__ -+#undef BOOL -+#undef INT32 -+#undef UINT32 -+#endif /* __MINGW32__ */ -+ - typedef sal_Bool BOOL; /* typedef unsigned char BOOL; */ - typedef sal_uInt8 BYTE; /* typedef unsigned char BYTE; */ - typedef sal_uInt16 USHORT; /* typedef unsigned short USHORT; */ diff --git a/patches/openoffice-transex3-mingw.patch b/patches/openoffice-transex3-mingw.patch deleted file mode 100644 index 3cad29a34..000000000 --- a/patches/openoffice-transex3-mingw.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git transex3/source/xmlparse.cxx transex3/source/xmlparse.cxx -index 3b9bc34..58d1e6e 100644 ---- transex3/source/xmlparse.cxx -+++ transex3/source/xmlparse.cxx -@@ -32,14 +32,14 @@ - #include "precompiled_transex3.hxx" - #include /* std::iterator*/ - -- - #include - #include - - #include "xmlparse.hxx" - #include - #include --#include "osl/mutex.hxx" -+#include -+#include - - using namespace std; - using namespace osl; -@@ -278,11 +278,11 @@ BOOL XMLFile::Write( ByteString &aFilename ) - if( !aFStream ) // From time to time the stream can not be opened the first time on NFS volumes, - { // I wasn't able to track this down. I think this is an NFS issue ..... - //cerr << "ERROR: - helpex - Can't write to tempfile " << aFilename.GetBuffer() << " No#" << x << "\n"; --#ifdef UNX -- sleep( 3 ); --#else -- Sleep( 3 ); --#endif -+ TimeValue aTime; -+ aTime.Seconds = 3; -+ aTime.Nanosec = 0; -+ -+ osl::Thread::wait( aTime ); - } - else - { -diff --git xmlhelp/source/com/sun/star/help/HelpCompiler.cxx xmlhelp/source/com/sun/star/help/HelpCompiler.cxx -index 38804e7..7802dc0 100644 ---- xmlhelp/source/com/sun/star/help/HelpCompiler.cxx -+++ xmlhelp/source/com/sun/star/help/HelpCompiler.cxx -@@ -37,6 +37,16 @@ - #include - #include - #include -+#include -+ -+static void impl_sleep( sal_uInt32 nSec ) -+{ -+ TimeValue aTime; -+ aTime.Seconds = nSec; -+ aTime.Nanosec = 0; -+ -+ osl::Thread::wait( aTime ); -+} - - HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_inputFile, - const fs::path &in_src, const fs::path &in_resEmbStylesheet, -@@ -58,12 +68,8 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath) - { - res = xmlParseFile(filePath.native_file_string().c_str()); - if( !res ){ --#ifdef UNX -- sleep( 3 ); --#else -- Sleep( 3 ); --#endif -- res = xmlParseFile(filePath.native_file_string().c_str()); -+ impl_sleep( 3 ); -+ res = xmlParseFile(filePath.native_file_string().c_str()); - } - } - else -@@ -87,11 +93,7 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath) - xmlDocPtr doc = xmlParseFile(filePath.native_file_string().c_str()); - if( !doc ) - { --#ifdef UNX -- sleep( 3 ); --#else -- Sleep( 3 ); --#endif -+ impl_sleep( 3 ); - doc = xmlParseFile(filePath.native_file_string().c_str()); - } - -@@ -412,11 +414,7 @@ bool HelpCompiler::compile( void ) throw( HelpProcessingException ) - // resolve the dom - if (!docResolvedOrg) - { --#ifdef UNX -- sleep( 3 ); --#else -- Sleep( 3 ); --#endif -+ impl_sleep( 3 ); - docResolvedOrg = getSourceDocument(inputFile); - if( !docResolvedOrg ) - { diff --git a/patches/openoffice-unotools-mingw.patch b/patches/openoffice-unotools-mingw.patch deleted file mode 100644 index eab7dda01..000000000 --- a/patches/openoffice-unotools-mingw.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- unotools/inc/unotools/ucbhelper.hxx.~1.11.~ 2008-04-11 15:18:03.000000000 +0200 -+++ unotools/inc/unotools/ucbhelper.hxx 2008-10-31 15:14:34.000000000 +0100 -@@ -35,6 +35,7 @@ - // include --------------------------------------------------------------- - #include - #include -+#undef ERROR - #include - #include - diff --git a/patches/openoffice-vbahelper-mingw.patch b/patches/openoffice-vbahelper-mingw.patch deleted file mode 100644 index 06c28fefe..000000000 --- a/patches/openoffice-vbahelper-mingw.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- vbahelper/source/msforms/makefile.mk.pristine 2009-04-06 10:21:06.076111395 +0200 -+++ vbahelper/source/msforms/makefile.mk 2009-04-06 10:22:08.329279423 +0200 -@@ -61,6 +61,10 @@ SLOFILES=\ - $(SLO)$/vbauserform.obj \ - $(SLO)$/service.obj \ - -+.IF "$(CROSS_COMPILING)" == "yes" -+SLOFILES += $(SLO)$/vbapropvalue.obj -+.ENDIF #"$(CROSS_COMPILING)" == "yes" -+ - # #FIXME vbapropvalue needs to move to vbahelper - - # --- Targets ------------------------------------------------------- diff --git a/patches/openoffice-vcl-mingw.patch b/patches/openoffice-vcl-mingw.patch deleted file mode 100644 index 3a540cccf..000000000 --- a/patches/openoffice-vcl-mingw.patch +++ /dev/null @@ -1,424 +0,0 @@ ---- vcl/win/source/app/saltimer.cxx.pristine 2008-10-30 13:15:44.000000000 +0100 -+++ vcl/win/source/app/saltimer.cxx 2008-10-30 13:13:16.000000000 +0100 -@@ -32,7 +32,7 @@ - #include "precompiled_vcl.hxx" - #include - #ifdef __MINGW32__ --#include -+#include - #endif - #include - #include ---- vcl/win/source/app/salinst.cxx.pristine 2009-02-18 16:18:51.000000000 +0100 -+++ vcl/win/source/app/salinst.cxx 2009-04-04 16:28:58.940770892 +0200 -@@ -37,7 +37,7 @@ - #include - #endif - #ifdef __MINGW32__ --#include -+#include - #endif - - #include -@@ -67,9 +67,11 @@ - #pragma warning(push, 1) - #endif - -+#ifndef __MINGW32__ - #include - #include - #include -+#endif /* __MINGW32__ */ - - #if defined _MSC_VER - #pragma warning(pop) -@@ -456,10 +458,12 @@ void InitSalData() - { - SalData* pSalData = new SalData; - CoInitialize(0); - -+#ifndef __MINGW32__ - // init GDIPlus - static Gdiplus::GdiplusStartupInput gdiplusStartupInput; - Gdiplus::GdiplusStartup(&pSalData->gdiplusToken, &gdiplusStartupInput, NULL); -+#endif /* __MINGW32__ */ - } - - -@@ -468,11 +471,13 @@ void DeInitSalData() - CoUninitialize(); - SalData* pSalData = GetSalData(); - -+#ifndef __MINGW32__ - // deinit GDIPlus - if(pSalData) - { - Gdiplus::GdiplusShutdown(pSalData->gdiplusToken); - } -+#endif /* __MINGW32__ */ - - delete pSalData; - } ---- vcl/win/source/src/salsrc.rc.pristine 2008-10-30 13:51:23.000000000 +0100 -+++ vcl/win/source/src/salsrc.rc 2008-10-30 13:53:31.000000000 +0100 -@@ -35,90 +35,90 @@ - #include - #endif - --SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR -+SAL_RESID_POINTER_NULL CURSOR nullptr.cur - #if ( WINVER < 0x0400 ) --SAL_RESID_POINTER_HELP CURSOR HELP.CUR -+SAL_RESID_POINTER_HELP CURSOR help.cur - #endif - #ifndef WNT --SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR --SAL_RESID_POINTER_VSIZE CURSOR VSIZE.CUR --SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR --SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR -+SAL_RESID_POINTER_HSIZE CURSOR hsize.cur -+SAL_RESID_POINTER_VSIZE CURSOR vsize.cur -+SAL_RESID_POINTER_NESWSIZE CURSOR neswsize.cur -+SAL_RESID_POINTER_NWSESIZE CURSOR nwsesize.cur - #endif --SAL_RESID_POINTER_CROSS CURSOR CROSS.CUR --SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR --SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR --SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR --SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR --SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR --SAL_RESID_POINTER_HAND CURSOR HAND.CUR --SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR --SAL_RESID_POINTER_PEN CURSOR PEN.CUR --SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR --SAL_RESID_POINTER_FILL CURSOR FILL.CUR --SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR --SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR --SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR --SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR --SAL_RESID_POINTER_CROOK CURSOR CROOK.CUR --SAL_RESID_POINTER_CROP CURSOR CROP.CUR --SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR --SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR MOVEBW.CUR --SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR --SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR --SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR --SAL_RESID_POINTER_MOVEDATALINK CURSOR MOVEDLNK.CUR --SAL_RESID_POINTER_COPYDATALINK CURSOR COPYDLNK.CUR --SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR --SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR --SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR --SAL_RESID_POINTER_MOVEFILELINK CURSOR MOVEFLNK.CUR --SAL_RESID_POINTER_COPYFILELINK CURSOR COPYFLNK.CUR --SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR --SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR --SAL_RESID_POINTER_NOTALLOWED CURSOR NOTALLOW.CUR --SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR --SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR --SAL_RESID_POINTER_DRAW_POLYGON CURSOR DPOLYGON.CUR --SAL_RESID_POINTER_DRAW_BEZIER CURSOR DBEZIER.CUR --SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR --SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR --SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR DCIRCCUT.CUR --SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR DELLIPSE.CUR --SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR --SAL_RESID_POINTER_DRAW_CONNECT CURSOR DCONNECT.CUR --SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR --SAL_RESID_POINTER_DRAW_CAPTION CURSOR DCAPT.CUR --SAL_RESID_POINTER_CHART CURSOR CHART.CUR --SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR --SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR --SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR --SAL_RESID_POINTER_PIVOT_FIELD CURSOR PIVOTFLD.CUR --SAL_RESID_POINTER_PIVOT_DELETE CURSOR PIVOTDEL.CUR --SAL_RESID_POINTER_CHAIN CURSOR CHAIN.CUR --SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR CHAINNOT.CUR --SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR TIMEMOVE.CUR --SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR TIMESIZE.CUR --SAL_RESID_POINTER_AUTOSCROLL_N CURSOR ASN.CUR --SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ASS.CUR --SAL_RESID_POINTER_AUTOSCROLL_W CURSOR ASW.CUR --SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ASE.CUR --SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR ASNW.CUR --SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR ASNE.CUR --SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR ASSW.CUR --SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR --SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR --SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR --SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR ASNSWE.CUR --SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR --SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR --SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR --SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR --SAL_RESID_POINTER_TAB_SELECT_SE CURSOR TBLSELSE.CUR --SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR --SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR --SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR -+SAL_RESID_POINTER_CROSS CURSOR cross.cur -+SAL_RESID_POINTER_MOVE CURSOR move.cur -+SAL_RESID_POINTER_HSPLIT CURSOR hsplit.cur -+SAL_RESID_POINTER_VSPLIT CURSOR vsplit.cur -+SAL_RESID_POINTER_HSIZEBAR CURSOR hsizebar.cur -+SAL_RESID_POINTER_VSIZEBAR CURSOR vsizebar.cur -+SAL_RESID_POINTER_HAND CURSOR hand.cur -+SAL_RESID_POINTER_REFHAND CURSOR refhand.cur -+SAL_RESID_POINTER_PEN CURSOR pen.cur -+SAL_RESID_POINTER_MAGNIFY CURSOR magnify.cur -+SAL_RESID_POINTER_FILL CURSOR fill.cur -+SAL_RESID_POINTER_ROTATE CURSOR rotate.cur -+SAL_RESID_POINTER_HSHEAR CURSOR hshear.cur -+SAL_RESID_POINTER_VSHEAR CURSOR vshear.cur -+SAL_RESID_POINTER_MIRROR CURSOR mirror.cur -+SAL_RESID_POINTER_CROOK CURSOR crook.cur -+SAL_RESID_POINTER_CROP CURSOR crop.cur -+SAL_RESID_POINTER_MOVEPOINT CURSOR movept.cur -+SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR movebw.cur -+SAL_RESID_POINTER_MOVEDATA CURSOR movedata.cur -+SAL_RESID_POINTER_COPYDATA CURSOR copydata.cur -+SAL_RESID_POINTER_LINKDATA CURSOR linkdata.cur -+SAL_RESID_POINTER_MOVEDATALINK CURSOR movedlnk.cur -+SAL_RESID_POINTER_COPYDATALINK CURSOR copydlnk.cur -+SAL_RESID_POINTER_MOVEFILE CURSOR movef.cur -+SAL_RESID_POINTER_COPYFILE CURSOR copyf.cur -+SAL_RESID_POINTER_LINKFILE CURSOR linkf.cur -+SAL_RESID_POINTER_MOVEFILELINK CURSOR moveflnk.cur -+SAL_RESID_POINTER_COPYFILELINK CURSOR copyflnk.cur -+SAL_RESID_POINTER_MOVEFILES CURSOR movef2.cur -+SAL_RESID_POINTER_COPYFILES CURSOR copyf2.cur -+SAL_RESID_POINTER_NOTALLOWED CURSOR notallow.cur -+SAL_RESID_POINTER_DRAW_LINE CURSOR dline.cur -+SAL_RESID_POINTER_DRAW_RECT CURSOR drect.cur -+SAL_RESID_POINTER_DRAW_POLYGON CURSOR dpolygon.cur -+SAL_RESID_POINTER_DRAW_BEZIER CURSOR dbezier.cur -+SAL_RESID_POINTER_DRAW_ARC CURSOR darc.cur -+SAL_RESID_POINTER_DRAW_PIE CURSOR dpie.cur -+SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR dcirccut.cur -+SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR dellipse.cur -+SAL_RESID_POINTER_DRAW_FREEHAND CURSOR dfree.cur -+SAL_RESID_POINTER_DRAW_CONNECT CURSOR dconnect.cur -+SAL_RESID_POINTER_DRAW_TEXT CURSOR dtext.cur -+SAL_RESID_POINTER_DRAW_CAPTION CURSOR dcapt.cur -+SAL_RESID_POINTER_CHART CURSOR chart.cur -+SAL_RESID_POINTER_DETECTIVE CURSOR detectiv.cur -+SAL_RESID_POINTER_PIVOT_COL CURSOR pivotcol.cur -+SAL_RESID_POINTER_PIVOT_ROW CURSOR pivotrow.cur -+SAL_RESID_POINTER_PIVOT_FIELD CURSOR pivotfld.cur -+SAL_RESID_POINTER_PIVOT_DELETE CURSOR pivotdel.cur -+SAL_RESID_POINTER_CHAIN CURSOR chain.cur -+SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR chainnot.cur -+SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR timemove.cur -+SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR timesize.cur -+SAL_RESID_POINTER_AUTOSCROLL_N CURSOR asn.cur -+SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ass.cur -+SAL_RESID_POINTER_AUTOSCROLL_W CURSOR asw.cur -+SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ase.cur -+SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR asnw.cur -+SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR asne.cur -+SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR assw.cur -+SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR asse.cur -+SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR asns.cur -+SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR aswe.cur -+SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR asnswe.cur -+SAL_RESID_POINTER_AIRBRUSH CURSOR airbrush.cur -+SAL_RESID_POINTER_TEXT_VERTICAL CURSOR vtext.cur -+SAL_RESID_POINTER_TAB_SELECT_S CURSOR tblsels.cur -+SAL_RESID_POINTER_TAB_SELECT_E CURSOR tblsele.cur -+SAL_RESID_POINTER_TAB_SELECT_SE CURSOR tblselse.cur -+SAL_RESID_POINTER_TAB_SELECT_W CURSOR tblselw.cur -+SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur -+SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur - --SAL_RESID_BITMAP_50 BITMAP 50.BMP -+SAL_RESID_BITMAP_50 BITMAP 50.bmp - --SAL_RESID_ICON_DEFAULT ICON SD.ICO -+SAL_RESID_ICON_DEFAULT ICON sd.ico ---- vcl/win/source/gdi/salnativewidgets-luna.cxx.pristine 2008-10-30 13:50:29.000000000 +0100 -+++ vcl/win/source/gdi/salnativewidgets-luna.cxx 2008-10-30 13:49:24.000000000 +0100 -@@ -31,6 +31,11 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_vcl.hxx" - -+#ifdef __MINGW32__ -+#undef WINVER -+#define WINVER 0x0501 -+#endif /* __MINGW32__ */ -+ - #define _SV_SALNATIVEWIDGETS_CXX - - #include "svsys.h" ---- vcl/win/source/gdi/winlayout.cxx.pristine 2008-10-30 13:43:54.000000000 +0100 -+++ vcl/win/source/gdi/winlayout.cxx 2008-10-30 13:43:46.000000000 +0100 -@@ -55,8 +55,8 @@ - #include - - #ifdef USE_UNISCRIBE --#include --#include -+#include -+#include - #include - #endif // USE_UNISCRIBE - ---- vcl/win/source/gdi/salprn.cxx.pristine 2008-10-30 13:15:44.000000000 +0100 -+++ vcl/win/source/gdi/salprn.cxx 2008-10-30 13:42:47.000000000 +0100 -@@ -35,8 +35,11 @@ - #include - - #ifdef __MINGW32__ --#include --#endif -+#undef WINVER -+#define WINVER 0x500 -+#include -+#define DC_COLLATE 23 -+#endif /* __MINGW32__ */ - - #ifndef _OSL_MODULE_H - #include ---- vcl/win/source/gdi/salgdi2.cxx.pristine 2008-10-30 13:44:20.000000000 +0100 -+++ vcl/win/source/gdi/salgdi2.cxx 2008-10-30 13:36:43.000000000 +0100 -@@ -31,8 +31,14 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_vcl.hxx" - -+#ifdef __MINGW32__ -+#undef WINVER -+#define WINVER 0x410 -+#endif /* __MINGW32__ */ -+ - #include - #include -+ - #include - #include - #include -@@ -44,6 +50,7 @@ - #include - #include - -+ - bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const - { - bool bRet = false; ---- vcl/win/source/gdi/salgdi3.cxx.pristine 2008-10-30 13:44:13.000000000 +0100 -+++ vcl/win/source/gdi/salgdi3.cxx 2008-10-30 13:37:53.000000000 +0100 -@@ -31,6 +31,11 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_vcl.hxx" - -+#ifdef __MINGW32__ -+#undef WINVER -+#define WINVER 0x500 -+#endif /* __MINGW32__ */ -+ - #include - #include - #include ---- vcl/win/source/window/salframe.cxx.pristine 2009-04-03 21:43:22.740500000 +0200 -+++ vcl/win/source/window/salframe.cxx 2009-04-04 19:52:21.487998727 +0200 -@@ -52,7 +52,12 @@ - #include - #endif - #ifdef __MINGW32__ --#include -+#include -+typedef struct tagRECONVERTSTRING FAR *LPRECONVERTSTRING; -+#define SCS_CAP_SETRECONVERTSTRING 0x00000004 -+#define SCS_QUERYRECONVERTSTRING 0x00020000 -+#define SCS_SETRECONVERTSTRING 0x00010000 -+#define IMR_CONFIRMRECONVERTSTRING 0x0005 - #endif - #include - #include -@@ -93,8 +98,10 @@ - #ifndef _VCL_IMPDEL_HXX - #include - #endif -+#ifndef __MINGW32__ - #define COMPILE_MULTIMON_STUBS - #include -+#endif /* __MINGW32__ */ - #include - #ifdef __MINGW32__ - #include -@@ -884,6 +891,7 @@ static void ImplSalCalcFullScreenSize( c - else - nCaptionY = 0; - -+#ifndef __MINGW32__ - try - { - Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); -@@ -911,7 +919,7 @@ static void ImplSalCalcFullScreenSize( c - catch( Exception& ) - { - } -- -+#endif /* __MINGW32__ */ - if( !nScreenDX || !nScreenDY ) - { - nScreenDX = GetSystemMetrics( SM_CXSCREEN ); -@@ -5640,6 +5648,7 @@ static BOOL ImplHandleIMEEndComposition( - static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) - { - sal_Int16 nCommand = 0; -+#ifndef __MINGW32__ - switch( GET_APPCOMMAND_LPARAM(lParam) ) - { - case APPCOMMAND_MEDIA_CHANNEL_DOWN: nCommand = MEDIA_COMMAND_CHANNEL_DOWN; break; -@@ -5663,7 +5672,7 @@ static boolean ImplHandleAppCommand( HWN - default: - return false; - } -- -+#endif /* __MINGW32__ */ - WinSalFrame* pFrame = GetWindowPtr( hWnd ); - Window *pWindow = pFrame ? pFrame->GetWindow() : NULL; - ---- vcl/util/makefile.mk.pristine 2009-04-04 19:55:53.764002766 +0200 -+++ vcl/util/makefile.mk 2009-04-04 19:55:42.260224623 +0200 -@@ -229,13 +229,16 @@ SHL1STDLIBS += $(PSPLIB) - - SHL1STDLIBS += $(UWINAPILIB) \ - $(GDI32LIB) \ -- $(GDIPLUSLIB) \ - $(MSIMG32LIB) \ - $(WINSPOOLLIB) \ - $(OLE32LIB) \ - $(SHELL32LIB) \ - $(ADVAPI32LIB) - -+.IF "$(CROSS_COMPILING)" != "yes" -+SHL1STDLIBS += $(GDIPLUSLIB) -+.ENDIF # "$(CROSS_COMPILING)" != "yes" -+ - .IF "$(COM)" == "GCC" - SHL1STDLIBS += $(IMM32LIB) - .ELSE ---- vcl/win/source/gdi/salgdi_gdiplus.cxx.pristine 2009-04-04 20:44:51.940500589 +0200 -+++ vcl/win/source/gdi/salgdi_gdiplus.cxx 2009-04-04 20:46:19.256479562 +0200 -@@ -39,6 +39,18 @@ - #include - #include - -+#ifdef __MINGW32__ -+bool WinSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double) -+{ -+ return false; -+} -+ -+bool WinSalGraphics::drawPolyLine(const basegfx::B2DPolygon&, const basegfx::B2DVector&, basegfx::B2DLineJoin) -+{ -+ return false; -+} -+#else /* !__MINGW32__ */ -+ - #ifndef min - #define min(a,b) (((a) < (b)) ? (a) : (b)) - #endif -@@ -193,3 +205,4 @@ bool WinSalGraphics::drawPolyLine(const - } - - // ----------------------------------------------------------------------- -+#endif /* !__MINGW32__ */ diff --git a/patches/raptor-1.4.18-cross.patch b/patches/raptor-1.4.18-cross.patch deleted file mode 100644 index 5b563bd1e..000000000 --- a/patches/raptor-1.4.18-cross.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- raptor-1.4.18/configure.ac.orig 2008-10-22 17:18:15.000000000 +0200 -+++ raptor-1.4.18/configure.ac 2008-10-22 17:18:03.000000000 +0200 -@@ -59,6 +59,7 @@ dnl Checks for programs. - AC_CANONICAL_HOST - AM_SANITY_CHECK - AM_PROG_CC_STDC -+AM_PROG_CC_C_O - - m4_undefine([AC_PROG_CXX]) - m4_defun([AC_PROG_CXX],[]) -@@ -295,7 +296,9 @@ int main(int argc, char* argv) { - return is_c99("1234567"); - }], AC_MSG_RESULT(no), - AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value]) -- AC_MSG_RESULT(yes)) -+ AC_MSG_RESULT(yes), -+ AC_DEFINE(HAVE_C99_VSNPRINTF, $ac_cv_vsnprint_result_c99, [vsnprint has C99 compatible return value]) -+ AC_MSG_RESULT($ac_cv_vsnprint_result_c99)) - fi - - need_libm=no -@@ -387,7 +390,7 @@ if test $xmlp = 1 -a $xmlt = 1 -a $ac_c - LIBS="$LIBS -lxmlparse -lxmltok" - AC_TRY_RUN([#include - main() {XML_ParserCreate(NULL); return(0);}], -- worked=yes, worked=no, worked=no) -+ worked=yes, worked=no, worked=$ac_cv_libxmlparse_xml_parsercreate) - if test $worked = yes; then - # Old expat - have_expat_lib=1 -@@ -409,7 +412,7 @@ if test $libexpat = 1 -a $ac_cv_header_e - LIBS="$LIBS -lexpat" - AC_TRY_RUN([#include - main() {XML_ParserCreate(NULL); return(0);}], -- worked=yes, worked=no, worked=no) -+ worked=yes, worked=no, worked=$ac_cv_expat_xml_parsercreate) - if test $worked = yes; then - # New expat - expat-1.95.0 or later - have_expat_lib=1 -@@ -456,7 +459,8 @@ int main(int argc, char **argv) { - AC_DEFINE(EXPAT_UTF8_BOM_CRASH, 1, [does expat crash when it sees an initial UTF8 BOM?]) - AC_MSG_RESULT(no) - AC_MSG_WARN(The available expat crashes on XML UTF-8 BOM in documents) -- AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+)) -+ AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+), -+ AC_MSG_RESULT($ac_cv_expat_initial_utf8_bom)) - - else - AC_MSG_RESULT(no) ---- raptor-1.4.18/librdfa/curie.c.orig 2008-10-25 14:20:31.000000000 +0200 -+++ raptor-1.4.18/librdfa/curie.c 2008-06-14 07:33:37.000000000 +0200 -@@ -122,7 +122,7 @@ char* rdfa_resolve_uri(rdfacontext* cont - { - // if we have a relative URI, chop off the name of the file - // and replace it with the relative pathname -- char* end_index = rindex(context->base, '/'); -+ char* end_index = strrchr(context->base, '/'); - - if(end_index != NULL) - { -@@ -130,7 +130,7 @@ char* rdfa_resolve_uri(rdfacontext* cont - char* end_index2; - - tmpstr = rdfa_replace_string(tmpstr, context->base); -- end_index2= rindex(tmpstr, '/'); -+ end_index2= strrchr(tmpstr, '/'); - end_index2++; - *end_index2 = '\0'; - ---- raptor-1.4.18/librdfa/rdfa.c.orig 2008-10-25 14:21:02.000000000 +0200 -+++ raptor-1.4.18/librdfa/rdfa.c 2008-10-25 14:21:57.000000000 +0200 -@@ -163,7 +163,7 @@ static size_t rdfa_init_base( - { - char* href_start = strstr(base_start, "href="); - char* uri_start = href_start + 6; -- char* uri_end = index(uri_start, '"'); -+ char* uri_end = strchr(uri_start, '"'); - - if((uri_start != NULL) && (uri_end != NULL)) - { -@@ -898,8 +898,8 @@ static void XMLCALL - if(context->xml_literal != NULL) - { - // get the data between the first tag and the last tag -- content_start = index(context->xml_literal, '>'); -- content_end = rindex(context->xml_literal, '<'); -+ content_start = strchr(context->xml_literal, '>'); -+ content_end = strrchr(context->xml_literal, '<'); - - if((content_start != NULL) && (content_end != NULL)) - { ---- raptor-1.4.18/librdfa/triple.c.orig 2008-10-25 14:22:07.000000000 +0200 -+++ raptor-1.4.18/librdfa/triple.c 2008-10-25 14:22:44.000000000 +0200 -@@ -437,7 +437,7 @@ void rdfa_complete_object_literal_triple - current_object_literal = context->content; - type = RDF_TYPE_PLAIN_LITERAL; - } -- else if(index(context->xml_literal, '<') == NULL) -+ else if(strchr(context->xml_literal, '<') == NULL) - { - current_object_literal = context->plain_literal; - type = RDF_TYPE_PLAIN_LITERAL; -@@ -467,7 +467,7 @@ void rdfa_complete_object_literal_triple - // [current element], i.e., not including the element itself, and - // giving it a datatype of rdf:XMLLiteral. - if((current_object_literal == NULL) && -- (index(context->xml_literal, '<') != NULL) && -+ (strchr(context->xml_literal, '<') != NULL) && - ((context->datatype == NULL) || - (strcmp(context->datatype, - "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral") == 0))) diff --git a/patches/rasqal-0.9.16-mingw.patch b/patches/rasqal-0.9.16-mingw.patch deleted file mode 100644 index a6ee70ac1..000000000 --- a/patches/rasqal-0.9.16-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rasqal-0.9.16/src/win32_rasqal_config.h.orig 2008-10-25 23:36:24.000000000 +0200 -+++ rasqal-0.9.16/src/win32_rasqal_config.h 2008-10-25 23:36:17.000000000 +0200 -@@ -85,6 +85,8 @@ extern "C" { - #include - #include - -+#undef DELETE -+ - /* This is a SPARQL token define */ - #ifdef OPTIONAL - #undef OPTIONAL diff --git a/patches/rebase-2.4.2-1.patch b/patches/rebase-2.4.2-1.patch deleted file mode 100644 index ba47d039a..000000000 --- a/patches/rebase-2.4.2-1.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- rebase-2.4.2.1.src/imagehelper/objectfile.cc~ 2003-01-04 13:43:00.000000000 +0100 -+++ rebase-2.4.2.1.src/imagehelper/objectfile.cc 2008-11-07 17:09:12.000000000 +0100 -@@ -29,6 +29,8 @@ - - #ifdef __CYGWIN__ - #include -+#else -+#include - #endif - - #ifdef __CYGWIN__ -@@ -114,7 +116,7 @@ ObjectFile::ObjectFile(char *aFileName, - // create shortcuts - PIMAGE_DOS_HEADER dosheader = (PIMAGE_DOS_HEADER)lpFileBase; - -- ntheader = (PIMAGE_NT_HEADERS) ((char *)dosheader + dosheader->e_lfanew); -+ IMAGE_NT_HEADERS *ntheader = (PIMAGE_NT_HEADERS) ((char *)dosheader + dosheader->e_lfanew); - - if (ntheader->Signature != 0x00004550) - { ---- rebase-2.4.2.1.src/imagehelper/sections.cc~ 2003-02-14 16:01:13.000000000 +0100 -+++ rebase-2.4.2.1.src/imagehelper/sections.cc 2008-11-07 17:14:16.000000000 +0100 -@@ -285,7 +285,7 @@ bool Relocations::check(void) - if (debug) - std::cerr << "debug: checking relocations .... " << std::endl; - -- for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; ((char *)relocp) += relocp->SizeOfBlock) -+ for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; relocp = (PIMAGE_BASE_RELOCATION) ((char*)relocp) + relocp->SizeOfBlock) - { - int NumOfRelocs = (relocp->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof (WORD); - int va = relocp->VirtualAddress; -@@ -328,7 +328,7 @@ bool Relocations::fix(void) - if (debug) - std::cerr << "warning: fixing bad relocations .... "; - -- for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; ((char *)relocp) += relocp->SizeOfBlock) -+ for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; relocp = (PIMAGE_BASE_RELOCATION) ((char*)relocp) + relocp->SizeOfBlock) - { - int NumOfRelocs = (relocp->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof (WORD); - int va = relocp->VirtualAddress; -@@ -363,7 +363,7 @@ bool Relocations::relocate(int differenc - if (!relocs) - return false; - -- for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; ((char *)relocp) += relocp->SizeOfBlock) -+ for (; (char *)&relocp->SizeOfBlock < (char *)relocs + size && relocp->SizeOfBlock != 0; relocp = (PIMAGE_BASE_RELOCATION) ((char*)relocp) + relocp->SizeOfBlock) - { - int NumOfRelocs = (relocp->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof (WORD); - int va = relocp->VirtualAddress; ---- rebase-2.4.2.1.src/imagehelper/Makefile.in~ 2003-01-02 21:07:35.000000000 +0100 -+++ rebase-2.4.2.1.src/imagehelper/Makefile.in 2008-11-07 17:15:12.000000000 +0100 -@@ -34,7 +34,7 @@ all: $(LIB_TARGET) $(TARGETS) - $(LIB_TARGET): $(LIB_TARGET_FILE) - - $(LIB_TARGET_FILE): $(LIB_FILES) -- ar -cru $@ $^ -+ $(AR) -cru $@ $^ - - $(REBASE_TARGET): $(REBASE_FILES) - $(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) diff --git a/patches/redland-1.0.8-mingw.patch b/patches/redland-1.0.8-mingw.patch deleted file mode 100644 index 336364c87..000000000 --- a/patches/redland-1.0.8-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- redland-1.0.8/utils/rdfproc.c.orig 2008-10-27 15:17:58.000000000 +0100 -+++ redland-1.0.8/utils/rdfproc.c 2008-10-27 15:18:07.000000000 +0100 -@@ -28,7 +28,7 @@ - #endif - - #ifdef WIN32 --#include -+#include - #endif - - #include diff --git a/web/applications.html b/web/applications.html index c4dffaf1f..2ac64c3fa 100644 --- a/web/applications.html +++ b/web/applications.html @@ -30,7 +30,6 @@

Installer packages

GNU Denemo
Inkscape
GNU LilyPond
- OpenOffice.org

GUB Build specifications

@@ -52,7 +51,6 @@

GUB Build specifications

gub/specs/cairo.py
gub/specs/cmake.py
gub/specs/coreutils.py
- gub/specs/cppunit.py
gub/specs/curl.py
gub/specs/cygcheck.py
gub/specs/dash.py
@@ -99,7 +97,6 @@

GUB Build specifications

gub/specs/g++.py
gub/specs/grep.py
gub/specs/gsl.py
- gub/specs/gtk_doc.py
gub/specs/gtkmm.py
gub/specs/gtk+.py
gub/specs/gub-utils.py
@@ -107,7 +104,6 @@

GUB Build specifications

gub/specs/guile.py
gub/specs/gzip.py
gub/specs/hello.py
- gub/specs/hunspell.py
gub/specs/icoutils.py
gub/specs/imagemagick.py
gub/specs/__init__.py
@@ -134,10 +130,7 @@

GUB Build specifications

gub/specs/libgphoto2.py
gub/specs/libgtksourceview.py
gub/specs/libiconv.py
- gub/specs/libicu.py
gub/specs/libjpeg.py
- gub/specs/liblpsolve.py
- gub/specs/libpcre.py
gub/specs/libpng.py
gub/specs/libpthread-stubs.py
gub/specs/librestrict.py
@@ -180,7 +173,6 @@

GUB Build specifications

gub/specs/netpbm.py
gub/specs/noweb.py
gub/specs/nsis.py
- gub/specs/openoffice.py
gub/specs/osx-lilypad.py
gub/specs/pangocairo.py
gub/specs/pangomm.py
@@ -202,15 +194,10 @@

GUB Build specifications

gub/specs/python.py
gub/specs/pytt.py
gub/specs/qtopia-core.py
- gub/specs/raptor.py
- gub/specs/rasqal.py
- gub/specs/rebase.py
- gub/specs/redland.py
gub/specs/regex.py
gub/specs/renderproto.py
gub/specs/root-image.py
gub/specs/rsync.py
- gub/specs/saxon-java.py
gub/specs/scons.py
gub/specs/sed.py
gub/specs/sqlite.py
@@ -232,7 +219,6 @@

GUB Build specifications

gub/specs/w32api.py
gub/specs/wget.py
gub/specs/xcb-proto.py
- gub/specs/xerces-c.py
gub/specs/xextproto.py
gub/specs/xineramaproto.py
gub/specs/xproto.py
diff --git a/web/history.html b/web/history.html index d05a4cbd0..aa1a2430a 100644 --- a/web/history.html +++ b/web/history.html @@ -87,8 +87,8 @@

HISTORY

In Novell's Hackweek-iii GUB enters into its Third Life with GUB3, adding cross-platform - build dependencies and patches for an OpenOffice.org - MinGW cross build, including all essential libraries. Later, + build dependencies and patches for an OpenOffice.org + MinGW cross build, including all essential libraries. Later, Inkscape is added, exploring and implementing x.org dependencies. After that, building a windows installer for GNU Denemo diff --git a/web/index.html b/web/index.html index 6747fa3fa..1e57166e3 100644 --- a/web/index.html +++ b/web/index.html @@ -75,7 +75,6 @@

Supported installer packages

GNU Denemo
Inkscape
GNU LilyPond
-OpenOffice.org
with all essential dependencies. Currently, 207 package build specifications are included in GUB. @@ -182,12 +181,6 @@

Examples

this leaves the installer in uploads/ - * Cross build OpenOffice (go-oo.org) for Windows (mingw32) - - make openoffice - - this leaves the Windows installer in uploads/ - * Cross build Denemo (http://denemo.org) for Windows (mingw32) make denemo diff --git a/web/oo.o.html b/web/oo.o.html deleted file mode 100644 index ae8437452..000000000 --- a/web/oo.o.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - GUB -- OpenOffice.org - - -

GUB -- OpenOffice.org

- -

INSTALLING

- -Get GUB -
-    git clone git://github.com/gperciva/gub.git
-or
-    wget https://github.com/gperciva/gub/tarball/master
-
- -In addition to the requirements for GUB, you need -
    -
  • - wine: to run regcomp.exe and lngconvex.exe and possibly other - cross-build ignorant build tools that are compile-time tied - to the build platform -
    • -
- -

Ongoing work

- -The cross building of OpenOffice.org for mingw32 is still a work in -progress (WIP). The build in GUB will succeeed and an installer can -be created, but services.rdb may not build correctly. - -
GSoC 2009
- - -

-Luckily, Jesús Corrius has -accepted -the challenge to make this -mingw32 Go-Oo OpenOffice.org -almost-prove-concept hack into a real port, provide clean solutions -for all the hackweek mess leftovers, make it work as expected, in -other words: actually usable and run on Windows. -

-

-Jesús is working together with Fridrich Strba to clean up and update -some of -the cross -build and mingw32 patches, while implementing and porting the -missing bits of the mingw32 cross build -to openSUSE's osc build -system. -

-

-When -jcorrius - announces it works, his fixes will be incorporated in GUB to - provide turnkey OpenOffice.org Windows binaries and installers. -

- -

Build everything

- -
-  make openoffice
-
- -this produces a windows installer in - -
-  uploads/openoffice-COMMITTISH.mingw.exe
-
- -

More examples

-
-  * Cross build OpenOffice for Windows:
-
-      bin/gub mingw::openoffice
-
-  * Make the nsis installer
-
-      bin/gib mingw::openoffice
-
-  * Optional: Prepare build environment
-
-      make -f lilypond.make bootstrap
-
- -The package -
-  bin/gub tools::openoffice
-
- -is a work in progress and attempts to build a tiny fraction of -openoffice for the build tools. - -

See also

- -https://github.com/gperciva/gub/tree/master/patches
-http://lilypond.org/blog/janneke/gub3-ooo-mingw-cross-build
- - - - -