ooo-build r12310 - in trunk: . patches/dev300 patches/src680

From: pmladek svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12310 - in trunk: . patches/dev300 patches/src680
Date: Wed, 23 Apr 2008 19:56:36 +0100 (BST)
Author: pmladek
Date: Wed Apr 23 18:56:35 2008
New Revision: 12310
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12310&view=rev

Log:
2008-04-23  Petr Mladek  <pmladek suse cz>

	* patches/src680/split-binfilter-filter.diff:
	* patches/src680/split-binfilter-scp2.diff:
	* patches/src680/split-binfilter-setup_native.diff:
	* patches/dev300/apply: port for dev300

	* patches/dev300/split-binfilter-scp2.diff: bin redundant copy



Removed:
   trunk/patches/dev300/split-binfilter-scp2.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/src680/split-binfilter-filter.diff
   trunk/patches/src680/split-binfilter-scp2.diff
   trunk/patches/src680/split-binfilter-setup_native.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Apr 23 18:56:35 2008
@@ -2144,11 +2144,10 @@
 SectionOwner => pmladek
 
 # FIXME: apply at the end because there are some conflicts
-
 # split binfilter from core
-#FIXME dev300: split-binfilter-filter.diff, i#79800
-#FIXME dev300: split-binfilter-setup_native.diff, i#79800
-#FIXME dev300: split-binfilter-scp2.diff, i#79800
+split-binfilter-filter.diff, i#79800
+split-binfilter-setup_native.diff, i#79800
+split-binfilter-scp2.diff, i#79800
 
 
 [ Win32Only ]

Modified: trunk/patches/src680/split-binfilter-filter.diff
==============================================================================
--- trunk/patches/src680/split-binfilter-filter.diff	(original)
+++ trunk/patches/src680/split-binfilter-filter.diff	Wed Apr 23 18:56:35 2008
@@ -36,7 +36,7 @@
  	calc_StarOffice_XML_Calc \
  	calc_Text_txt_csv_StarCalc \
  	calc_StarOffice_XML_Calc_Template \
-@@ -68,7 +45,6 @@ F4_CALC = \
+@@ -70,7 +47,6 @@ F4_CALC = \
  	MS_Excel_97_Vorlage_Template \
  	Rich_Text_Format__StarCalc_ \
  	SYLK \
@@ -44,8 +44,8 @@
  	StarOffice_XML__Calc_ \
  	Text___txt___csv__StarCalc_ \
  	calc_HTML_WebQuery \
-@@ -82,16 +58,13 @@ F4_CALC = \
- 	calc_MS_Excel_2007_XML_Template
+@@ -86,16 +62,13 @@ F4_CALC = \
+ 	calc_MS_Excel_2007_Binary_Template
  
  # -----------------------------------------------
 -# count = 14
@@ -793,7 +793,7 @@
      writer_WordPerfect_Document \
      writer_MS_Works_Document \
      writer_T602_Document \
-@@ -81,7 +53,6 @@ F4_WRITER = \
+@@ -82,7 +54,6 @@ F4_WRITER = \
  	MS_Word_97_Vorlage \
  	Rich_Text_Format \
  	StarOffice_XML__Writer_ \
@@ -801,7 +801,7 @@
  	WordPerfect \
  	MS_Works \
  	T602Document \
-@@ -108,9 +79,6 @@ F4_UI_WRITER = \
+@@ -111,9 +82,6 @@ F4_UI_WRITER = \
  	MS_Word_95_Vorlage_ui \
  	MS_Word_97_Vorlage_ui \
  	StarOffice_XML__Writer__ui \

Modified: trunk/patches/src680/split-binfilter-scp2.diff
==============================================================================
--- trunk/patches/src680/split-binfilter-scp2.diff	(original)
+++ trunk/patches/src680/split-binfilter-scp2.diff	Wed Apr 23 18:56:35 2008
@@ -1,22 +1,22 @@
 --- scp2/prj/build.lst.old	2006-12-12 17:17:06.000000000 +0100
 +++ scp2/prj/build.lst	2007-07-19 13:12:54.000000000 +0200
