[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Fridrich Strba]

 patches/dev300/extensions_configure.diff |   10 +++++++
 patches/dev300/extensions_packinfo.diff  |   18 ++++++++++++-
 patches/dev300/scp2_extensions.diff      |   42 ++++++++++++++++++++++++++++---
 3 files changed, 66 insertions(+), 4 deletions(-)

New commits:
commit a79380e5c092760e571ab16bb06942344c7ad24f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jun 2 11:10:29 2010 +0200

    Packaging MySQL connector
    
    * patches/dev300/extensions_configure.diff:
    * patches/dev300/extensions_packinfo.diff:
    * patches/dev300/scp2_extensions.diff:

diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 997d579..9d11894 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -61,6 +61,16 @@
  AC_ARG_ENABLE(verbose,
  [  --enable-verbose        Increase build verbosity.
    --disable-verbose       Decrease build verbosity.
+@@ -3960,6 +4172,9 @@
+ AC_SUBST(ENABLE_MYSQLC)
+ 
+ if test "$ENABLE_MYSQLC" = "YES"; then
++
++SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MYSQLC"
++
+ dnl ===================================================================
+ dnl Check for system MySQL
+ dnl ===================================================================
 @@ -5638,6 +5680,7 @@ if test -n "$enable_minimizer" -a "$enab
  else
     AC_MSG_RESULT([no])
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
index 2123250..0bccae2 100644
--- a/patches/dev300/extensions_packinfo.diff
+++ b/patches/dev300/extensions_packinfo.diff
@@ -1,6 +1,6 @@
 --- setup_native/source/packinfo/packinfo_extensions.txt	2008-06-06 22:36:48.000000000 +0200
 +++ setup_native/source/packinfo/packinfo_extensions.txt	2010-03-08 20:27:56.000000000 +0100
-@@ -0,0 +1,241 @@
+@@ -0,0 +1,257 @@
 +# Format:
 +
 +# Start
@@ -228,6 +228,22 @@
 +End
 +
 +Start
++module = "gid_Module_Optional_Extensions_MySQLConnector"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mysql-connector"
++solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mysql-connector"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2008 by Sun Mcrosystems, Inc."
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
++Start
 +module = "gid_Module_Optional_Extensions_OOoBlogger"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-oooblogger"
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index c39eaa0..d1760c1 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -1,6 +1,6 @@
 --- scp2/source/extensions/file_extensions.scp.old	2009-10-27 15:31:48.000000000 +0100
 +++ scp2/source/extensions/file_extensions.scp	2009-10-27 15:36:41.000000000 +0100
-@@ -0,0 +1,240 @@
+@@ -0,0 +1,253 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -210,6 +210,19 @@
 +
 +#endif
 +
++/* ** MySQL Connector ** */
++
++#ifdef WITH_EXTENSION_MYSQLC
++
++File gid_File_Oxt_MySQLConnector
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Brand_Dir_Share_Extension_Install;
++ Name = "mysql-connector-ooo.oxt";
++End
++
++#endif
++
 +/* ** oooblogger ** */
 +
 +#ifdef WITH_EXTENSION_OOOBLOGGER
@@ -308,7 +321,7 @@
 +
 --- scp2/source/extensions/module_extensions.scp.old	2009-10-27 15:31:48.000000000 +0100
 +++ scp2/source/extensions/module_extensions.scp	2009-10-27 15:40:55.000000000 +0100
-@@ -0,0 +1,299 @@
+@@ -0,0 +1,316 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -573,6 +586,23 @@
 +#endif
 +#endif
 +
++/* ** MySQL Connector ** */
++
++#ifdef WITH_EXTENSION_MYSQLC
++#ifdef WITH_EXTENSION_INTEGRATION
++Module gid_Module_Optional_Extensions_MySQLConnector
++ PackageInfo = "packinfo_extensions.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MYSQLC);
++ ParentID = gid_Module_Optional_Extensions;
++ Files = (
++ gid_File_Oxt_MySQLConnector );
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++#endif
++#endif
++
 +/* ** oooblogger ** */
 +
 +#ifdef WITH_EXTENSION_OOOBLOGGER
@@ -727,7 +757,7 @@
 +#endif
 --- scp2/source/extensions/module_extensions.ulf.old	2009-10-27 15:31:48.000000000 +0100
 +++ scp2/source/extensions/module_extensions.ulf	2009-10-27 15:50:25.000000000 +0100
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,139 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -847,6 +877,12 @@
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
 +en-US = "LanguageTool Open Source language checker"
 +
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
++en-US = "MySQL Connector for OpenOffice.org"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
++en-US = "MySQL Connector for OpenOffice.org"
++
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
 +en-US = "Metaweblog Support"
 +