SOURCES: openoffice.org-build-pld-splash.diff (NEW), openoffice.or...

[adamg]

Author: adamg                        Date: Fri Mar 17 08:00:09 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new, fixes build

---- Files affected:
SOURCES:
   openoffice.org-build-pld-splash.diff (NONE -> 1.1)  (NEW), openoffice.org-build-no-java.diff (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/openoffice.org-build-pld-splash.diff
diff -u /dev/null SOURCES/openoffice.org-build-pld-splash.diff:1.1
--- /dev/null	Fri Mar 17 09:00:09 2006
+++ SOURCES/openoffice.org-build-pld-splash.diff	Fri Mar 17 09:00:04 2006
@@ -0,0 +1,43 @@
+Index: svx/prj/d.lst
+===================================================================
+RCS file: /cvs/graphics/svx/prj/d.lst,v
+retrieving revision 1.108
+diff -u -r1.108 d.lst
+--- svx/prj/d.lst	9 Dec 2004 16:36:45 -0000	1.108
++++ svx/prj/d.lst	16 Dec 2004 12:43:47 -0000
+@@ -55,7 +55,7 @@
+ ..\res\cjkintro.bmp %COMMON_DEST%\pck%_EXT%\starsuite_bitmap\intro.bmp
+ ..\res\ofaabout.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\about.bmp
+ ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp
+-..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
++..\res\openintro_pld.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+ ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
+ 
+ mkdir: %_DEST%\inc%_EXT%\svx
+Index: svx/source/intro/ooo.src
+===================================================================
+RCS file: /cvs/graphics/svx/source/intro/ooo.src,v
+retrieving revision 1.11
+diff -u -r1.11 ooo.src
+--- svx/source/intro/ooo.src	7 Jan 2005 09:49:30 -0000	1.11
++++ svx/source/intro/ooo.src	1 Feb 2005 16:48:49 -0000
+@@ -56,7 +56,7 @@
+ 
+ Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
+ {
+-	File = "openabout.bmp" ;
++	File = "openabout_pld.bmp" ;
+ };
+ 
+ String RID_APPTITLE
+--- svx/source/intro/makefile.mk	2005-12-20 15:28:19.000000000 +0100
++++ svx/source/intro/makefile.mk	2005-12-20 15:28:35.000000000 +0100
+@@ -46,7 +46,7 @@ TARGET=intro
+ RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES
+ 
+ # setting the compiled by $user$ string in the About box
+-OOO_VENDOR*=$(USER)$(USERNAME)
++OOO_VENDOR*=PLD Linux Team
+ RSCDEFS+=-DOOO_VENDOR="$(OOO_VENDOR)"
+ 
+ # --- Allgemein -----------------------------------------------------------

================================================================
Index: SOURCES/openoffice.org-build-no-java.diff
diff -u /dev/null SOURCES/openoffice.org-build-no-java.diff:1.1
--- /dev/null	Fri Mar 17 09:00:09 2006
+++ SOURCES/openoffice.org-build-no-java.diff	Fri Mar 17 09:00:04 2006
@@ -0,0 +1,66 @@
+--- solenv/inc/unxlngppc.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngppc.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngppc4.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngppc4.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi4.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngi4.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi6.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngi6.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngx6.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngx6.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngs.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngs.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
================================================================