GNOME.org
 

ooo-build r14277 - in branches/ooo-build-3-0: . patches/dev300 patches/scsolver

Author: strba
Date: Fri Oct 10 11:27:07 2008
New Revision: 14277
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14277&view=rev

Log:
package scsolver as ooobasis3.0-scsolver + massage patches

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/buildfix-x86-64-visibility-workaround.diff
   branches/ooo-build-3-0/patches/dev300/cjk-character-units-fix.diff
   branches/ooo-build-3-0/patches/dev300/cjk-character-units-imp.diff
   branches/ooo-build-3-0/patches/dev300/cjk-character-units-ui.diff
   branches/ooo-build-3-0/patches/dev300/jvmfwk-gij-paths.diff
   branches/ooo-build-3-0/patches/dev300/nsplugin-path.diff
   branches/ooo-build-3-0/patches/dev300/padmin-nofontconfig.diff
   branches/ooo-build-3-0/patches/dev300/plus-minus-sw-navigator2.diff
   branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff
   branches/ooo-build-3-0/patches/dev300/quiet-build.diff
   branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff
   branches/ooo-build-3-0/patches/dev300/speed-getfilestatus-dtype.diff
   branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff
   branches/ooo-build-3-0/patches/dev300/wpgimporter.diff
   branches/ooo-build-3-0/patches/dev300/wpsimport-filter.diff
   branches/ooo-build-3-0/patches/dev300/wpsimport-scp2.diff
   branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff
   branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff

Modified: branches/ooo-build-3-0/patches/dev300/buildfix-x86-64-visibility-workaround.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/buildfix-x86-64-visibility-workaround.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/buildfix-x86-64-visibility-workaround.diff	Fri Oct 10 11:27:07 2008
@@ -42,8 +42,8 @@
 +ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
 +		"@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
- ToFile( "HAVE_LD_BDIRECT",   "@HAVE_LD_BDIRECT@","e" );
  ToFile( "CXX",               $CXX,               "e" );
+ ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
 diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk
 index 4afa0b6..91d9bf1 100644
 --- solenv/inc/unxlngx6.mk

Modified: branches/ooo-build-3-0/patches/dev300/cjk-character-units-fix.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/cjk-character-units-fix.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/cjk-character-units-fix.diff	Fri Oct 10 11:27:07 2008
@@ -1,44 +1,3 @@
-diff -uNpr officecfg-orig/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs
---- officecfg-orig/registry/schema/org/openoffice/Office/Writer.xcs	2008-03-07 12:01:16.000000000 +0800
-+++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs	2008-03-03 14:49:15.000000000 +0800
-@@ -1596,6 +1596,18 @@
- 					</info>
- 					<value>true</value>
- 				</prop>	
-+				<!-- added for apply char unit 2006-12-1 -->
-+				<prop oor:name="ApplyCharUnit" oor:type="xs:boolean">
-+					<!-- OldPath: Writer/Layout -->
-+					<!-- OldLocation: Soffice.cfg -->
-+					<!-- UIHints: Tools - Options - Text document - Layout - [Section] Apply char unit -->
-+					<info>
-+						<author>OS</author>
-+						<desc>apply char unit to calculate the paragraph's indent</desc>
-+						<label>apply char unit</label>
-+					</info>
-+					<value>true</value>
-+				</prop>
- 			</group>
- 			<group oor:name="Zoom">
- 				<info>
-@@ -1659,18 +1659,6 @@
- 					</info>
- 					<value>false</value>
- 				</prop>
--				<!-- added for apply char unit 2006-12-1 -->
--				<prop oor:name="ApplyCharUnit" oor:type="xs:boolean">
--					<!-- OldPath: Writer/Layout -->
--					<!-- OldLocation: Soffice.cfg -->
--					<!-- UIHints: Tools - Options - Text document - Layout - [Section] Apply char unit -->
--					<info>
--						<author>OS</author>
--						<desc>apply char unit to calculate the paragraph's indent</desc>
--						<label>apply char unit</label>
--					</info>
--					<value>true</value>
--				</prop>
- 			</group>
- 		</group>
- 		<group oor:name="Grid">
 diff -uNpr sw-orig/source/ui/app/appopt.cxx sw/source/ui/app/appopt.cxx
 --- sw-orig/source/ui/app/appopt.cxx	2008-02-22 11:55:53.000000000 +0800
 +++ sw/source/ui/app/appopt.cxx	2008-03-04 22:18:51.000000000 +0800