-@@ -2,6 +2,7 @@ cp    scp2    :    setup_native transex3
- cp    scp2                        usr1     -    all    cp_mkout NULL
+@@ -3,6 +3,7 @@ cp    scp2    :    setup_native transex3
  cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
- cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros NULL
+ cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
+ cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros cp_langtemplates NULL
 +cp    scp2\source\binfilter       nmake    -    all    cp_binfilter cp_langmacros NULL
- cp    scp2\source\calc            nmake    -    all    cp_calc cp_langmacros NULL
- cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros NULL
- cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros NULL
-@@ -26,4 +26,4 @@ cp    scp2\source\winexplorerext  nmake 
- cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
- cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros NULL
- cp    scp2\source\ooo_wo_ure      nmake    -    all    cp_ooo_wo_ure cp_langmacros NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
+ cp    scp2\source\calc            nmake    -    all    cp_calc cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
+@@ -25,4 +25,4 @@ cp    scp2\source\winexplorerext  nmake 
+ cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 --- scp2/source/binfilter/file_binfilter.scp.old	2007-07-19 13:12:54.000000000 +0200
 +++ scp2/source/binfilter/file_binfilter.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -0,0 +1,193 @@
+@@ -0,0 +1,195 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -188,6 +188,7 @@
 +STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sch, bf_sch)
 +STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Xo, bf_xo)
 +STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svx, bf_svx)
++STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svt, bf_svt)
 +STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Frm, bf_frm)
 +STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Ofa, bf_ofa)
 +STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sb, bf_sb)
@@ -203,6 +204,7 @@
 +
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Sch, bf_sch )
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Svx, bf_svx )
++STD_RES_FILE_PATCH( gid_File_Res_Bf_Svt, bf_svt )
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Frm, bf_frm )
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Ofa, bf_ofa )
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Sc, bf_sc )
@@ -317,9 +319,9 @@
 +
 +# --- File ---------------------------------------------------------
 +.INCLUDE :  target.mk
---- /dev/null	2006-06-16 15:54:00.000000000 +0200
-+++ scp2/source/binfilter/module_binfilter.scp	2008-01-16 21:04:35.000000000 +0100
-@@ -0,0 +1,87 @@
+--- /dev/null	2007-04-20 17:59:41.000000000 +0200
++++ scp2/source/binfilter/module_binfilter.scp	2008-04-23 18:29:55.000000000 +0200
+@@ -0,0 +1,98 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -385,6 +387,7 @@
 +    gid_File_Lib_Bf_Lng,
 +    gid_File_Lib_Bf_Xo,
 +    gid_File_Lib_Bf_Svx,
++    gid_File_Lib_Bf_Svt,
 +    gid_File_Lib_Bf_Frm,
 +    gid_File_Lib_Bf_Ofa,
 +    gid_File_Lib_Bf_Sb,
@@ -396,17 +399,27 @@
 +    gid_File_Lib_Bf_Wrapper,
 +    gid_File_Lib_Legacy_Binfilters,
 +    gid_File_Lib_Bf_Migratefilter,
-+    gid_File_Lib_Bindet,
-+    gid_File_Res_Bf_Sch,
-+    gid_File_Res_Bf_Svx,
-+    gid_File_Res_Bf_Frm,
-+    gid_File_Res_Bf_Ofa,
-+    gid_File_Res_Bf_Sc,
-+    gid_File_Res_Bf_Sd,
-+    gid_File_Res_Bf_Sm,
-+    gid_File_Res_Bf_Sw,
-+    gid_File_Res_Bf_Sfx);
++    gid_File_Lib_Bindet);
 +End
