ooo-build r11995 - in trunk: . patches/dev300 patches/src680 patches/src680-only

From: jholesovsky svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11995 - in trunk: . patches/dev300 patches/src680 patches/src680-only
Date: Tue, 25 Mar 2008 13:21:35 +0000 (GMT)
Author: jholesovsky
Date: Tue Mar 25 13:21:34 2008
New Revision: 11995
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11995&view=rev

Log:
2008-03-24  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/cjk-character-units-imp.diff,
          patches/dev300/scs-scp2.diff,
          patches/dev300/unxsplash-rework.diff,
          patches/dev300/buildfix-vba-as-extn.diff,
          patches/dev300/build-identification.diff,
          patches/dev300/build-optimized-link.diff,
          patches/dev300/default-no-startup-wizard.diff,
          patches/dev300/scp2-user-config-ooo-2.0.diff,
          patches/dev300/transogl-transitions-officecfg.diff,
          patches/dev300/transogl-transitions-scp2.diff,
          patches/dev300/apply: Update to dev300-m4 (m3 is no longer
          supported).

        * patches/src680/cws-s390port01.diff,
          patches/src680/svtools-html-iso-8859-2-ignore-chars.diff: Moved...
        * patches/src680-only/cws-s390port01.diff,
          patches/src680-only/svtools-html-iso-8859-2-ignore-chars.diff: ...here.

        * patches/src680/apply: Handle 'src680-only' patch subdir (for the
          patches that are not necessary for dev300).


Added:
   trunk/patches/dev300/build-identification.diff   (contents, props changed)
      - copied, changed from r11993, /trunk/patches/src680/build-identification.diff
   trunk/patches/dev300/build-optimized-link.diff   (contents, props changed)
      - copied, changed from r11993, /trunk/patches/src680/build-optimized-link.diff
   trunk/patches/dev300/buildfix-vba-as-extn.diff   (contents, props changed)
      - copied, changed from r11993, /trunk/patches/src680/buildfix-vba-as-extn.diff
   trunk/patches/dev300/default-no-startup-wizard.diff   (contents, props changed)
      - copied, changed from r11993, /trunk/patches/src680/default-no-startup-wizard.diff
   trunk/patches/dev300/scp2-user-config-ooo-2.0.diff   (contents, props changed)
      - copied, changed from r11993, /trunk/patches/src680/scp2-user-config-ooo-2.0.diff
   trunk/patches/dev300/transogl-transitions-officecfg.diff
      - copied, changed from r11993, /trunk/patches/src680/transogl-transitions-officecfg.diff
   trunk/patches/dev300/transogl-transitions-scp2.diff
      - copied, changed from r11993, /trunk/patches/src680/transogl-transitions-scp2.diff
   trunk/patches/src680-only/
   trunk/patches/src680-only/cws-s390port01.diff   (props changed)
      - copied unchanged from r11993, /trunk/patches/src680/cws-s390port01.diff
   trunk/patches/src680-only/svtools-html-iso-8859-2-ignore-chars.diff   (props changed)
      - copied unchanged from r11993, /trunk/patches/src680/svtools-html-iso-8859-2-ignore-chars.diff
Removed:
   trunk/patches/src680/cws-s390port01.diff
   trunk/patches/src680/svtools-html-iso-8859-2-ignore-chars.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cjk-character-units-imp.diff
   trunk/patches/dev300/scs-scp2.diff
   trunk/patches/dev300/unxsplash-rework.diff
   trunk/patches/src680/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Mar 25 13:21:34 2008
@@ -7,7 +7,7 @@
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql:../emf+:../src680
 
 # copied from svn r11934
-OLDEST_SUPPORTED=dev300-m3
+OLDEST_SUPPORTED=dev300-m4
 
 # -------- Functional sub-sets --------
 Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -259,7 +259,6 @@
 #api changes
 cws-npower11.diff
 
-cws-s390port01.diff, i#86425
 # not for upstreaming: don't disable the entire visibility, just
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
@@ -698,10 +697,6 @@
 # Grouping items in the templates dialog n#106603
 svtools-unsort-template-dialogentries.diff, rodo
 
-# Don't convert certain latin-2 characters into HTML entities when saving as
-# html in ISO-8859-2 encoding.
-svtools-html-iso-8859-2-ignore-chars.diff, i#15456, kohei
-
 # display command line help '-h' to stdout instead of stderr.
 desktop-cmdhelp-stdout.diff, kohei
 

Copied: trunk/patches/dev300/build-identification.diff (from r11993, /trunk/patches/src680/build-identification.diff)
==============================================================================
--- /trunk/patches/src680/build-identification.diff	(original)
+++ trunk/patches/dev300/build-identification.diff	Tue Mar 25 13:21:34 2008
@@ -9,30 +9,30 @@
  
  		$oneitem->{'Value'} = $value;
  	}
