ooo-build r11300 - in trunk: . bin patches/src680

From: pmladek svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11300 - in trunk: . bin patches/src680
Date: Thu, 17 Jan 2008 13:41:24 +0000 (GMT)
Author: pmladek
Date: Thu Jan 17 13:41:24 2008
New Revision: 11300
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11300&view=rev

Log:
2008-01-17  Petr Mladek  <pmladek suse cz>

	* patches/src680/split-binfilter-instsetoo_native.diff,
	  split-binfilter-setup_native.diff
	* patches/src680/split-binfilter-scp2.diff,
	  patches/src680/split-binfilter-setup_native.diff,
	  patches/src680/apply: update for ooh680

	* bin/package-ooo: reverted change for non-Mandriva packaging ;-)



Added:
   trunk/patches/src680/split-binfilter-setup_native.diff
      - copied, changed from r11285, /trunk/patches/src680/split-binfilter-instsetoo_native.diff
Removed:
   trunk/patches/src680/split-binfilter-instsetoo_native.diff
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/patches/src680/apply
   trunk/patches/src680/split-binfilter-scp2.diff

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Jan 17 13:41:24 2008
@@ -520,27 +520,27 @@
 	if test "$SPLIT_OPT_FEATURES" = "YES" ; then
 		rm -f $BUILDDIR/filters_list.txt $BUILDDIR/mailmerge_list.txt \
 		      $BUILDDIR/pyuno_list.txt $BUILDDIR/testtool_list.txt
-		if test "z$VENDORNAME" != "zMandriva" ; then
-			merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filters_list.txt
-			merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/common_list.txt
+		if test "z$VENDORNAME" = "zMandriva" ; then
+			rm -f $BUILDDIR/filter-binfilter_list.txt
+			merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filter-binfilter_list.txt
+			merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/draw_list.txt
 			merge_flists gid_Module_Optional_Headless		$BUILDDIR/common_list.txt
-			merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/filters_list.txt
+			merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/common_list.txt
 			merge_flists gid_Module_Optional_Pymailmerge		$BUILDDIR/pyuno_list.txt
 			merge_flists gid_Module_Optional_Pyuno			$BUILDDIR/pyuno_list.txt
 			merge_flists gid_Module_Optional_Testtool		$BUILDDIR/testtool_list.txt
-			merge_flists gid_Module_Optional_Xsltfiltersamples	$BUILDDIR/filters_list.txt
+			merge_flists gid_Module_Optional_Xsltfiltersamples	$BUILDDIR/common_list.txt
 			# pyuno hack for x86_64
 			merge_flists gid_Module_Pyuno_Hack	$BUILDDIR/pyuno_list.txt
 		else
-			rm -f $BUILDDIR/filter-binfilter_list.txt
-			merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filter-binfilter_list.txt
-			merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/draw_list.txt
+			merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filters_list.txt
+			merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/common_list.txt
 			merge_flists gid_Module_Optional_Headless		$BUILDDIR/common_list.txt
-			merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/common_list.txt
-			merge_flists gid_Module_Optional_Pymailmerge		$BUILDDIR/pyuno_list.txt
+			merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/filters_list.txt
+			merge_flists gid_Module_Optional_Pymailmerge		$BUILDDIR/mailmerge_list.txt
 			merge_flists gid_Module_Optional_Pyuno			$BUILDDIR/pyuno_list.txt
 			merge_flists gid_Module_Optional_Testtool		$BUILDDIR/testtool_list.txt
-			merge_flists gid_Module_Optional_Xsltfiltersamples	$BUILDDIR/common_list.txt
+			merge_flists gid_Module_Optional_Xsltfiltersamples	$BUILDDIR/filters_list.txt
 			# pyuno hack for x86_64
 			merge_flists gid_Module_Pyuno_Hack	$BUILDDIR/pyuno_list.txt
 		fi
@@ -572,15 +572,15 @@
 	
 	for lang in $OOO_LANGS_LIST ; do
 		lang_lists=