++
++Module gid_Module_Langpack_Binfilter_Template
++    ParentID = gid_Module_Optional_Binfilter;
++    Name = "gid_Module_Langpack_Binfilter_Template";
++    Description = "gid_Module_Langpack_Binfilter_Template";
++    Styles = (TEMPLATEMODULE);
++    Files = (gid_File_Res_Bf_Sch,
++             gid_File_Res_Bf_Svx,
++             gid_File_Res_Bf_Svt,
++             gid_File_Res_Bf_Frm,
++             gid_File_Res_Bf_Ofa,
++             gid_File_Res_Bf_Sc,
++             gid_File_Res_Bf_Sd,
++             gid_File_Res_Bf_Sm,
++             gid_File_Res_Bf_Sw,
++             gid_File_Res_Bf_Sfx);
++End
++
++#include "alllangmodules_binfilter.inc"
 --- scp2/source/binfilter/module_binfilter.ulf.old	2007-07-19 13:12:54.000000000 +0200
 +++ scp2/source/binfilter/module_binfilter.ulf	2007-07-19 13:12:54.000000000 +0200
 @@ -0,0 +1,40 @@
@@ -450,9 +463,9 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_BINFILTER]
 +en-US = "Legacy filters, e.g. StarOffice 5.2 binary file formats."
---- scp2/source/calc/file_calc.scp.old	2007-07-17 21:12:03.000000000 +0200
-+++ scp2/source/calc/file_calc.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -82,19 +82,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Scd
+--- scp2/source/calc/file_calc.scp.old	2008-04-22 19:59:55.000000000 +0200
++++ scp2/source/calc/file_calc.scp	2008-04-23 17:18:40.000000000 +0200
+@@ -74,19 +74,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Scd
  
  STD_LIB_FILE_PATCH( gid_File_Lib_Tfu, tfu)
  
@@ -469,11 +482,11 @@
 -// end binfilter #110743#
 -//
 -
- STD_RES_FILE( gid_File_Res_Analysis, analysis)
+ STD_RES_FILE_PATCH( gid_File_Res_Solver, solver)
  
- STD_RES_FILE_PATCH( gid_File_Res_Date, date)
---- scp2/source/calc/makefile.mk.old	2007-07-17 21:12:03.000000000 +0200
-+++ scp2/source/calc/makefile.mk	2007-07-19 13:12:54.000000000 +0200
+ STD_RES_FILE( gid_File_Res_Analysis, analysis)
+--- scp2/source/calc/makefile.mk.old	2005-09-09 03:21:34.000000000 +0200
++++ scp2/source/calc/makefile.mk	2008-04-23 20:34:18.000000000 +0200
 @@ -45,10 +45,6 @@ TARGETTYPE=CUI
  
  .INCLUDE :	settings.mk
@@ -482,28 +495,36 @@
 -SCPDEFS+=-DWITHOUT_BINFILTER
 -.ENDIF
 -
- .IF "$(SYSTEM_LPSOLVE)" == "YES"
- SCPDEFS+=-DSYSTEM_LPSOLVE
- .ENDIF
+ SCP_PRODUCT_TYPE=osl
+ PARFILES= \
+         module_calc.par              \
 --- scp2/source/calc/module_calc.scp.old	2008-01-15 20:44:19.000000000 +0100
 +++ scp2/source/calc/module_calc.scp	2008-01-16 20:06:26.000000000 +0100
-@@ -54,7 +54,6 @@ Module gid_Module_Prg_Calc
- 	Destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+@@ -43,7 +43,6 @@ Module gid_Module_Prg_Calc
+     Styles =(APPLICATIONMODULE);
  End
  
 -// #110743# Added gid_File_Lib_Bf_Sc and gid_File_Res_Bf_Sc for binfilter
  Module gid_Module_Prg_Calc_Bin
      MOD_NAME_DESC ( MODULE_PRG_CALC_BIN );
      ParentID = gid_Module_Prg_Calc;
