GNOME.org
 

ooo-build r14113 - in trunk: . patches/dev300

Author: pmladek
Date: Fri Sep 26 15:44:30 2008
New Revision: 14113
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14113&view=rev

Log:
2008-09-26  Petr Mladek  <pmladek suse cz>

	* patches/dev300/piece-swext.diff, patches/dev300/apply: fix split
	  build



Added:
   trunk/patches/dev300/piece-swext.diff
Modified:
   trunk/NEWS
   trunk/patches/dev300/apply

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Sep 26 15:44:30 2008
@@ -4,49 +4,52 @@
 	+ support ooo300-m7 (3.0rc2) [Rene, Petr]
 	+ new friendly tree in basic macro choose dialog [Fong]
     + bug fixes:
+	+ more on the layout stuff [Jan]
 	+ more on the external range names [Kohei]
-	+ returning from presenter view crasher (bnc#425072, i#94007) [Thorsten]
-	+ nasty X errors on multi-head setups (i#93986) [Thorsten]
-	+ various fixes of the 3D transitions [Radek]
-	+ continuous numbering in Impress [Thorsten]
 	+ Excel 95 import filter crasher (bnc#427434) [Kohei]
-	+ cell change records export to Excel (bnc#416045) [Kohei]
 	+ chart's data range re-calculation (bnc#425617) [Kohei]
+	+ cell change records export to Excel (bnc#416045) [Kohei]
+	+ DataPilot inserts an extra empty row (bnc#252037) [Kohei]
+	+ DataPilot Drill-down fixes (bnc#403151, i#93918, i#93998) [Kohei] 
 	+ multiline formula reference and ODF export optimization [Kohei,
 	  William]
+	+ missing data points in charts (bnc#427545) [Kohei]
+	+ export of the radio button group-name attributes [Jon]
+	+ returning from presenter view crasher (bnc#425072, i#94007) [Thorsten]
+	+ nasty X errors on multi-head setups (i#93986) [Thorsten]
+	+ various fixes of the 3D transitions [Radek]
+	+ continuous numbering in Impress [Thorsten]
 	+ check for Cairo canvas [Thorsten]
-	+ accelerators for OK/Cancel buttons [Kohei]
-	+ crash on Vista's native file picker [Kohei]
-	+ DataPilot Drill-down fixes (bnc#403151, i#93918, i#93998) [Kohei] 
-	+ DataPilot inserts an extra empty row (bnc#252037) [Kohei]
 	+ field stuff cleanup (bnc#426348) [Florian]
+	+ Writer doc margin text rotates in Word (bnc#404221) [Florian]
+	+ migrate user settings from ~/.ooo-2.0 to ~/.ooo3 (bnc#421070) [Kendy]
 	+ KDE filepicker to work again (bnc#427336) [Kendy]
+	+ crash on Vista's native file picker [Kohei]
+	+ accelerators for OK/Cancel buttons [Kohei]
 	+ unxsplash bitmap reading [Kendy]
-	+ more on the layout stuff [Jan]
-	+ missing data points in charts (bnc#427545) [Kohei]
-	+ migrate user settings from ~/.ooo-2.0 to ~/.ooo3 (bnc#421070) [Kendy]
     + VBA bits:
 	+ more on the user forms and event handling [Noel]
-	+ various fixes [Fong]
-	+ resetting Rowsource fails (bnc#426415) [Noel]
 	+ NOT test and state of a default property (bnc#426416) [Noel]
+	+ resetting Rowsource fails (bnc#426415) [Noel]
 	+ disable regex processing for VBA mode [Noel]
-	+ variant + string [Fong]
 	+ a1 parser to handle spaces [Noel]
+	+ variant + string [Fong]
+	+ various fixes [Fong]
+    + Win32 bits:
+	+ various installer fixes [Tor]
     + build bits:
-	+ disable all extensions by default; are in extra source tarball [Rene]
+	+ updated scsolver to the snapshot 2008-09-25 [Kohei]
 	+ updated extras to version 3; new autotext stuff [KAMI]
-	+ build on MAC [Thorsten]
-	+ GO-OO universal build [Fridrich]
-	+ mono package file list [Petr]
-	+ new --with-sun-templates option [KAMI]
-	+ new --with-extension-integration option [KAMI]
+	+ disable all extensions by default; are in extra source tarball [Rene]
 	+ extra GSI files transformed into the .po files [KAMI]
+	+ new --with-extension-integration option [KAMI]
+	+ new --with-sun-templates option [KAMI]
 	+ build dependencies [Rene, Petr]
+	+ mono package file list [Petr]
 	+ build without java [Rene]
-    + Win32 bits:
-	+ various installer fixes [Tor]
-    + updates Gentoo, OxygenOffice bits [Andreas, KAMI]
+	+ build on MAC [Thorsten]
+	+ GO-OO universal build [Fridrich]
+    + updates Gentoo, OxygenOffice, Novell bits [Andreas, KAMI, Petr]
     + experimental:
 	+ more on the build split [Petr]
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep 26 15:44:30 2008
@@ -2606,6 +2606,7 @@
 piece-scripting.diff
 piece-helpcontent2.diff
 piece-sdext.diff
+piece-swext.diff
 piece-writerfilter.diff
 piece-ridljar.diff
 piece-offapi.diff

Added: trunk/patches/dev300/piece-swext.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-swext.diff	Fri Sep 26 15:44:30 2008
@@ -0,0 +1,53 @@
+--- swext/makefile.pmk.old	2008-04-11 12:04:48.000000000 +0200
++++ swext/makefile.pmk	2008-09-26 15:45:44.000000000 +0200
+@@ -29,10 +29,10 @@
+ #
+ #*************************************************************************
+ 
+-XSLDIR=$(SOLARXMLDIR)$/processing
+-XCSROOT=$(SOLARXMLDIR)
+-ABSXCSROOT=$(SOLARXMLDIR)
+-DTDDIR=$(SOLARXMLDIR)
++XSLDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)$/processing
++XCSROOT=$(SPLITINSTALLDIR)$/../share
++ABSXCSROOT=$(XCSROOT)
++DTDDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)
+ PROCESSOUT=$(MISC)$/$(CUSTID)
+ PROCESSORDIR=$(SOLARBINDIR)
+ 
+--- swext/mediawiki/makefile.mk.old	2008-04-11 12:05:18.000000000 +0200
++++ swext/mediawiki/makefile.mk	2008-09-26 15:46:35.000000000 +0200
+@@ -37,10 +37,10 @@ TARGET=mediawiki
+ .INCLUDE : ant.mk
+ 
+ .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
+-COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.3.jar 
+-COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar
+-COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
+-COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
++COMMONS_CODEC_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-codec-1.3.jar 
++COMMONS_LANG_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-lang-2.3.jar
++COMMONS_HTTPCLIENT_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-httpclient-3.1.jar
++COMMONS_LOGGING_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar
+ .ENDIF
+ 
+ ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) -Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR)
+--- swext/mediawiki/build.xml.old	2008-09-26 15:42:00.000000000 +0200
++++ swext/mediawiki/build.xml	2008-09-26 15:59:01.000000000 +0200
+@@ -61,11 +61,11 @@
+         
+         <!-- build classpath -->
+         <path id="classpath">        
+-            <pathelement location="${officeclasses}/juh.jar"/>
+-            <pathelement location="${officeclasses}/jurt.jar"/>
+-            <pathelement location="${officeclasses}/jut.jar"/>
+-            <pathelement location="${officeclasses}/ridl.jar"/>
+-            <pathelement location="${officeclasses}/unoil.jar"/>            
++            <pathelement location="${split.ure}/share/java/juh.jar"/>
++            <pathelement location="${split.ure}/share/java/jurt.jar"/>
++            <pathelement location="${split.install}/classes/jut.jar"/>
++            <pathelement location="${split.ure}/share/java/ridl.jar"/>
++            <pathelement location="${split.install}/classes/unoil.jar"/>            
+             <!-- 3rd party libs -->
+             <pathelement location="${commons-codec-jar}"/>
+             <pathelement location="${commons-httpclient-jar}"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]