-		if test "$VENDORNAME" != "Mandriva"; then
+		if test "$VENDORNAME" = "Mandriva"; then
 			test -f gid_Module_Root.$lang           	&& lang_lists="gid_Module_Root.$lang" || :
-			test -f gid_Module_Langpack_Help.$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help.$lang" || :
 			test -f gid_Module_Langpack_Resource.$lang	&& lang_lists="$lang_lists gid_Module_Langpack_Resource.$lang" || :
+			# Place helps on dedicated packages.
+			test -f gid_Module_Langpack_Help.$lang  	&& sort -u gid_Module_Langpack_Help.$lang > $BUILDDIR/help_${lang}_list.txt || :
 		else
 			test -f gid_Module_Root.$lang           	&& lang_lists="gid_Module_Root.$lang" || :
+			test -f gid_Module_Langpack_Help.$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help.$lang" || :
 			test -f gid_Module_Langpack_Resource.$lang	&& lang_lists="$lang_lists gid_Module_Langpack_Resource.$lang" || :
-			# Place helps on dedicated packages.
-			test -f gid_Module_Langpack_Help.$lang  	&& sort -u gid_Module_Langpack_Help.$lang > $BUILDDIR/help_${lang}_list.txt || :
 		fi
 		test -n "$lang_lists" && cat $lang_lists | sort -u >$BUILDDIR/lang_${lang}_list.txt || :
 

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Jan 17 13:41:24 2008
@@ -1465,17 +1465,6 @@
 connectivity-workben-postgresql.diff
 
 
-[ Split ]
-SectionOwner => pmladek
-
-# FIXME: should be applied after the OOXML section
-#        they both patch the same files
-
-# split binfilter from core
-split-binfilter-filter.diff, i#79800
-#FIXME src680: split-binfilter-instsetoo_native.diff, i#79800
-
-#FIXME src680: split-binfilter-scp2.diff, i#79800
 
 
 [ ArkOnly ]
@@ -1980,5 +1969,16 @@
 ooowikipedia_writer.diff
 ooowikipedia_toolbars.diff
 
+[ Split ]
+SectionOwner => pmladek
+
+# FIXME: apply at the end because there are some conflicts
+
+# split binfilter from core
+split-binfilter-filter.diff, i#79800
+split-binfilter-setup_native.diff, i#79800
+split-binfilter-scp2.diff, i#79800
+
+
 [ Win32Only ]
 mozilla-source-1.7.5.patch.diff, i#84961, tml

Modified: trunk/patches/src680/split-binfilter-scp2.diff
==============================================================================
--- trunk/patches/src680/split-binfilter-scp2.diff	(original)
+++ trunk/patches/src680/split-binfilter-scp2.diff	Thu Jan 17 13:41:24 2008
@@ -8,15 +8,15 @@
  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
-@@ -24,4 +25,4 @@ cp    scp2\source\xsltfilter      nmake 
- cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext 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\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_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 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_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 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
 --- 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,192 @@
+@@ -0,0 +1,193 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -208,6 +208,7 @@
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Sc, bf_sc )
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Sd, bf_sd )
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Sm, bf_sm)
++STD_LIB_FILE_PATCH( gid_File_Lib_Bf_So, bf_so)
 +STD_RES_FILE_PATCH( gid_File_Res_Bf_Sw, bf_sw )
 --- scp2/source/binfilter/localize.sdf.old	2007-07-19 13:12:54.000000000 +0200
 +++ scp2/source/binfilter/localize.sdf	2007-07-19 13:12:54.000000000 +0200
@@ -316,9 +317,9 @@
 +
 +# --- File ---------------------------------------------------------
 +.INCLUDE :  target.mk
---- scp2/source/binfilter/module_binfilter.scp.old	2007-07-19 13:12:54.000000000 +0200
-+++ scp2/source/binfilter/module_binfilter.scp	2007-07-19 17:06:53.000000000 +0200
-@@ -0,0 +1,84 @@
+--- /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 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -357,53 +358,55 @@
 +#include "macros.inc"
 +
 +Module gid_Module_Optional_Binfilter
