------------------------------------------------------------ revno: 2023 committer: Rene Engelhard <[email protected]> branch nick: unstable timestamp: Mon 2010-06-14 09:22:41 +0200 message: only try to register one component at a time added: patches/installer-globals-max-1-regcomp.diff modified: patches/series
=== added file 'patches/installer-globals-max-1-regcomp.diff' --- a/patches/installer-globals-max-1-regcomp.diff 1970-01-01 00:00:00 +0000 +++ b/patches/installer-globals-max-1-regcomp.diff 2010-06-14 07:22:41 +0000 @@ -0,0 +1,32 @@ +--- /dev/null 2010-05-24 16:58:35.275686347 +0200 ++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200 +@@ -0,0 +1,14 @@ ++diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm ++--- solenv/bin/modules/installer/globals.pm +++++ solenv/bin/modules/installer/globals.pm ++@@ -404,8 +404,8 @@ ++ %usedtreeconditions = (); ++ %moduledestination = (); ++ ++- $unomaxservices = 1800; # regcomp -c argument length ++- $javamaxservices = 15; +++ $unomaxservices = 1; # regcomp -c argument length +++ $javamaxservices = 1; ++ ++ $one_cab_file = 0; ++ $fix_number_of_cab_files = 1; +diff --git a/patches/dev300/apply b/patches/dev300/apply +index 3a732ae..5f1c32a 100644 +--- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply ++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply +@@ -307,6 +307,10 @@ gcc-HelpLinker.diff + # configmgr paths are not yet existing then + speed-sal-fewer-lstats.diff, i#89730, jholesov + ++# set unomaxservices and javamaxservices to 1 ++[ TemporaryHacks and DebianOnly ] ++installer-globals-max-1-regcomp.diff ++ + [ OOo4KidsPatches ] + + # TODO: updated icons missing, updated sdf files missing
=== modified file 'patches/series' --- a/patches/series 2010-06-10 22:27:36 +0000 +++ b/patches/series 2010-06-14 07:22:41 +0000 @@ -5,3 +5,4 @@ powerpc-fixes.diff fix-smoketest-without-java.diff fix-nodep-check.diff +installer-globals-max-1-regcomp.diff