-@@ -64,7 +63,7 @@ Module gid_Module_Prg_Calc_Bin
-     Files = (gid_File_Lib_Calc,gid_File_Exe_Scalc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scd,gid_File_Res_Sc,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+@@ -54,7 +53,7 @@ Module gid_Module_Prg_Calc_Bin
+     gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
      gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
-     gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Xdg_Calc, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
--    gid_File_Lib_Bf_Sc,gid_File_Res_Bf_Sc,gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
+     gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
+-    gid_File_Lib_Bf_Sc,gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
 +    gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
  End
  
- Module gid_Module_Prg_Calc_Help
+ // Module gid_Module_Prg_Calc_Help
+@@ -92,7 +92,6 @@ Module gid_Module_Langpack_Calc_Template
+     Styles = (TEMPLATEMODULE);
+     Files = (gid_File_Help_Scalc_Zip,
+              gid_File_Res_Analysis,
+-             gid_File_Res_Bf_Sc,
+              gid_File_Res_Date,
+              gid_File_Res_Sc,
+              gid_File_Res_Solver);
 --- scp2/source/math/file_math.scp.old	2007-08-02 19:20:28.000000000 +0200
 +++ scp2/source/math/file_math.scp	2008-01-16 20:03:03.000000000 +0100
 @@ -57,19 +57,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Smd
@@ -541,26 +562,36 @@
          module_math.par              \
 --- scp2/source/math/module_math.scp.old	2007-07-17 21:12:01.000000000 +0200
 +++ scp2/source/math/module_math.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -42,7 +42,6 @@ Module gid_Module_Prg_Math
-     Sortkey = "600";
+@@ -43,7 +43,6 @@ Module gid_Module_Prg_Math
+     Styles =(APPLICATIONMODULE);
  End
  
 -// #110743# Added gid_File_Lib_Bf_Sm, gid_File_Res_Bf_Sm
  Module gid_Module_Prg_Math_Bin
      MOD_NAME_DESC ( MODULE_PRG_MATH_BIN );
      ParentID = gid_Module_Prg_Math;
-@@ -49,7 +48,7 @@ Module gid_Module_Prg_Math_Bin
+@@ -52,7 +51,7 @@ Module gid_Module_Prg_Math_Bin
      Default = YES;
-     Files = (gid_File_Html_W3c_Ipr,gid_File_Dtd_Math,gid_File_Exe_Smath,gid_File_Res_Sm,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
+     Files = (gid_File_Html_W3c_Ipr,gid_File_Dtd_Math,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
      gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
--    gid_File_Lib_Bf_Sm, gid_File_Res_Bf_Sm, gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
+-    gid_File_Lib_Bf_Sm, gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
 +    gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
- 	gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Share_Xdg_Math, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu,
+ 	gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu,
      gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu, gid_File_Tmp_Userinstall_Math_Inf);
  End
+@@ -83,8 +83,7 @@ Module gid_Module_Langpack_Math_Template
+     Description = "gid_Module_Langpack_Math_Template";
+     Styles = (TEMPLATEMODULE);
+     Files = (gid_File_Help_Smath_Zip,
+-             gid_File_Res_Sm,
+-             gid_File_Res_Bf_Sm);
++             gid_File_Res_Sm);
+ End
+ 
+ #include "alllangmodules_math.inc"
 --- scp2/source/ooo/file_library_ooo.scp.old	2008-01-15 20:44:17.000000000 +0100
 +++ scp2/source/ooo/file_library_ooo.scp	2008-01-16 19:42:08.000000000 +0100
-@@ -2013,31 +2013,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox
+@@ -1630,32 +1630,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox
  
  STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
  
@@ -573,6 +604,7 @@
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sch, bf_sch)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Xo, bf_xo)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svx, bf_svx)
+-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svt, bf_svt)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Frm, bf_frm)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Ofa, bf_ofa)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sb, bf_sb)
@@ -594,7 +626,7 @@
  File gid_File_Lib_Scriptframe
 --- scp2/source/ooo/file_ooo.scp.old	2007-07-17 21:12:01.000000000 +0200
 +++ scp2/source/ooo/file_ooo.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -3193,15 +3193,6 @@ File gid_File_Txt_Patchfiles