@@ -104,9 +63,9 @@
      aContentConfig(bWeb, *this),
      aLayoutConfig(bWeb, *this),
      aGridConfig(bWeb, *this),
-@@ -351,7 +352,7 @@ void SwLayoutViewConfig::Commit()
-             case 16: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
-             case 17: bSet = rParent.IsVRulerRight(); break;// "Window/IsVerticalRulerRight",
+@@ -336,7 +337,7 @@ void SwLayoutViewConfig::Commit()
+             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",
 +            case 19: bSet = rParent.IsApplyCharUnit(); break;// "Other/ApplyCharUnit",
@@ -140,16 +99,14 @@
 diff -uNpr sw-orig/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
 --- sw-orig/source/ui/uiview/view.cxx	2008-02-25 17:22:20.000000000 +0800
 +++ sw/source/ui/uiview/view.cxx	2008-02-28 16:03:47.000000000 +0800
-@@ -273,6 +273,9 @@
+@@ -273,6 +273,7 @@
  #include <com/sun/star/document/XDocumentProperties.hpp>
  #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
  
-+#ifndef _SVTOOLS_CJKOPTIONS_HXX
 +#include <svtools/cjkoptions.hxx>
-+#endif
- 
  
  using namespace ::com::sun::star;
+ using namespace ::com::sun::star::uno;
 @@ -1065,13 +1067,14 @@ SwView::SwView( SfxViewFrame *_pFrame, S
      FieldUnit eMetric = pUsrPref->GetHScrollMetric();
  

Modified: branches/ooo-build-3-0/patches/dev300/cjk-character-units-imp.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/cjk-character-units-imp.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/cjk-character-units-imp.diff	Fri Oct 10 11:27:07 2008
@@ -528,7 +528,7 @@
 diff -uNr sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/textsh1.cxx
 --- sw/source/ui/shells/textsh1.cxx	2007-12-17 01:41:56.000000000 +0800
 +++ sw/source/ui/shells/textsh1.cxx	2007-12-17 11:14:01.000000000 +0800
-@@ -807,6 +807,10 @@
+@@ -863,6 +863,10 @@
  		{
              FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &GetView()));
              SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< UINT16 >(eMetric)));