---- scp2/source/ooo/profileitem_ooo.scp
-+++ scp2/source/ooo/profileitem_ooo.scp
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
 @@ -239,6 +239,24 @@
      Value = "<useragent>";
  End
  
-+ProfileItem gid_Profileitem_Version_Vendor
-+    ProfileID = gid_Profile_Version_Ini;
-+    ModuleID = gid_Module_Root;
++ProfileItem gid_Brand_Profileitem_Version_Vendor
++    ProfileID = gid_Brand_Profile_Version_Ini;
++    ModuleID = gid_Module_Root_Brand;
 +    Section = "Version";
 +    Order = 16;
 +    Key = "Vendor";
 +    Value = "<vendor>";
 +End
 +
-+ProfileItem gid_Profileitem_Version_BuildVersion
-+    ProfileID = gid_Profile_Version_Ini;
-+    ModuleID = gid_Module_Root;
++ProfileItem gid_Brand_Profileitem_Version_BuildVersion
++    ProfileID = gid_Brand_Profile_Version_Ini;
++    ModuleID = gid_Module_Root_Brand;
 +    Section = "Version";
 +    Order = 17;
 +    Key = "BuildVersion";
 +    Value = "<buildversion>";
 +End
 +
- ProfileItem gid_Profileitem_Version_Ooobaseversion
-     ProfileID = gid_Profile_Version_Ini;
-     ModuleID = gid_Module_Root;
+ ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
+     ProfileID = gid_Brand_Profile_Version_Ini;
+     ModuleID = gid_Module_Root_Brand;

Copied: trunk/patches/dev300/build-optimized-link.diff (from r11993, /trunk/patches/src680/build-optimized-link.diff)
==============================================================================
--- /trunk/patches/src680/build-optimized-link.diff	(original)
+++ trunk/patches/dev300/build-optimized-link.diff	Tue Mar 25 13:21:34 2008
@@ -6,9 +6,9 @@
 --- solenv/inc/unxlngi4.mk	28 Apr 2003 16:46:57 -0000	1.17
 +++ solenv/inc/unxlngi4.mk	13 May 2003 09:46:12 -0000
 @@ -145,7 +145,7 @@ LINK*=$(CC)
- LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
  LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+ LINKFLAGSRUNPATH_OXT=
 -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
 +LINKFLAGS=-O2 -Bsymbolic -Wl,-z,combreloc $(LINKFLAGSDEFS)
  

Copied: trunk/patches/dev300/buildfix-vba-as-extn.diff (from r11993, /trunk/patches/src680/buildfix-vba-as-extn.diff)
==============================================================================
--- /trunk/patches/src680/buildfix-vba-as-extn.diff	(original)
+++ trunk/patches/dev300/buildfix-vba-as-extn.diff	Tue Mar 25 13:21:34 2008
@@ -5,6 +5,6 @@
  .INCLUDE :  target.mk
  
 +COMP=
- .IF "$(VBA_EXTENSION)"=="YES"
+ .IF "$(VBA_EXTENSION)"=="YES" && "$(OS)" != "MACOSX" # see above
      COMP=build_extn
  .ENDIF

Modified: trunk/patches/dev300/cjk-character-units-imp.diff
==============================================================================
--- trunk/patches/dev300/cjk-character-units-imp.diff	(original)
+++ trunk/patches/dev300/cjk-character-units-imp.diff	Tue Mar 25 13:21:34 2008
@@ -344,7 +344,7 @@
 @@ -283,9 +283,10 @@
          "Window/IsVerticalRulerRight",      //15
          "ViewLayout/Columns",               //16
-         "ViewLayout/BookMode"               //17
+         "ViewLayout/BookMode",              //17
 -        "Other/IsSquaredPageMode"           //18
 +        "Other/IsSquaredPageMode",        //18
 +        "Other/ApplyCharUnit"               //19
@@ -355,8 +355,8 @@
  	OUString* pNames = aNames.getArray();
  	for(int i = 0; i < nCount; i++)
 @@ -350,8 +351,9 @@
-             case 16: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
-             case 17: bSet = rParent.IsVRulerRight(); break;// "Window/IsVerticalRulerRight",
+             case 16: pValues[nProp] <<= (sal_Int32)rParent.GetViewLayoutColumns(); break;// "ViewLayout/Columns",
+             case 17: bSet = rParent.IsViewLayoutBookMode(); break;// "ViewLayout/BookMode",
              case 18: bSet = rParent.IsSquaredPageMode(); break;// "Other/IsSquaredPageMode",
 +            case 19: bSet = rParent.IsApplyCharUnit(); break;// "Other/IsApplyCharUnit",
          }