+@@ -2915,15 +2915,6 @@ File gid_File_Txt_Patchfiles
  End
  #endif
  
@@ -612,7 +644,7 @@
      Name = "services.rdb";
 --- scp2/source/ooo/file_resource_ooo.scp.old	2007-07-17 21:11:57.000000000 +0200
 +++ scp2/source/ooo/file_resource_ooo.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -90,23 +90,6 @@ STD_RES_FILE( gid_File_Res_San, san )
+@@ -90,24 +90,6 @@ STD_RES_FILE( gid_File_Res_San, san )
  
  #endif
  
@@ -623,6 +655,7 @@
 -#ifndef WITHOUT_BINFILTER
 -STD_RES_FILE_PATCH( gid_File_Res_Bf_Sch, bf_sch )
 -STD_RES_FILE_PATCH( gid_File_Res_Bf_Svx, bf_svx )
+-STD_RES_FILE_PATCH( gid_File_Res_Bf_Svt, bf_svt )
 -STD_RES_FILE_PATCH( gid_File_Res_Bf_Frm, bf_frm )
 -STD_RES_FILE_PATCH( gid_File_Res_Bf_Ofa, bf_ofa )
 -STD_RES_FILE_PATCH( gid_File_Res_Bf_Sd, bf_sd )
@@ -651,15 +684,15 @@
  .ENDIF
 --- scp2/source/ooo/module_hidden_ooo.scp.old	2008-01-15 20:44:16.000000000 +0100
 +++ scp2/source/ooo/module_hidden_ooo.scp	2008-01-16 19:46:03.000000000 +0100
-@@ -162,7 +162,6 @@ Module gid_Module_Root_Files_3
+@@ -134,7 +134,6 @@ Module gid_Module_Root_Files_3
+ 	gid_File_Jar_Xmerge,
  	gid_File_Jar_Xmergebridge,
- 	gid_File_Jar_Unoloader,
- 	gid_File_Rdb_Types,
+     gid_File_Rdb_Offapi,
 -	gid_Starregistry_Legacy_Binfilters_Rdb,
  	gid_Starregistry_Services_Rdb);
  End
  
-@@ -227,7 +226,6 @@ Module gid_Module_Root_Files_4
+@@ -200,7 +199,6 @@ Module gid_Module_Root_Files_4
  	gid_File_Lib_Lnth,
  	gid_File_Lib_Offacc,
  	gid_File_Lib_Oox,
@@ -667,7 +700,7 @@
  	gid_File_Lib_Pcr,
  	gid_File_Lib_Pdffilter,
  	gid_File_Lib_Pk,
-@@ -377,21 +375,6 @@ Module gid_Module_Root_Files_5
+@@ -325,22 +323,6 @@ Module gid_Module_Root_Files_5
  	gid_File_Lib_Officebean,
  	gid_File_Lib_Openssl,
  	gid_File_Lib_Package2,
@@ -676,6 +709,7 @@
 -	gid_File_Lib_Bf_Go,
 -	gid_File_Lib_Bf_Xo,
 -	gid_File_Lib_Bf_Svx,
+-	gid_File_Lib_Bf_Svt,
 -	gid_File_Lib_Bf_Frm,
 -	gid_File_Lib_Bf_Ofa,
 -	gid_File_Lib_Bf_Sd,
@@ -688,26 +722,99 @@
 -	gid_File_Lib_Bf_Migratefilter,
  	gid_File_Lib_Deployment,
  	gid_File_Lib_DeploymentGui,
