[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac scp2/source setup_native/source

[Libreoffice Gerrit user]

 configure.ac                                         |    3 ---
 scp2/source/extensions/module_extensions.scp         |   14 --------------
 scp2/source/extensions/module_extensions.ulf         |    6 ------
 setup_native/source/packinfo/packinfo_extensions.txt |   15 ---------------
 4 files changed, 38 deletions(-)

New commits:
commit 6e10a1e7d53ce3a90bd50ea074765ba700127e37
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 27 19:07:04 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Aug 28 20:35:03 2018 +0200

    Remove Extensions_MySQLConnector junk
    
    ...left over from 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc into
    connectivity as a library".  (Apparently, for one, a module's Files that don't
    exist are ignored, so 8ecf5e1815b5459bc0bbcdfb398d3bd53b0c2861 "Build fix, make
    install: mysql-connector-ooo extension is gone" removing
    gid_File_Oxt_MySQLConnector but not
    gid_Module_Optional_Extensions_MySQLConnector referencing it didn't cause
    trouble; and for another, an empty module is ignored, so there were no
    extension-mysql-connector packages generated any more---but better clean up the
    junk anyway.)
    
    Reviewed-on: https://gerrit.libreoffice.org/59669
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 5988d888099d018ca1000bb17341c9529c538649)
    
    Change-Id: If598a968dfbbe9b5f16d735e8011e192cbd4178b

diff --git a/configure.ac b/configure.ac
index 70c0c11a1baf..e865649034c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8131,9 +8131,6 @@ AC_SUBST(MARIADBC_MINOR)
 AC_SUBST(MARIADBC_MICRO)
 
 if test "$ENABLE_MARIADBC" = "TRUE"; then
-
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MARIADBC"
-
     dnl ===================================================================
     dnl Check for system MariaDB
     dnl ===================================================================
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 6db143fce8bc..7c14cfeda594 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -105,20 +105,6 @@ Module gid_Module_Optional_Extensions_LanguageTool
 End
 #endif
 
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MARIADBC
-Module gid_Module_Optional_Extensions_MySQLConnector
- PackageInfo = "packinfo_extensions.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MARIADBC);
- ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Oxt_MySQLConnector );
- Default = YES;
- Styles = ( );
-End
-#endif
-
 /* ** Script provider for BeanShell ** */
 
 #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 02de867b4ac8..a5fb2238fabb 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -52,12 +52,6 @@ en-US = "LanguageTool Open Source language checker"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
 en-US = "LanguageTool Open Source language checker"
 
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MARIADBC]
-en-US = "MySQL Connector"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MARIADBC]
-en-US = "MySQL Connector"
-
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
 en-US = "Script provider for BeanShell"
 
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index f08fdfc197d6..6b2cf0612e52 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -110,21 +110,6 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Optional_Extensions_MySQLConnector"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mysql-connector"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mysql-connector"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
-linuxpatchrequires = ""
-copyright = "2017 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
 module = "gid_Module_Optional_Extensions_Script_Provider_For_BS"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider"
 solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"