@@ -538,18 +538,10 @@
 +
              SfxItemSet aCoreSet( GetPool(),
                              RES_PARATR_BEGIN,           RES_PARATR_END - 1,
-                             RES_FRMATR_BEGIN,           RES_FRMATR_END - 1,
-diff -uNr sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
+                             // --> OD 2008-02-25 #refactorlists#
+iff -uNr sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
 --- sw/source/ui/uiview/view.cxx	2007-12-17 01:41:57.000000000 +0800
 +++ sw/source/ui/uiview/view.cxx	2007-12-17 11:35:56.000000000 +0800
-@@ -267,6 +267,7 @@
- 
- #include <unomid.h>
- 
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
 @@ -1062,9 +1063,21 @@
      pVRuler->SetZoom( aZoomFract );
      pHRuler->SetDoubleClickHdl(LINK( this, SwView, ExecRulerClick ));

Modified: branches/ooo-build-3-0/patches/dev300/cjk-character-units-ui.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/cjk-character-units-ui.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/cjk-character-units-ui.diff	Fri Oct 10 11:27:07 2008
@@ -4,7 +4,7 @@
 @@ -1595,7 +1595,19 @@
  						<label>Use squared paper mode</label>
  					</info>
- 					<value>false</value>
+ 					<value>true</value>
 -				</prop>	
 +				</prop>
 +				<!-- added for apply char unit 2006-12-1 -->
@@ -208,9 +208,9 @@
 +#include <svtools/eitem.hxx>
 +#endif
 +
+ using namespace ::com::sun::star;
+ 
  /* -----------------22.10.98 15:12-------------------
-  *
-  * --------------------------------------------------*/
 @@ -135,6 +139,7 @@
      aTabFT              ( this, SW_RES( FT_TAB ) ),
      aTabMF              ( this, SW_RES( MF_TAB ) ),

Modified: branches/ooo-build-3-0/patches/dev300/jvmfwk-gij-paths.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/jvmfwk-gij-paths.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/jvmfwk-gij-paths.diff	Fri Oct 10 11:27:07 2008
@@ -19,9 +19,9 @@
      *size = sizeof (ar) / sizeof (char*);
      return ar;
 @@ -65,6 +69,20 @@
-     static char const* ar[]= {
-           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-           "/gcj-4.1.1/libjvm.so",
+         "/libjvm.so",
+         "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
+         "/gcj-4.1.1/libjvm.so",
 +	  "/gcj-4.3-90/libjvm.so",
 +	  "/gcj-4.2-81/libjvm.so",
 +	  "/gcj-4.2/libjvm.so",

Modified: branches/ooo-build-3-0/patches/dev300/nsplugin-path.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/nsplugin-path.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/nsplugin-path.diff	Fri Oct 10 11:27:07 2008
@@ -103,7 +103,7 @@
 +#endif
 +
  // *aResult points the static string holding "/opt/staroffice8"
- int findReadSversion(void** aResult, int bWnt, const char* tag, const char* entry)
+ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const char* /*entry*/)
  {
 @@ -137,9 +228,22 @@ int findReadSversion(void** aResult, int
      // Filename of lnk file, eg. "soffice"

Modified: branches/ooo-build-3-0/patches/dev300/padmin-nofontconfig.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/padmin-nofontconfig.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/padmin-nofontconfig.diff	Fri Oct 10 11:27:07 2008
@@ -17,8 +17,8 @@
  
  SRS1NAME=$(TARGET)
 @@ -94,11 +98,13 @@ SLOFILES=\
- 	$(SLO)$/newppdlg.obj		\
  	$(SLO)$/progress.obj		\
+ 	$(SLO)$/newppdlg.obj		\
  	$(SLO)$/prtsetup.obj		\
 -	$(SLO)$/fontentry.obj		\
  	$(SLO)$/helper.obj			\

Modified: branches/ooo-build-3-0/patches/dev300/plus-minus-sw-navigator2.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/plus-minus-sw-navigator2.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/plus-minus-sw-navigator2.diff	Fri Oct 10 11:27:07 2008
@@ -1,8 +1,8 @@
 --- sw/source/ui/inc/conttree.hxx.orig	2008-04-23 13:28:30.000000000 +0800
 +++ sw/source/ui/inc/conttree.hxx	2008-04-23 13:31:34.000000000 +0800
-@@ -43,6 +43,9 @@
+@@ -33,6 +33,9 @@
+ #include <svtools/svtreebx.hxx>
  #include "swcont.hxx"
- #endif
  
 +#include<map>
 +//using namespace std;

Modified: branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff	Fri Oct 10 11:27:07 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 @@
- packageversion = "%PACKAGEVERSION"
+ destpath = "/opt"
+ packageversion = "%OOOPACKAGEVERSION"
  End
- 
 +
 +
 +# Package definitions for OxygenOffice Professional

Modified: branches/ooo-build-3-0/patches/dev300/quiet-build.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/quiet-build.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/quiet-build.diff	Fri Oct 10 11:27:07 2008
@@ -13,7 +13,7 @@
  	@echo ------------------------------
 +.ENDIF
  	@echo Making: $@
- .IF "$(ENABLE_PCH)"!=""
+ .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
  # just a helper var	
 @@ -128,11 +130,11 @@ $(SLO)$/%.obj : %.cxx
  	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx

Modified: branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff	Fri Oct 10 11:27:07 2008
@@ -6,8 +6,8 @@
 --- desktop/scripts/soffice.sh	5 Jul 2006 22:33:58 -0000	1.25
 +++ desktop/scripts/soffice.sh	9 Sep 2006 11:07:33 -0000
 @@ -189,6 +189,29 @@
- OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
- export OPENOFFICE_MOZILLA_FIVE_HOME
+     fi
+ fi
  
 +if [ -z "$MOZILLA_CERTIFICATE_FOLDER" ]; then
 +	db=""

Modified: branches/ooo-build-3-0/patches/dev300/speed-getfilestatus-dtype.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/speed-getfilestatus-dtype.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/speed-getfilestatus-dtype.diff	Fri Oct 10 11:27:07 2008
@@ -134,9 +134,9 @@
  
  #ifndef _ERRNO_H
  #include <errno.h>
-@@ -69,6 +73,9 @@
+@@ -56,6 +60,9 @@
+ #include "file_path_helper.hxx"
  #include "file_error_transl.h"
- #endif
  
 +#ifdef _DIRENT_HAVE_D_TYPE
 +#include "file_impl.hxx"

Modified: branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff	Fri Oct 10 11:27:07 2008
@@ -211,15 +211,15 @@
      #ifdef MACOSX
      /* #i84053# ignore -psn on Mac
        Platform dependent #ifdef here is ugly, however this is currently
-@@ -929,7 +929,8 @@
+@@ -859,7 +859,8 @@
  {
      osl::MutexGuard  aMutexGuard( m_aMutex );
-
+ 
 -    return m_eArgumentCount == NONE ||
 +    return m_eArgumentCount == NONE ||
 +           ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_SPLASHPIPE ].getLength() )) ||
             ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() )) ||
-            ( ( m_eArgumentCount == ONE ) && ( m_aBoolParams[ CMD_BOOLPARAM_PSN ] ));
+            ( ( m_eArgumentCount == ONE ) && m_aBoolParams[ CMD_BOOLPARAM_PSN ] );
  }
 diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
 index 877a909..83f1c67 100644
@@ -2272,10 +2272,10 @@
 index 8e113d3..2f49288 100644
 --- scp2/source/ooo/common_brand.scp
 +++ scp2/source/ooo/common_brand.scp
-@@ -399,6 +399,15 @@ File gid_File_Bin_Soffice_Bin
+@@ -414,6 +414,15 @@ File gid_Brand_File_Bin_Soffice_Bin
      Name = "soffice.bin";
  End
- 
+
 +#if defined(UNX)
 +File gid_File_Bin_QStart_Bin
 +    BIN_FILE_BODY;
@@ -2286,7 +2286,7 @@
 +#endif
 +
  // use this for high detail file open dialog >= 5.1 windows
- // #ifdef WNT
+ #ifdef WNT
  File gid_Brand_File_Bin_Soffice_Bin_Manifest
 diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
 index 1576807..9492703 100644

Modified: branches/ooo-build-3-0/patches/dev300/wpgimporter.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/wpgimporter.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/wpgimporter.diff	Fri Oct 10 11:27:07 2008
@@ -106,7 +106,7 @@
 +++ scp2/source/graphicfilter/file_graphicfilter.scp	7 May 2007 13:55:23 -0000
 @@ -67,3 +67,5 @@
  
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svg, svgfilter )
+ STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter )
  
 +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport )
 +

Modified: branches/ooo-build-3-0/patches/dev300/wpsimport-filter.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/wpsimport-filter.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/wpsimport-filter.diff	Fri Oct 10 11:27:07 2008
@@ -1,16 +1,16 @@
 --- filter/source/config/fragments/fcfg_writer.mk	13 Jul 2006 09:12:35 -0000	1.9
 +++ filter/source/config/fragments/fcfg_writer.mk	18 Dec 2006 13:22:05 -0000	1.9.90.1
-@@ -46,6 +46,7 @@ T4_WRITER = \
+@@ -18,6 +18,7 @@ T4_WRITER = \
+     writer_Rich_Text_Format \
      writer_StarOffice_XML_Writer \
-     $(T4_WRITER_BINFILTER) \
      writer_WordPerfect_Document \
 +    writer_MS_Works_Document \
      writer_T602_Document \
      writer_Text \
      writer_Text_encoded \
-@@ -79,6 +80,7 @@ F4_WRITER = \
+@@ -51,6 +52,7 @@ F4_WRITER = \
+ 	Rich_Text_Format \
  	StarOffice_XML__Writer_ \
- 	$(F4_WRITER_BINFILTER) \
  	WordPerfect \
 +	MS_Works \
 	T602Document \

Modified: branches/ooo-build-3-0/patches/dev300/wpsimport-scp2.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/wpsimport-scp2.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/wpsimport-scp2.diff	Fri Oct 10 11:27:07 2008
@@ -11,12 +11,11 @@
  STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 --- scp2/source/writer/module_writer.scp	2 Jan 2007 15:31:51 -0000	1.17
 +++ scp2/source/writer/module_writer.scp	29 Jan 2007 10:54:40 -0000	1.16.158.2
-@@ -52,7 +52,7 @@
+@@ -52,6 +52,7 @@
      gid_File_Lib_Swd,
      gid_File_Lib_Swui,
      gid_File_Lib_Wpft,
--    gid_File_Lib_Writerfilter,
 +    gid_File_Lib_Msworks,
-     gid_File_Lib_T602Filter,
      gid_File_Lib_Writerfilter,
-     gid_File_Lib_Wlwp,
+     gid_File_Lib_T602Filter,
+     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,

Modified: branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff
==============================================================================
--- branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff	(original)
+++ branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff	Fri Oct 10 11:27:07 2008
@@ -1,5 +1,3 @@
-diff --git scp2/prj/build.lst scp2/prj/build.lst
-index 111afe4..1b864f7 100644
 --- scp2/prj/build.lst
 +++ scp2/prj/build.lst
 @@ -17,6 +17,7 @@ cp    scp2\source\layout          nmake    -    all    cp_layout cp_langmacros N
@@ -10,9 +8,6 @@
  cp    scp2\source\quickstart      nmake    -    all    cp_quickstart cp_langmacros cp_langtemplates NULL
  cp    scp2\source\sdkoo           nmake    -    all    cp_sdkoo cp_langmacros cp_langtemplates NULL
  cp    scp2\source\testtool        nmake    -    all    cp_testtool cp_langmacros cp_langtemplates NULL
-diff --git scp2/source/scsolver/file_scsolver.scp scp2/source/scsolver/file_scsolver.scp
-new file mode 100644
-index 0000000..4c7a813
 --- /dev/null
 +++ scp2/source/scsolver/file_scsolver.scp
 @@ -0,0 +1,8 @@
@@ -89,9 +84,6 @@
 +
 +# --- File ---------------------------------------------------------
 +.INCLUDE :  target.mk
-diff --git scp2/source/scsolver/module_scsolver.scp scp2/source/scsolver/module_scsolver.scp
-new file mode 100644
-index 0000000..ac9b7d3
 --- /dev/null
 +++ scp2/source/scsolver/module_scsolver.scp
 @@ -0,0 +1,10 @@
@@ -105,9 +97,6 @@
 +    ParentID = gid_Module_Root;
 +    Styles = (HIDDEN_ROOT);
 +End
-diff --git scp2/source/scsolver/module_scsolver.ulf scp2/source/scsolver/module_scsolver.ulf
-new file mode 100644
-index 0000000..cab3a2e
 --- /dev/null
 +++ scp2/source/scsolver/module_scsolver.ulf
 @@ -0,0 +1,6 @@
@@ -117,8 +106,6 @@
 +
 +[STR_DESC_MODULE_ROOT_EXTENSION_SCSOLVER]
 +en-US = "The linear and non-linear optimization solver for Calc."
-diff --git scp2/util/makefile.mk scp2/util/makefile.mk
-index 329a03a..42eac10 100644
 --- scp2/util/makefile.mk
 +++ scp2/util/makefile.mk
 @@ -91,6 +91,11 @@ SCP1FILES  = installation_ooo.par          \

Modified: branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff
==============================================================================
--- branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff	(original)
+++ branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff	Fri Oct 10 11:27:07 2008
@@ -1,5 +1,3 @@
-diff --git setup_native/source/packinfo/packinfo_office.txt setup_native/source/packinfo/packinfo_office.txt
-index a13b5cf..f22d2bb 100755
 --- setup_native/source/packinfo/packinfo_office.txt
 +++ setup_native/source/packinfo/packinfo_office.txt
 @@ -812,3 +812,19 @@ destpath = "/opt"
@@ -9,10 +7,10 @@
 +Start
 +module = "gid_Module_Root_Extension_ScSolver"
 +script = "shellscripts_extensions.txt"
-+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-scsolver"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-scsolver"
 +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
-+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-scsolver"
-+linuxreplaces = "%BASISPACKAGEPREFIX%OOOBASEVERSION-scsolver"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-scsolver"
++linuxreplaces = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-scsolver"
 +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
 +freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
 +copyright = "2005-2008 by Kohei Yoshida"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]