@@ -375,8 +375,8 @@
  				{
                      case  0: rParent.SetCrossHair(bSet); break;// "Line/Guide",
 @@ -429,6 +431,7 @@
- 					break;// "Other/TabStop",
-                     case 17: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
+                     break;// "ViewLayout/Columns",
+                     case 17: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
                      case 18: rParent.SetDefaultPageMode(bSet); break;// "Other/IsSquaredPageMode",
 +                    case 19: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
                  }

Copied: trunk/patches/dev300/default-no-startup-wizard.diff (from r11993, /trunk/patches/src680/default-no-startup-wizard.diff)
==============================================================================
--- /trunk/patches/src680/default-no-startup-wizard.diff	(original)
+++ trunk/patches/dev300/default-no-startup-wizard.diff	Tue Mar 25 13:21:34 2008
@@ -3,8 +3,8 @@
 --- desktop/source/migration/wizard.cxx
 +++ desktop/source/migration/wizard.cxx
 @@ -121,6 +121,8 @@ FirstStartWizard::FirstStartWizard(Window* pParent)
-     ,m_bLicenseWasAccepted(sal_False)
      ,m_bAutomaticUpdChk(sal_True)
+     ,m_aLicensePath( rLicensePath )
  {
 +    return;
 +
@@ -23,20 +23,19 @@
 +    return sal_True;
  }
  
- 
+ static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
 diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
 index 9773b42..ce25861 100644
---- scp2/source/ooo/profileitem_ooo.scp
-+++ scp2/source/ooo/profileitem_ooo.scp
-@@ -682,22 +682,15 @@ ProfileItem gid_Profileitem_Soffice_ProgressPosition
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
+@@ -682,19 +682,14 @@ ProfileItem gid_Profileitem_Soffice_ProgressPosition
      Value = "-1,-1";
  End
  
 -#ifdef WNT
--
- ProfileItem gid_Profileitem_Soffice_Hideeula
-     ProfileID = gid_Profile_Soffice_Ini;
-     ModuleID = gid_Module_Root;
+ ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
+     ProfileID = gid_Brand_Profile_Soffice_Ini;
+     ModuleID = gid_Module_Root_Brand;
      Section = "Bootstrap";
      Order = 7;
      Key = "HideEula";
@@ -46,9 +45,7 @@
 -    Styles = (INIFILETABLE);
 +    Value = "1";
  End
- 
 -#endif
--
+ 
  ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
      ProfileID = gid_Profile_Uno_Ini;
-     ModuleID = gid_Module_Root;

Copied: trunk/patches/dev300/scp2-user-config-ooo-2.0.diff (from r11993, /trunk/patches/src680/scp2-user-config-ooo-2.0.diff)
==============================================================================
--- /trunk/patches/src680/scp2-user-config-ooo-2.0.diff	(original)
+++ trunk/patches/dev300/scp2-user-config-ooo-2.0.diff	Tue Mar 25 13:21:34 2008
@@ -1,8 +1,8 @@
---- scp2/source/ooo/profileitem_ooo.scp.old	2006-10-11 11:29:58.000000000 +0200
-+++ scp2/source/ooo/profileitem_ooo.scp	2007-01-11 12:26:01.000000000 +0100
-@@ -95,7 +95,7 @@
-   #elif defined MACOSX
+--- scp2/source/ooo/common_brand.scp	2006-10-11 11:29:58.000000000 +0200
++++ scp2/source/ooo/common_brand.scp	2007-01-11 12:26:01.000000000 +0100
+@@ -796,7 +796,7 @@
      Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+   #endif
    #else
 -    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
 +    Value = "$SYSUSERCONFIG/.ooo-2.0";

Modified: trunk/patches/dev300/scs-scp2.diff
==============================================================================
--- trunk/patches/dev300/scs-scp2.diff	(original)
+++ trunk/patches/dev300/scs-scp2.diff	Tue Mar 25 13:21:34 2008
@@ -64,9 +64,9 @@
  .ENDIF
 diff --git scp2/source/ooo/module_lang_template.scp scp2/source/ooo/module_lang_template.scp
 index 860aa9e..15562a0 100755
---- scp2/source/ooo/module_lang_template.scp
-+++ scp2/source/ooo/module_lang_template.scp
-@@ -141,6 +141,9 @@ Module gid_Module_Langpack_Calc_Template
+--- scp2/source/calc/module_calc.scp
++++ scp2/source/calc/module_calc.scp
+@@ -95,6 +95,9 @@ Module gid_Module_Langpack_Calc_Template
               gid_File_Res_Bf_Sc,
               gid_File_Res_Date,
               gid_File_Res_Sc,