++    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC ( MODULE_OPTIONAL_BINFILTER );
++    Sortkey = "700";
 +    ParentID = gid_Module_Optional;
 +    Default = YES;
 +    Files = (gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu,
-+	gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu,
-+	gid_Starregistry_Legacy_Binfilters_Rdb,
-+	gid_File_Lib_Bf_Go,
-+	gid_File_Lib_Bf_Sch,
-+	gid_File_Lib_Bf_Lng,
-+	gid_File_Lib_Bf_Xo,
-+	gid_File_Lib_Bf_Svx,
-+	gid_File_Lib_Bf_Frm,
-+	gid_File_Lib_Bf_Ofa,
-+	gid_File_Lib_Bf_Sb,
-+	gid_File_Lib_Bf_Sc,
-+	gid_File_Lib_Bf_Sd,
-+	gid_File_Lib_Bf_Sm,
-+	gid_File_Lib_Bf_Sw,
-+	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_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu,
++    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu,
++    gid_Starregistry_Legacy_Binfilters_Rdb,
++    gid_File_Lib_Bf_Go,
++    gid_File_Lib_Bf_Sch,
++    gid_File_Lib_Bf_Lng,
++    gid_File_Lib_Bf_Xo,
++    gid_File_Lib_Bf_Svx,
++    gid_File_Lib_Bf_Frm,
++    gid_File_Lib_Bf_Ofa,
++    gid_File_Lib_Bf_Sb,
++    gid_File_Lib_Bf_Sc,
++    gid_File_Lib_Bf_Sd,
++    gid_File_Lib_Bf_Sm,
++    gid_File_Lib_Bf_So,
++    gid_File_Lib_Bf_Sw,
++    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);
 +End
-\ No newline at end of file
 --- 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 @@
@@ -482,17 +485,17 @@
  .IF "$(SYSTEM_LPSOLVE)" == "YES"
  SCPDEFS+=-DSYSTEM_LPSOLVE
  .ENDIF
---- scp2/source/calc/module_calc.scp.old	2007-07-17 21:12:01.000000000 +0200
-+++ scp2/source/calc/module_calc.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -41,7 +41,6 @@ Module gid_Module_Prg_Calc
-     Sortkey = "200";
+--- 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"
  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;
-@@ -50,7 +49,7 @@ Module gid_Module_Prg_Calc_Bin
+@@ -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,
      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,
@@ -500,9 +503,9 @@
 +    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_Addins
---- scp2/source/math/file_math.scp.old	2007-07-17 21:12:01.000000000 +0200
-+++ scp2/source/math/file_math.scp	2007-07-19 13:12:54.000000000 +0200
+ Module gid_Module_Prg_Calc_Help
+--- 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
  
  STD_RES_FILE_PATCH( gid_File_Res_Sm, sm )
@@ -522,7 +525,7 @@
 -
  File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu
      TXT_FILE_BODY;
-     Styles = (PACKED);
+     Styles = (PACKED, PATCH);
 --- scp2/source/math/makefile.mk.old	2007-07-17 21:12:01.000000000 +0200
 +++ scp2/source/math/makefile.mk	2007-07-19 13:12:54.000000000 +0200
 @@ -45,10 +45,6 @@ TARGETTYPE=CUI
@@ -538,8 +541,8 @@
          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
-@@ -41,7 +41,6 @@ Module gid_Module_Prg_Math
-     Sortkey = "500";
+@@ -42,7 +42,6 @@ Module gid_Module_Prg_Math
+     Sortkey = "600";
  End
  
 -// #110743# Added gid_File_Lib_Bf_Sm, gid_File_Res_Bf_Sm
@@ -555,9 +558,9 @@
  	gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Share_Xdg_Math, 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
---- scp2/source/ooo/file_library_ooo.scp.old	2007-07-17 21:12:09.000000000 +0200
-+++ scp2/source/ooo/file_library_ooo.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -1972,30 +1972,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox
+--- 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
  
  STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
  
@@ -573,6 +576,7 @@
 -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)
+-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_So, bf_so)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sd, bf_sd)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sw, bf_sw)
 -STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Wrapper, bf_wrapper)
