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

[szalaik svn gnome org]

Author: szalaik
Date: Thu Aug 14 16:46:08 2008
New Revision: 13576
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13576&view=rev

Log:
2008-08-14  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/premium_macro_script.diff
	* patches/dev300/premium_macro_dialog.diff
	* patches/dev300/premium-splitted-packages.diff
	* patches/dev300/extras_configure.diff:
	Update patches to OOO300-m2.

	* patches/dev300/not_requires_core08.diff:
	Remove not_requires_core08.diff patch.

	* patches/dev300/apply




Removed:
   trunk/patches/dev300/not_requires_core08.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/extras_configure.diff
   trunk/patches/dev300/premium-splitted-packages.diff
   trunk/patches/dev300/premium_macro_dialog.diff
   trunk/patches/dev300/premium_macro_script.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 14 16:46:08 2008
@@ -2272,9 +2272,6 @@
 # Using prebuilt Writing Aids for all platforms in OxygenOffice Professional
 win32-prebuilt-writingaids-zip.diff
 win32-prebuilt-writingaids-zip-scp2.diff
-# Does not reqire core08 for branding
-not_requires_core08.diff
-
 
 [ Win32Only ]
 mozilla-source-1.7.5.patch.diff, i#84961, tml

Modified: trunk/patches/dev300/extras_configure.diff
==============================================================================
--- trunk/patches/dev300/extras_configure.diff	(original)
+++ trunk/patches/dev300/extras_configure.diff	Thu Aug 14 16:46:08 2008
@@ -1,9 +1,9 @@
 --- config_office/configure.in.org	2007-11-17 16:00:31.000000000 +0100
 +++ config_office/configure.in	2007-12-24 13:26:16.000000000 +0100
 @@ -681,6 +681,26 @@
+ [  --with-alloc            Define which allocator to build with
  			                 (choices are oo, system, tcmalloc)
  ],,)
- 
 +AC_ARG_WITH(extra-gallery,
 +[  --with-extra-gallery    Add extra gallery content of OxygenOffice Professional.
 +],,)
@@ -24,9 +24,9 @@
 +[  --with-extra-accessory       Add extra accessory content of OxygenOffice Professional.
 +],,)
 +
- BUILD_TYPE="OOo EXT"
- 
- dnl ===================================================================
+ AC_ARG_ENABLE(verbose,
+ [  --enable-verbose        Increase build verbosity.
+   --disable-verbose       Decrease build verbosity.
 @@ -5706,6 +5726,69 @@
  AC_SUBST(ENABLE_STATIC_GTK)
  

Modified: trunk/patches/dev300/premium-splitted-packages.diff
==============================================================================
--- trunk/patches/dev300/premium-splitted-packages.diff	(original)
+++ trunk/patches/dev300/premium-splitted-packages.diff	Thu Aug 14 16:46:08 2008
@@ -1,9 +1,9 @@
 --- setup_native/source/packinfo/packinfo_office.txt.orig	2008-03-25 00:12:39.000000000 +0100
 +++ setup_native/source/packinfo/packinfo_office.txt	2008-03-23 15:00:51.000000000 +0100
 @@ -457,3 +473,59 @@
- description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
- destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+ packageversion = "%PACKAGEVERSION"
  End
+ 
 +
 +
 +# Package definitions for OxygenOffice Professional

Modified: trunk/patches/dev300/premium_macro_dialog.diff
==============================================================================
--- trunk/patches/dev300/premium_macro_dialog.diff	(original)
+++ trunk/patches/dev300/premium_macro_dialog.diff	Thu Aug 14 16:46:08 2008
@@ -1,9 +1,9 @@
---- wizards/source/config/dialog.xlc.orig	2006-05-17 09:41:42.000000000 +0200
-+++ wizards/source/config/dialog.xlc	2006-07-02 13:52:46.062500000 +0200
-@@ -12,4 +12,6 @@
-  <library:library library:name="Euro" library:link="true"/>
-  <library:library library:name="Depot" library:link="true"/>
-  <library:library library:name="ScriptBindingLibrary" library:link="true"/>
-+ <library:library library:name="Premium" library:link="true"/>
-+ <library:library library:name="OOoWikipedia" library:link="true"/>
+--- wizards/source/configshare/dialog.xlc.orig	2006-05-17 09:41:42.000000000 +0200
++++ wizards/source/configshare/dialog.xlc	2006-07-02 13:52:46.062500000 +0200
+@@ -10,4 +10,6 @@
+  <library:library library:name="Euro" xlink:href="$(INST)/share/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+  <library:library library:name="Depot" xlink:href="$(INST)/share/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+  <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/share/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
++ <library:library library:name="Premium" xlink:href="$(INST)/share/basic/Premium/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
++ <library:library library:name="OOoWikipedia" xlink:href="$(INST)/share/basic/OOoWikipedia/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
  </library:libraries>

Modified: trunk/patches/dev300/premium_macro_script.diff
==============================================================================
--- trunk/patches/dev300/premium_macro_script.diff	(original)
+++ trunk/patches/dev300/premium_macro_script.diff	Thu Aug 14 16:46:08 2008
@@ -1,9 +1,9 @@
---- wizards/source/config/script.xlc.orig	2006-05-17 09:41:42.000000000 +0200
-+++ wizards/source/config/script.xlc	2006-07-02 13:52:33.687500000 +0200
+--- wizards/source/configshare/script.xlc.orig	2006-05-17 09:41:42.000000000 +0200
++++ wizards/source/configshare/script.xlc	2006-07-02 13:52:33.687500000 +0200
 @@ -12,4 +12,6 @@
-  <library:library library:name="Euro" library:link="true"/>
-  <library:library library:name="Depot" library:link="true"/>
-  <library:library library:name="ScriptBindingLibrary" library:link="true"/>
-+ <library:library library:name="Premium" library:link="true"/>
-+ <library:library library:name="OOoWikipedia" library:link="true"/>
+  <library:library library:name="Euro" xlink:href="$(INST)/share/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+  <library:library library:name="Depot" xlink:href="$(INST)/share/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+  <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/share/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
++ <library:library library:name="Premium" xlink:href="$(INST)/share/basic/Premium/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
++ <library:library library:name="OOoWikipedia" xlink:href="$(INST)/share/basic/OOoWikipedia/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
  </library:libraries>