- 	gid_File_Lib_Sal,
-@@ -996,13 +979,6 @@ Module gid_Module_Root_Files_8
- 	gid_File_Res_Pdffilter,
- 	gid_File_Res_Preload,
- 	gid_File_Res_San,
--	gid_File_Res_Bf_Sch,
--	gid_File_Res_Bf_Svx,
--	gid_File_Res_Bf_Frm,
--	gid_File_Res_Bf_Ofa,
--	gid_File_Res_Bf_Sd,
--	gid_File_Res_Bf_Sw,
--	gid_File_Res_Bf_Sfx,
- 	gid_File_Res_Productregistration,
- 	gid_File_Res_Sd,
- 	gid_File_Res_Sfx,
+ 	gid_File_Lib_Sax_Uno,
+--- scp2/source/ooo/module_lang_template.scp.old	2008-03-18 14:31:30.000000000 +0100
++++ scp2/source/ooo/module_lang_template.scp	2008-04-23 17:51:28.000000000 +0200
+@@ -90,14 +90,6 @@ Module gid_Module_Langpack_Resource_Temp
+              gid_File_Res_Pdffilter,
+              gid_File_Res_Preload,
+              gid_File_Res_San,
+-             gid_File_Res_Bf_Sch,
+-             gid_File_Res_Bf_Svx,
+-             gid_File_Res_Bf_Svt,
+-             gid_File_Res_Bf_Frm,
+-             gid_File_Res_Bf_Ofa,
+-             gid_File_Res_Bf_Sd,
+-             gid_File_Res_Bf_Sw,
+-             gid_File_Res_Bf_Sfx,
+              gid_File_Res_Productregistration,
+              gid_File_Res_Sb,
+              gid_File_Res_Sd,
+--- scp2/source/templates/makefile.mk.old	2008-03-18 14:38:09.000000000 +0100
++++ scp2/source/templates/makefile.mk	2008-04-23 19:09:42.000000000 +0200
+@@ -48,7 +48,7 @@ TARGET=templates
+ COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
+ .EXPORT : COMPLETELANGISO_VAR
+ 
+-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_onlineupdate.inc
++ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_onlineupdate.inc
+ 
+ .PHONY $(INCCOM)$/alllangmodules.inc:
+ 	@@-$(RENAME) $@ $  tmp
+@@ -82,6 +82,10 @@ ALLTAR : $(INCCOM)$/alllangmodules.inc $
+ 	@@-$(RENAME) $@ $  tmp
+ 	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_writer.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
+ 
++.PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
++	@@-$(RENAME) $@ $  tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
++
+ .PHONY $(INCCOM)$/alllangmodules_onlineupdate.inc:
+ 	@@-$(RENAME) $@ $  tmp
+ 	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_onlineupdate.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
+--- /dev/null	2007-04-20 17:59:41.000000000 +0200
++++ scp2/source/templates/module_langpack_binfilter.sct	2008-04-23 18:31:55.000000000 +0200
+@@ -0,0 +1,45 @@
++/*************************************************************************
++*
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: module_langpack_onlineupdate.sct,v $
++ *
++ *  $Revision: 1.2 $
++ *
++ *  last change: $Author: vg $ $Date: 2008/03/18 13:39:27 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++************************************************************************/
++
++Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
++    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
++    Sortkey = "900";
++    Language = "<LANGUAGE>";
++    Assigns = gid_Module_Langpack_Binfilter_Template;
++    Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
++    Description = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
++    PackageInfo = "packinfo_office_lang.txt";
++    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
++End
 --- scp2/util/makefile.mk.old	2007-07-17 21:12:01.000000000 +0200
 +++ scp2/util/makefile.mk	2007-07-19 13:12:54.000000000 +0200
-@@ -92,6 +92,12 @@ SCP1FILES  = installation_ooo.par       
-              profileitem_python.par        \
-              shortcut_python.par
+@@ -97,6 +97,12 @@ SCP1FILES  = installation_ooo.par       
+              common_brand_readme.par       \
+              ooo_brand.par
  
 +.IF "$(WITH_BINFILTER)" != "NO"
 +SCP1FILES +=                               \
@@ -718,9 +825,9 @@
  .IF "$(SOLAR_JAVA)"!=""
  SCP1FILES +=                               \
               module_javafilter.par         \
