[Libreoffice-commits] .: 4 commits - autogen.sh doc/splash.txt patches/dev300 README

Fri Oct 8 08:21:26 PDT 2010

README               |    6 +++-
 autogen.sh           |    2 -
 doc/splash.txt       |   72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 patches/dev300/apply |    5 ---
 4 files changed, 78 insertions(+), 7 deletions(-)

New commits:
commit 968dce1750281560e8cb99b72f0e37b340e20d67
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Oct 8 16:18:04 2010 +0100

    update rough notes.

diff --git a/doc/splash.txt b/doc/splash.txt
index 4e71bed..d63f7aa 100644
--- a/doc/splash.txt
+++ b/doc/splash.txt
@@ -10,3 +10,75 @@ Changes / complexity in splash branding
 
 * For now - just hack d.lst to deliver our splash
     + this also grotesquely dithered - by slow loading code.
+
+
+---- per locale splash ----
+
+* we should add some locale foo to that [!]
+
+* We need a per-locale splash:
+	+ BROffice ... [!] fun.
+	+ need two splashes installed [ everywhere ]
+		+ what fun ! :-)
+
++ BROffice splash ... [!]
+	+ [fun!]
+	+ locale-based splashing ...
+
+	* what loads the splash ?
+		+ and how - also hack Kendy's new splash app :-)
+
+* Brazilian locale is pt_br ?
+
+
+ooo_custom_images:
+	./broffice/introabout/intro.png
+	./nologo_broffice/introabout/intro.png
+
+	./dev/introabout/intro.png
+	./dev_broffice/introabout/intro.png
+
+
+
+* we no longer need the 'nologo' variants ...
+        git rm ./nologo/introabout/intro.png
+        git rm ./dev_nologo_broffice/introabout/intro.png
+        git rm ./dev_nologo/introabout/intro.png
+
+
+	default_images/introabout/ ?
+
+instsetoo_native/prj/build.lst:oon instsetoo_native :: l10n postprocess packimages testautomation ooo_custom_images NULL
+        + clean it up !
+
+	* checkout desktop/zipintro [!]
+
+	* we no longer need the 'deliver' in there ...
+		* creates an images_brand_$(TARGET)
+		+ no need for that [!] :-)
+
+	+ no 'deliver' foo so ...
+
+	* we want to include the intro.png as a file ...
+
+
+	* FIXME: we need the framework/res stuff to work too [!]
+		* SRC1FILES is the build rule ...
+		+ framework/source/services/fwk_
+
+	* FIXME - we should just grab those images from images.zip
+	  explicitly & manually ... - rather than fooling around ;-)
+
+Making:    fwk_services.srs
+: &&     LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/lib  /opt/OpenOffice/loffice/solver/330/unxlngi6.pro/bin/rsc -presponse -verbose @/tmp/mk9NVUTU
+Preprocessor commandline:  -I. -I. -I../../unxlngi6.pro/inc/fwk_services -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxlngi6.pro/inc -I. -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/external -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc -I/opt/OpenOffice/loffice/solenv/unxlngi6/inc -I/opt/OpenOffice/loffice/solenv/inc -I/opt/OpenOffice/loffice/res -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solenv/inc/Xp31 -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -I/usr/lib/jvm/java/include/native_threads/include -I/usr/include -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/offuh -I. -I../../res -I. -DUNX -DVCL -DGCC -DC341 -DSOLAR_JAVA -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DUPDVER="330m9(Build:1)" fwk_services.src /tmp/KyDZtd
+Preprocessor startline:  /opt/OpenOffice/loffice/solver/330/unxlngi6.pro/bin/rscpp @/tmp/YzOCGg
+Rsc2 commandline: /opt/OpenOffice/loffice/solver/330/unxlngi6.pro/bin/rsc2 @/tmp/W5Sqdk
+rm -f ../../unxlngi6.pro/srs/fwk_services.srs
+mv ../../unxlngi6.pro/srs/fwk_services.srs.unxlngi6.pro ../../unxlngi6.pro/srs/fwk_services.srs
+rm -f ../../unxlngi6.pro/srs/fwk_services.srs.unxlngi6.pro
+Compiling: framework/source/services/fwk_services.src
+: &&     LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/lib /usr/bin/perl /opt/OpenOffice/loffice/solenv/bin/mhids.pl fwk_services.src ../../unxlngi6.pro/srs framework -DLINUX -DUNX -DVCL -DGCC -DC341 -DINTEL -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DHAVE_GCC_VISIBILITY_FEATURE -DX86 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/c++/4.5 -DSUPD=330 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGSTREAMER -DCUI -DSOLAR_JAVA   -I. -I../../unxlngi6.pro/inc/fwk_services -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxlngi6.pro/inc -I. -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/external -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc -I/opt/OpenOffice/loffice/solenv/unxlngi6/inc -I/opt/OpenOffice/loffice/solenv/inc -I/opt/OpenOffice/loffice/res -I/opt/OpenOffice/loff
 ice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solenv/inc/Xp31 -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -I/usr/lib/jvm/java/include/native_threads/include -I/usr/include  -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/offuh -I. -I../../res -I.
+Making:    fwk_services_srs.hid
+cat /tmp/mkKnhkL3 | xargs -s 1000 cat > ../../unxlngi6.pro/srs/fwk_services_srs.hid.unxlngi6.pro.tmp
+Making:    all_fwk_services.dpslo
commit ddd1c714bdcae4d43fa4815c2265a9ba0d0597e1
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Oct 8 16:16:50 2010 +0100

    enable maintainer mode

diff --git a/autogen.sh b/autogen.sh
index 7f5eda7..af519e9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,7 +30,7 @@ if test "x$NOCONFIGURE" = "x"; then
     if test -n "$old_args" ; then
         eval `echo ./configure $old_args`
     else
-        ./configure "$@"
+        ./configure --enable-maintainer-mode "$@"
     fi
 else
     echo "Skipping configure process."
commit 8cfd63466709670d58417f5d96dacfa865a6dcc0
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Oct 7 16:49:21 2010 +0100

    remove duff patches

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0c1ce5f..132123a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -173,11 +173,6 @@ cws-koheichart02-sc.diff,     kohei
 cws-koheichart02-xmloff.diff, kohei
 
 [ LinuxOnly ]
-# Don't stat tons of config files we don't need to read on startup
-# speed-configmgr.diff, i#56783, michael - CHECK ME !
-# Don't spawn pointless processes to work out things we know at compile time
-# speed-soffice-sh.diff, i#106891, michael
-
 # add accelerator to the OK and Cancel buttons.
 ok-cancel-btn-add-accel.diff, kohei
 
commit 23442e62e687bfa1c9726cdf8ca2b50e6b3594b7
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Oct 7 11:44:50 2010 +0100

    add how-to-update

diff --git a/README b/README
index d84e5eb..b263eef 100644
--- a/README
+++ b/README
@@ -9,7 +9,11 @@ downloaded from a source archive, or git (if configured with
 and have space to have a copy or two. The latest version of this code
 can be obtained by anonymous Git with this command:
 
-	git clone git://anongit.freedesktop.org/git/libreoffice/build
+	$ git clone git://anongit.freedesktop.org/git/libreoffice/build
+
+	To update the git repositories to the latest versions run:
+
+	$ git pull -r ; bin/g pull -r
 
 	Packaged releases can be found from:
 		http://libreoffice.org/download/
