ooo-build r13512 - in trunk: . patches/dev300 scratch/split

[michael svn gnome org]

Author: michael
Date: Mon Aug 11 13:59:01 2008
New Revision: 13512
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13512&view=rev

Log:
latest / greatest for Petr ...


Added:
   trunk/patches/dev300/piece-sc.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-reportdesign.diff
   trunk/patches/dev300/piece-scp2.diff
   trunk/patches/dev300/piece-setup_native.diff
   trunk/scratch/split/ooo3_impress.spec

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 11 13:59:01 2008
@@ -2429,6 +2429,7 @@
 piece-setup_native.diff
 piece-forms.diff
 piece-reportdesign.diff
+piece-sc.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Modified: trunk/patches/dev300/piece-reportdesign.diff
==============================================================================
--- trunk/patches/dev300/piece-reportdesign.diff	(original)
+++ trunk/patches/dev300/piece-reportdesign.diff	Mon Aug 11 13:59:01 2008
@@ -1,11 +1,17 @@
---- /opt/OpenOffice/dev300-m25/reportdesign/util/makefile.pmk	2008-06-06 09:05:19.000000000 +0100
-+++ /usr/src/packages/BUILD/dev300-m25-base/reportdesign/util/makefile.pmk	2008-07-25 19:21:48.000000000 +0100
-@@ -31,7 +31,7 @@
+--- reportdesign/util/makefile.pmk	2008-08-11 14:49:42.000000000 +0100
++++ reportdesign/util/makefile.pmk	2008-08-11 14:49:42.000000000 +0100
+@@ -29,10 +29,10 @@
+ #
+ #*************************************************************************
  
- XSLDIR=$(SOLARXMLDIR)$/processing
- XCSROOT=$(SOLARXMLDIR)
+-XSLDIR=$(SOLARXMLDIR)$/processing
+-XCSROOT=$(SOLARXMLDIR)
 -ABSXCSROOT=$(SOLARXMLDIR)
-+ABSXCSROOT=$(SPLITINSTALLDIR)$/..$/share
- DTDDIR=$(SOLARXMLDIR)
+-DTDDIR=$(SOLARXMLDIR)
++XCSROOT=$(SPLITINSTALLDIR)$/../share
++XSLDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)$/processing
++ABSXCSROOT=$(XCSROOT)
++DTDDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)
  PROCESSOUT=$(MISC)$/$(EXTNAME)
  PROCESSORDIR=$(SOLARBINDIR)
+ 

Added: trunk/patches/dev300/piece-sc.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-sc.diff	Mon Aug 11 13:59:01 2008
@@ -0,0 +1,12 @@
+--- sc/source/ui/vba/makefile.mk
++++ sc/source/ui/vba/makefile.mk
+@@ -143,7 +143,7 @@
+ 
+ $(SLOFILES) : $(MISC)$/$(TARGET).don
+ 
+-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++$(MISC)$/$(TARGET).don : $(SPLITINSTALLDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SPLITINSTALLDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+         echo $@
+ 

Modified: trunk/patches/dev300/piece-scp2.diff
==============================================================================
--- trunk/patches/dev300/piece-scp2.diff	(original)
+++ trunk/patches/dev300/piece-scp2.diff	Mon Aug 11 13:59:01 2008
@@ -10,12 +10,16 @@
 
 --- scp2/source/ooo/makefile.mk
 +++ scp2/source/ooo/makefile.mk
-@@ -41,7 +41,6 @@
+@@ -41,6 +41,10 @@
  # --- Settings -----------------------------------------------------
  
  .INCLUDE :  settings.mk
 -.INCLUDE :  i18npool/version.mk
- 
++ISOLANG_TARGET=i18nisolang
++ISOLANG_MAJOR=1
++ISOLANG_MINOR=0
++ISOLANG_MICRO=0
++ISOLANG_CPP=0
  .IF "$(ENABLE_CRASHDUMP)"!=""
  SCPDEFS+=-DENABLE_CRASHDUMP
 @@ -164,7 +164,17 @@

Modified: trunk/patches/dev300/piece-setup_native.diff
==============================================================================
--- trunk/patches/dev300/piece-setup_native.diff	(original)
+++ trunk/patches/dev300/piece-setup_native.diff	Mon Aug 11 13:59:01 2008
@@ -1,5 +1,5 @@
---- setup_native/registry/data/org/openoffice/Office//makefile.mk	2008-07-25 02:38:34.000000000 +0100
-+++ setup_native/registry/data/org/openoffice/Office//makefile.mk	2008-07-25 02:38:34.000000000 +0100
+--- setup_native/registry/data/org/openoffice/Office/makefile.mk	2008-07-25 02:38:34.000000000 +0100
++++ setup_native/registry/data/org/openoffice/Office/makefile.mk	2008-07-25 02:38:34.000000000 +0100
 @@ -34,10 +34,10 @@
  TARGET=data_stclient
  PACKAGE=org.openoffice.Office

Modified: trunk/scratch/split/ooo3_impress.spec
==============================================================================
--- trunk/scratch/split/ooo3_impress.spec	(original)
+++ trunk/scratch/split/ooo3_impress.spec	Mon Aug 11 13:59:01 2008
@@ -52,7 +52,7 @@
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
 export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
-OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install