@@ -635,7 +639,7 @@
 --- scp2/source/ooo/makefile.mk.old	2007-07-17 21:12:03.000000000 +0200
 +++ scp2/source/ooo/makefile.mk	2007-07-19 13:12:54.000000000 +0200
 @@ -143,10 +143,6 @@ SCPDEFS+=-DSYSTEM_CURL
- SCPDEFS+=-DENABLE_ACCESS
+ SCPDEFS+=-DSYSTEM_CURL
  .ENDIF
  
 -.IF "$(WITH_BINFILTER)" == "NO"
@@ -645,9 +649,9 @@
  .IF "$(SYSTEM_STDLIBS)" == "YES"
  SCPDEFS+=-DSYSTEM_STDLIBS
  .ENDIF
---- scp2/source/ooo/module_hidden_ooo.scp.old	2007-07-17 21:12:09.000000000 +0200
-+++ scp2/source/ooo/module_hidden_ooo.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -158,7 +158,6 @@ Module gid_Module_Root_Files_3
+--- 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
  	gid_File_Jar_Xmergebridge,
  	gid_File_Jar_Unoloader,
  	gid_File_Rdb_Types,
@@ -655,7 +659,7 @@
  	gid_Starregistry_Services_Rdb);
  End
  
-@@ -221,7 +220,6 @@ Module gid_Module_Root_Files_4
+@@ -227,7 +226,6 @@ Module gid_Module_Root_Files_4
  	gid_File_Lib_Lnth,
  	gid_File_Lib_Offacc,
  	gid_File_Lib_Oox,
@@ -663,9 +667,9 @@
  	gid_File_Lib_Pcr,
  	gid_File_Lib_Pdffilter,
  	gid_File_Lib_Pk,
-@@ -368,19 +366,6 @@ Module gid_Module_Root_Files_5
- 	gid_File_Lib_Odbc_2,
+@@ -377,21 +375,6 @@ Module gid_Module_Root_Files_5
  	gid_File_Lib_Officebean,
+ 	gid_File_Lib_Openssl,
  	gid_File_Lib_Package2,
 -	gid_File_Lib_Bf_Sch,
 -	gid_File_Lib_Bf_Lng,
@@ -675,6 +679,8 @@
 -	gid_File_Lib_Bf_Frm,
 -	gid_File_Lib_Bf_Ofa,
 -	gid_File_Lib_Bf_Sd,
+-	gid_File_Lib_Bf_Sb,
+-	gid_File_Lib_Bf_So,
 -	gid_File_Lib_Bf_Sm,
 -	gid_File_Lib_Bf_Sw,
 -	gid_File_Lib_Bf_Wrapper,
@@ -683,7 +689,7 @@
  	gid_File_Lib_Deployment,
  	gid_File_Lib_DeploymentGui,
  	gid_File_Lib_Sal,
-@@ -970,13 +955,6 @@ Module gid_Module_Root_Files_8
+@@ -996,13 +979,6 @@ Module gid_Module_Root_Files_8
  	gid_File_Res_Pdffilter,
  	gid_File_Res_Preload,
  	gid_File_Res_San,

Copied: trunk/patches/src680/split-binfilter-setup_native.diff (from r11285, /trunk/patches/src680/split-binfilter-instsetoo_native.diff)
==============================================================================
--- /trunk/patches/src680/split-binfilter-instsetoo_native.diff	(original)
+++ trunk/patches/src680/split-binfilter-setup_native.diff	Thu Jan 17 13:41:24 2008
@@ -1,5 +1,5 @@
---- instsetoo_native/inc_openoffice/unix/packagelist.txt.old	2007-05-25 16:35:43.000000000 +0200
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	2007-07-19 11:50:07.000000000 +0200
+--- 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
  End
  
@@ -11,7 +11,7 @@
 +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"
-+copyright = "1999-2006 by OpenOffice.org"
++copyright = "1999-2007 by OpenOffice.org"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "OpenOffice.org"
 +description = "Legacy filters (e.g. StarOffice 5.2) for %PRODUCTNAME %PRODUCTVERSION"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]