[Libreoffice-commits] core.git: Branch 'feature/cib_contract138e' - 2 commits - configure.ac scp2/source

[Thorsten Behrens (via logerrit)]

 configure.ac                   |    2 +-
 scp2/source/ooo/file_ooo.scp   |    7 +++++++
 scp2/source/ooo/module_ooo.scp |    1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 297709f50aa4cdef2f1b99e9a167ef7570dd3fb0
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Wed Nov 23 03:00:39 2022 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Nov 23 03:00:39 2022 +0100

    Package libstdc++.so.6 from system for Xenial
    
    For the g++-7 based libstdc++ (6.0.28), need to provide that on target
    system (string_view & other essentials missing).
    
    Change-Id: I05e4614ff0ddee629e4c9c7d6cd8be0129a6b40c

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9a49f163adaa..89b94ca11d9b 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -248,6 +248,13 @@ File gid_File_Txt_Pagein_Writer
     Name = "pagein-writer";
 End
 
+File gid_File_Lib_Libstdcpp
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(libstdc++.so.6);
+    Styles = (PACKED);
+End
+
 #endif
 
 File gid_Starregistry_Services_Rdb
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 842b244b1670..32d5d207243c 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -39,6 +39,7 @@ Module gid_Module_Root
              gid_Unixlink_File_Lib_Xslt,
              gid_Unixlink_File_Lib_eXslt,
              GID_FILE_LIB_WPD,
+             gid_File_Lib_Libstdcpp,
              gid_File_Lib_Cli_Oootypes_Assembly,
              gid_File_Lib_Policy_Cli_Oootypes_Assembly,
              gid_File_Lib_Policy_Cli_Oootypes_Config,
commit cce4733b847b70157dc485377cecbad620041205
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Mon Nov 21 16:36:03 2022 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Nov 21 16:37:07 2022 +0100

    Release version 7.3.7.2 compatible with Xenial
    
    Change-Id: Ibf11c953dc03e6a5218c8c92e3b45d4c302f6268

diff --git a/configure.ac b/configure.ac
index 320e5cd6bfb8..d448e8d011a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.3.7.2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.xenial],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard