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

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12889 - in trunk: . patches/dev300
Date: Mon, 16 Jun 2008 13:38:46 +0000 (UTC)
Author: rengelhard
Date: Mon Jun 16 13:38:45 2008
New Revision: 12889
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12889&view=rev

Log:
2008-06-16  Rene Engelhard  <rene debian org>

        * patches/dev300/no-fontooo-wizard.diff,
          patches/dev300/no-mozilla-plug-in-option.diff,
          patches/dev300/debian-system-jfreereport.diff,
          patches/dev300/configures-explicit-arch.diff: update


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/debian-system-jfreereport.diff
   trunk/patches/dev300/no-fontooo-wizard.diff
   trunk/patches/dev300/no-mozilla-plug-in-option.diff

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Mon Jun 16 13:38:45 2008
@@ -201,13 +201,13 @@
 diff -u -u -r1.10.6.1 makefile.mk
 --- libxslt/makefile.mk	2 Jan 2008 17:28:49 -0000	1.10.6.1
 +++ libxslt/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -100,7 +100,7 @@
+@@ -97,7 +97,7 @@
  .ENDIF                  # "$(COMNAME)"=="sunpro5"
  CONFIGURE_DIR=
- CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
+ CONFIGURE_ACTION=.$/configure
 -CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xslt_CFLAGS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB)
 +CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(xslt_CFLAGS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB)
- BUILD_ACTION=$(GNUMAKE)
+ BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
  BUILD_FLAGS+= -j$(EXTMAXPROCESS)
  BUILD_DIR=$(CONFIGURE_DIR)
 Index: python/makefile.mk

Modified: trunk/patches/dev300/debian-system-jfreereport.diff
==============================================================================
--- trunk/patches/dev300/debian-system-jfreereport.diff	(original)
+++ trunk/patches/dev300/debian-system-jfreereport.diff	Mon Jun 16 13:38:45 2008
@@ -30,21 +30,30 @@
 diff -u -u -r1.10.2.1 makefile.mk
 --- reportdesign/util/makefile.mk    11 Jan 2008 08:21:17 -0000      1.10.2.1
 +++ reportdesign/util/makefile.mk    15 Jan 2008 01:33:52 -0000
-@@ -226,17 +226,6 @@
-                        $(ZIP1DIR)$/readme_en-US.txt
+@@ -216,25 +216,11 @@
+ COMPONENT_JARFILES = \
+ 	$(EXTENSIONDIR)$/sun-report-builder.jar
  
- REPORTJARFILES := \
--       $(ZIP1DIR)$/flute-1.3-jfree-20061107.jar                               \
--       $(ZIP1DIR)$/jcommon-1.0.10.jar                                         \
--       $(ZIP1DIR)$/jcommon-serializer-0.2.0.jar                               \
--       $(ZIP1DIR)$/libfonts-0.3.3.jar                                         \
--       $(ZIP1DIR)$/libformula-0.1.14.jar                                      \
--       $(ZIP1DIR)$/liblayout-0.2.8.jar                                        \
--       $(ZIP1DIR)$/libloader-0.3.6.jar                                        \
--       $(ZIP1DIR)$/librepository-0.1.4.jar                                    \
--       $(ZIP1DIR)$/libxml-0.9.9.jar                                           \
--       $(ZIP1DIR)$/pentaho-reporting-flow-engine-0.9.2.jar                    \
--       $(ZIP1DIR)$/sac.jar                                                    \
-        $(ZIP1DIR)$/sun-report-builder.jar
+-# .jar files from solver
+-COMPONENT_EXTJARFILES = \
+-	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar				\
+-	$(EXTENSIONDIR)$/jcommon-1.0.10.jar					\
+-	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
+-	$(EXTENSIONDIR)$/libfonts-0.3.3.jar					\
+-	$(EXTENSIONDIR)$/libformula-0.1.14.jar					\
+-	$(EXTENSIONDIR)$/liblayout-0.2.8.jar					\
+-	$(EXTENSIONDIR)$/libloader-0.3.6.jar					\
+-	$(EXTENSIONDIR)$/librepository-0.1.4.jar				\
+-	$(EXTENSIONDIR)$/libxml-0.9.9.jar					\
+-	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar		\
+-	$(EXTENSIONDIR)$/sac.jar
+-
+ COMPONENT_MANIFEST_GENERIC:=TRUE
+ COMPONENT_MANIFEST_SEARCHDIR:=registry
+ 
+ # make sure to add your custom files here
+-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES)
++EXTENSION_PACKDEPS=$(COMPONENT_HTMLFILES)
  
  # --- Targets ----------------------------------
+ 

Modified: trunk/patches/dev300/no-fontooo-wizard.diff
==============================================================================
--- trunk/patches/dev300/no-fontooo-wizard.diff	(original)
+++ trunk/patches/dev300/no-fontooo-wizard.diff	Mon Jun 16 13:38:45 2008
@@ -5,11 +5,11 @@
 diff -u -u -r1.31 Common.xcu
 --- officecfg/registry/data/org/openoffice/Office/Common.xcu	23 Mar 2005 10:53:46 -0000	1.31
 +++ officecfg/registry/data/org/openoffice/Office/Common.xcu	20 Jun 2005 17:38:08 -0000
-@@ -500,21 +500,6 @@
+@@ -509,21 +509,6 @@
            <value >private:image/3216</value>
          </prop>
        </node>
--      <node oor:name="m16" oor:op="replace" install:module="dicooo">
+-      <node oor:name="m15" oor:op="replace" install:module="dicooo">
 -        <prop oor:name="URL"  oor:type="xs:string">
 -          <value >macro:///Launcher.FontOOo.StartFontOOo</value>
 -        </prop>

Modified: trunk/patches/dev300/no-mozilla-plug-in-option.diff
==============================================================================
--- trunk/patches/dev300/no-mozilla-plug-in-option.diff	(original)
+++ trunk/patches/dev300/no-mozilla-plug-in-option.diff	Mon Jun 16 13:38:45 2008
@@ -1,6 +1,6 @@
 --- svx/source/dialog/optinet2.cxx-old	2007-05-04 22:59:31.000000000 +0200
 +++ svx/source/dialog/optinet2.cxx	2007-05-04 22:59:56.000000000 +0200
-@@ -1737,188 +1737,6 @@
+@@ -1813,199 +1813,6 @@
  	maProtectRecordsPB.SetText( sNewText );
  }
  
@@ -54,18 +54,19 @@
 -#endif
 -
 -#define NPP_PATH_MAX 2048
--inline ::rtl::OString getDllURL( void )
+-inline bool getDllURL(rtl::OString * path)
 -{
--//    ::rtl::OUString libPath(rtl::OUString::createFromAscii("libcui680li.so"));
+-    OSL_ASSERT(path != NULL);
 -    ::rtl::OUString dirPath/*dllPath, */;
--    osl::Module::getUrlFromAddress(reinterpret_cast< oslGenericFunction >(getDllURL), dirPath);
+-    if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
+-        return false;
+-    }
 -    dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
 -//    osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
 -    ::rtl::OUString sysDirPath;
 -	osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
--    ::rtl::OString oSysDirPath;
--    oSysDirPath = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
--    return oSysDirPath;
+-    *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
+-    return true;
 -}
 -
 -BOOL MozPluginTabPage::isInstalled()
@@ -92,7 +93,9 @@
 -    // get the real file path
 -    char realFilePath[NPP_PATH_MAX] = {0};
 -    ::rtl::OString tempString;
--    tempString = getDllURL();
+-    if (!getDllURL(&tempString)) {
+-        return false;
+-    }
 -    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
 -	strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
 -
@@ -105,7 +108,9 @@
 -		BOOL ret = true;
 -	::rtl::OString tempString;
 -	char realFilePath[NPP_PATH_MAX] = {0};
--    tempString = getDllURL();
+-    if (!getDllURL(&tempString)){
+-        return false;
+-    }
 -    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
 -	if(! lc_isInstalled(realFilePath))
 -		ret =true;
@@ -139,7 +144,9 @@
 -    // get the real file path
 -    char realFilePath[NPP_PATH_MAX] = {0};
 -    ::rtl::OString tempString;
--    tempString = getDllURL();
+-    if (!getDllURL(&tempString)) {
+-        return false;
+-    }
 -    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
 -	strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
 -
@@ -151,7 +158,9 @@
 -#ifdef WNT
 -	::rtl::OString tempString;
 -	char realFilePath[NPP_PATH_MAX] = {0};
--    tempString = getDllURL();
+-    if (!getDllURL(&tempString)) {
+-        return false;
+-    }
 -    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
 -	if( !lc_installPlugin(realFilePath))
 -		return true;
@@ -176,7 +185,9 @@
 -#ifdef WNT
 -	::rtl::OString tempString;
 -	char realFilePath[NPP_PATH_MAX] = {0};
--    tempString = getDllURL();
+-    if (!getDllURL(&tempString)) {
+-        return false;
+-    }
 -    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
 -	if(!lc_uninstallPlugin(realFilePath))
 -		return true;
@@ -189,114 +200,3 @@
  /* -------------------------------------------------------------------------*/
  
  class MailerProgramCfg_Impl : public utl::ConfigItem
