ooo-build r14172 - in trunk: . distro-configs patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Wed Oct  1 14:28:22 2008
New Revision: 14172
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14172&view=rev

Log:
    Merge from ooo-build-3-0:

    * patches/dev300/apply:
    * patches/dev300/instset-prefer-langpacks.diff:
    Build full instset only for $(defaultlangiso) (en_US normally),
    use langpacks for the remainder
    * patches/dev300/solenv-installer-unopkg-call.diff: call unopkg
    during instset generation, such that spawned java does not require
    interactive session (causes weird hangs during instset generation
    otherwise).
    * distro-configs/GoOoMacOSX.conf.in: cleaned up



Added:
   trunk/patches/dev300/instset-prefer-langpacks.diff
   trunk/patches/dev300/solenv-installer-unopkg-call.diff
Modified:
   trunk/ChangeLog
   trunk/distro-configs/GoOoMacOSX.conf.in
   trunk/patches/dev300/apply

Modified: trunk/distro-configs/GoOoMacOSX.conf.in
==============================================================================
--- trunk/distro-configs/GoOoMacOSX.conf.in	(original)
+++ trunk/distro-configs/GoOoMacOSX.conf.in	Wed Oct  1 14:28:22 2008
@@ -1,8 +1,9 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_go-oo.bmp\"
 --with-about-bitmaps=\"$SRCDIR/openabout_go-oo.bmp\"
 --with-vendor=\"Novell, Inc.\"
-
---with-intro-bitmaps=\"$SRCDIR/openintro_go-oo.bmp\"
---with-about-bitmaps=\"$SRCDIR/openabout_go-oo.bmp\"
---with-vendor=\"Novell, Inc.\"
---disable-gtk
+--enable-minimizer 
+--enable-presenter-console 
+--enable-pdfimport 
+--enable-wiki-publisher 
+--enable-report-builder 
+--with-extension-integration

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Oct  1 14:28:22 2008
@@ -2677,6 +2677,10 @@
 vcl-fix-screen-number.diff, n#426521, i#93986, thorsten
 vcl-fix-gtk-fullscreen-crash.diff, i#93805, dtardon
 timely-canvas-disposing.diff, i#94007, thorsten
+# only build full package for en_US, use langpacks for the rest
+instset-prefer-langpacks.diff, thorsten
+# call unopkg such that java does not require interactive session
+solenv-installer-unopkg-call.diff, thorsten
 
 [ ImpressFontSize ]
 [ Fixes <= dev300-m30 <= ooo300-m3 ]

Added: trunk/patches/dev300/instset-prefer-langpacks.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/instset-prefer-langpacks.diff	Wed Oct  1 14:28:22 2008
@@ -0,0 +1,14 @@
+--- instsetoo_native/util/makefile.mk	30 Jul 2008 13:30:16 -0000	1.90.8.1
++++ instsetoo_native/util/makefile.mk	29 Sep 2008 12:24:56 -0000
+@@ -102,9 +102,9 @@ ALLTAR : $(LOCALPYFILES)
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+-ALLTAR : openoffice
++ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack 
+ .ELSE
+-ALLTAR : openoffice sdkoo_en-US ure_en-US
++ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
+ .ENDIF
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack

Added: trunk/patches/dev300/solenv-installer-unopkg-call.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/solenv-installer-unopkg-call.diff	Wed Oct  1 14:28:22 2008
@@ -0,0 +1,11 @@
+--- solenv/bin/modules/installer/simplepackage.pm	11 Jul 2008 14:43:10 -0000	1.19
++++ solenv/bin/modules/installer/simplepackage.pm	29 Sep 2008 12:25:30 -0000
+@@ -129,7 +129,7 @@ sub register_extensions
+                 $localtemppath =~ s/\\/\//g;
+                 $localtemppath = "/".$localtemppath;
+ 			}
+-			my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
++			my $systemcall = "JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 " . $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+ 
+ 			print "... $systemcall ...\n";
+