Copied: trunk/patches/dev300/transogl-transitions-officecfg.diff (from r11993, /trunk/patches/src680/transogl-transitions-officecfg.diff)
==============================================================================
--- /trunk/patches/src680/transogl-transitions-officecfg.diff	(original)
+++ trunk/patches/dev300/transogl-transitions-officecfg.diff	Tue Mar 25 13:21:34 2008
@@ -84,8 +84,8 @@
  					is allowed. </desc>
  					<label>List of files containing transition effects</label>
  				</info>
--                <value oor:separator=";">vnd.sun.star.expand:$ORIGIN/../share/config/soffice.cfg/simpress/transitions.xml</value>
-+                <value oor:separator=";">vnd.sun.star.expand:$ORIGIN/../share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$ORIGIN/../share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
+-                <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml</value>
++                <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$ORIGIN/../share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
  			</prop>
  			<prop oor:name="EffectFiles" oor:type="oor:string-list">
  				<!-- OldPath: -->

Copied: trunk/patches/dev300/transogl-transitions-scp2.diff (from r11993, /trunk/patches/src680/transogl-transitions-scp2.diff)
==============================================================================
--- /trunk/patches/src680/transogl-transitions-scp2.diff	(original)
+++ trunk/patches/dev300/transogl-transitions-scp2.diff	Tue Mar 25 13:21:34 2008
@@ -18,9 +18,9 @@
 +End
 +#endif
 +
- #if defined UNX && ! defined MACOSX
- 
- File gid_File_Xdg_Impress
+ // new user interface configuration files
+ /*
+ File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml
 @@ -180,6 +180,15 @@ File gid_File_Share_Config_Sofficecfg_Im
      Name = "transitions.xml";
  End
@@ -53,11 +53,11 @@
 --- scp2/source/impress/module_impress.scp	2008-01-08 11:25:39.000000000 +0100
 +++ scp2/source/impress/module_impress.scp	2008-01-08 11:26:49.000000000 +0100
 @@ -51,7 +51,7 @@
-     Files = (gid_File_Exe_Simpress,gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
+     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
      gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu,
      gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu,
 -	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
 +	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml,
- 	gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Xdg_Impress, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu,
+ 	gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu,
      gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf);
  End

Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff	(original)
+++ trunk/patches/dev300/unxsplash-rework.diff	Tue Mar 25 13:21:34 2008
@@ -17,15 +17,15 @@
 @@ -14,6 +14,8 @@ dt	desktop\win32\source\setup				nmake	-	w	dt_setup dt_inc NULL
  dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
  dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
- dt     desktop\os2\source\applauncher                  nmake   -       p       dt_applauncher dt_inc NULL
+ dt	desktop\os2\source\applauncher			nmake	-	p	dt_applauncher dt_inc NULL
 +dt	desktop\unx\source			nmake	-	u	dt_uwrapper	dt_inc NULL
 +dt	desktop\unx\splash			nmake	-	u	dt_usplash	dt_inc NULL
  dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
- dt	desktop\source\pkgchk\unopkg			nmake	-	all	dt_unopkg dt_dp_misc dt_app dt_inc NULL
- dt	desktop\source\pkgchk					nmake	-	all	dt_pkgchk NULL
+ dt	desktop\source\pkgchk\unopkg			nmake	-	all	dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
+ dt	desktop\source\deployment				nmake	-	all	dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc NULL
 @@ -32,5 +34,5 @@ dt	desktop\source\deployment\registry\component		nmake	-	all	dt_dp_registry_comp
- dt	desktop\source\deployment\registry\component		nmake	-	all	dt_dp_registry_component dt_inc NULL
- dt	desktop\source\deployment\registry\configuration	nmake	-	all	dt_dp_registry_configuration dt_inc NULL
+ dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
+ dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
  dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
 -dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_migr NULL
 +dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_migr NULL
@@ -2277,16 +2277,16 @@
  
 diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
 index 8e113d3..2f49288 100644
---- scp2/source/ooo/file_ooo.scp
-+++ scp2/source/ooo/file_ooo.scp
-@@ -341,6 +341,15 @@ File gid_File_Bin_Soffice_Bin
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
+@@ -399,6 +399,15 @@ File gid_File_Bin_Soffice_Bin
      Name = "soffice.bin";
  End
  
 +#if defined(UNX)
 +File gid_File_Bin_QStart_Bin
 +    BIN_FILE_BODY;
-+    Dir = gid_Dir_Program;
++    Dir = gid_Brand_Dir_Program;
 +    Styles = (PACKED, PATCH);
 +    Name = "oosplash.bin";
 +End

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Mar 25 13:21:34 2008
@@ -4,7 +4,7 @@
 
 # -------- Options --------
 
-PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql:../emf+
+PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql:../emf+:../src680-only
 
 OLDEST_SUPPORTED=ooh680-m10
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]