---- svx/source/dialog/optinet2.hxx-old	2007-05-04 23:00:51.000000000 +0200
-+++ svx/source/dialog/optinet2.hxx	2007-05-04 23:01:01.000000000 +0200
-@@ -307,29 +307,6 @@
- 	virtual	void 		Reset( const SfxItemSet& rSet );
- };
- 
--//added by jmeng begin
--class MozPluginTabPage : public SfxTabPage
--{
--    FixedLine       aMSWordGB;
--	CheckBox		aWBasicCodeCB;
--
--	BOOL isInstalled(void);
--	BOOL installPlugin(void);
--	BOOL uninstallPlugin(void);
--
--	MozPluginTabPage( Window* pParent, const SfxItemSet& rSet );
--	virtual ~MozPluginTabPage();
--
--public:
--
--	static SfxTabPage*	Create( Window* pParent,
--								const SfxItemSet& rAttrSet );
--
--	virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
--	virtual	void 		Reset( const SfxItemSet& rSet );
--
--};
--//added by jmeng end
- #endif
- 
- /* -----------------------------20.06.01 16:32--------------------------------
---- svx/source/options/optinet2.src-old	2007-05-04 23:02:09.000000000 +0200
-+++ svx/source/options/optinet2.src	2007-05-04 23:02:33.000000000 +0200
-@@ -45,32 +45,6 @@
- /*                                                                      */
- /************************************************************************/
- 
--// added by jmeng begin
--
--TabPage RID_SVXPAGE_INET_MOZPLUGIN
--{
--	OutputSize = TRUE ;
--	Size = MAP_APPFONT ( 260 , 185 ) ;
--	SVLook = TRUE ;
--	Hide = TRUE ;
--
--    FixedLine GB_MOZPLUGIN
--	{
--		Pos = MAP_APPFONT ( 6 , 3 ) ;
--        Size = MAP_APPFONT (  248 , 8  ) ;
--		Text[ en-US ] = "Mozilla Plug-in";
--	};
--	CheckBox CB_MOZPLUGIN_CODE
--	{
--		Pos = MAP_APPFONT ( 12 , 14 ) ;
--		Size = MAP_APPFONT (  236 , 10  ) ;
--		TabStop = TRUE ;
--		Text [ en-US ] = "~Enable" ;
--	};
--};
--
--//added by jmeng end
--
- TabPage RID_SVXPAGE_INET_PROXY
- {
- 	HelpId = HID_OPTIONS_PROXY ;
---- svx/source/dialog/treeopt.src-old	2007-05-04 23:03:46.000000000 +0200
-+++ svx/source/dialog/treeopt.src	2007-05-04 23:04:15.000000000 +0200
-@@ -191,7 +191,6 @@
- 			< "Proxy" ;  RID_SVXPAGE_INET_PROXY; > ;
- 			< "Search" ;  RID_SVXPAGE_INET_SEARCH; > ;
- 			< "E-mail" ;  RID_SVXPAGE_INET_MAIL; > ;
--			< "Mozilla Plug-in" ;  RID_SVXPAGE_INET_MOZPLUGIN; > ;
- 		};
- 		//modified by jmeng end
- 	};
---- svx-old/inc/svx/dialogs.hrc     2006-06-05 02:13:40.000000000 +0200
-+++ svx/inc/svx/dialogs.hrc 2006-06-05 06:37:48.000000000 +0200
-@@ -250,11 +250,6 @@
- #define RID_SVXPAGE_INET_CACHE              (RID_SVX_START + 158)
- #define RID_SVXPAGE_INET_TYPE               (RID_SVX_START + 159)
- #define RID_SVXPAGE_INET_SEARCH                                (RID_SVX_START + 160)
--//added by jmeng begin
--#define RID_SVXPAGE_INET_MOZPLUGIN                     (RID_SVX_START + 2161)
--#define GB_MOZPLUGIN   1
--#define CB_MOZPLUGIN_CODE      2
--//added by jmeng end
- #define RID_SVXPAGE_INET_SECURITY                      (RID_SVX_START + 200)
-
- #define RID_SVXPAGE_BROWSER_OTHER           (RID_SVX_START + 202)
---- svx-old/source/dialog/treeopt.cxx   2006-05-02 17:34:07.000000000 +0200
-+++ svx/source/dialog/treeopt.cxx       2006-06-05 06:45:20.000000000 +0200
-@@ -325,9 +325,6 @@
-                case RID_SVXPAGE_ACCESSIBILITYCONFIG:           fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
-                case RID_SVXPAGE_SSO:                                           fnCreate = ( CreateTabPage ) GetSSOCreator(); break;
-                case RID_SVXPAGE_OPTIONS_CTL:                           fnCreate = &SvxCTLOptionsPage::Create ; break;
--               //added by jmeng begin
--               case RID_SVXPAGE_INET_MOZPLUGIN:                        fnCreate = &MozPluginTabPage::Create; break;
--               //added by jmeng end
-                case RID_SVXPAGE_OPTIONS_JAVA:                          fnCreate = &SvxJavaOptionsPage::Create ; break;
-        }
-
-@@ -370,7 +367,6 @@
-     { "Internet",           "Proxy",                RID_SVXPAGE_INET_PROXY },
-     { "Internet",           "Search",               RID_SVXPAGE_INET_SEARCH },
-     { "Internet",           "Email",                RID_SVXPAGE_INET_MAIL },
--    { "Internet",           "MozillaPlugin",        RID_SVXPAGE_INET_MOZPLUGIN },
-     { "LoadSave",           NULL,                   SID_FILTER_DLG },
-     { "LoadSave",           "General",              RID_SFXPAGE_SAVE },
-     { "LoadSave",           "VBAProperties",        SID_OPTFILTER_MSOFFICE },
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]