-@@ -225,6 +231,12 @@ SCP2FILES  = installation_ooo.par       
-              file_python.par               \
-              profileitem_python.par
+@@ -245,6 +251,12 @@ SCP2FILES  = installation_ooo.par       
+              common_brand_readme.par       \
+              ooo_brand.par
  
 +.IF "$(WITH_BINFILTER)" != "NO"
 +SCP2FILES +=                               \

Modified: trunk/patches/src680/split-binfilter-setup_native.diff
==============================================================================
--- trunk/patches/src680/split-binfilter-setup_native.diff	(original)
+++ trunk/patches/src680/split-binfilter-setup_native.diff	Wed Apr 23 18:56:35 2008
@@ -1,24 +1,48 @@
 --- setup_native/source/packinfo/packinfo_office.txt	2007-05-25 16:35:43.000000000 +0200
 +++ setup_native/source/packinfo/packinfo_office.txt	2007-07-19 11:50:07.000000000 +0200
-@@ -159,6 +159,21 @@ destpath = "/opt/%UNIXPRODUCTNAME%PRODUC
+@@ -158,6 +158,21 @@ destpath = "/opt/%UNIXPRODUCTNAME%PRODUC
  End
  
  Start
 +module = "gid_Module_Optional_Binfilter"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-binfilter"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-binfilter"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-binfilter"
-+freebsdrequires = "%UNIXPRODUCTNAME-calc,%UNIXPRODUCTNAME-draw,%UNIXPRODUCTNAME-impress,%UNIXPRODUCTNAME-math,%UNIXPRODUCTNAME-writer"
-+requires = "%UNIXPRODUCTNAME-calc,%UNIXPRODUCTNAME-draw,%UNIXPRODUCTNAME-impress,%UNIXPRODUCTNAME-math,%UNIXPRODUCTNAME-writer"
++solarispackagename = "openofficeorg-binfilter"
++solarisrequires = "openofficeorg-core01"
++packagename = "openoffice.org-binfilter"
++linuxreplaces = "openofficeorg-binfilter"
++freebsdrequires = "openoffice.org-calc,openoffice.org-draw,openoffice.org-impress,openoffice.org-math,openoffice.org-writer"
++requires = "openoffice.org-calc,openoffice.org-draw,openoffice.org-impress,openoffice.org-math,openoffice.org-writer"
 +copyright = "1999-2007 by OpenOffice.org"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "OpenOffice.org"
-+description = "Legacy filters (e.g. StarOffice 5.2) for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION"
++destpath = "/opt"
 +End
 +
 +Start
  module = "gid_Module_Optional_Grfflt"
- solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-graphicfilter"
- solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
+ solarispackagename = "openofficeorg-graphicfilter"
+ solarisrequires = "openofficeorg-core01"
+--- setup_native/source/packinfo/packinfo_office_lang.txt.old1	2008-03-18 13:51:25.000000000 +0100
++++ setup_native/source/packinfo/packinfo_office_lang.txt	2008-04-23 18:40:39.000000000 +0200
+@@ -167,6 +167,21 @@ destpath = "/opt"
+ End
+ 
+ Start
++module = "gid_Module_Langpack_Binfilter"
++solarispackagename = "openofficeorg-%LANGUAGESTRING-binfilter"
++solarisrequires = "openofficeorg-%LANGUAGESTRING"
++packagename = "openoffice.org-%LANGUAGESTRING-binfilter"
++linuxreplaces = "openofficeorg-%LANGUAGESTRING-binfilter"
++provides = "openofficeorg-%LANGUAGESTRING-binfilter"
++requires = "openoffice.org-%LANGUAGESTRING"
++copyright = "1999-2007 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
++destpath = "/opt"
++End
++
++Start
+ module = "gid_Module_Langpack_Onlineupdate"
+ solarispackagename = "openofficeorg-%LANGUAGESTRING-onlineupd"
+ solarisrequires = "openofficeorg-%LANGUAGESTRING"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]