[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/source

David Tardon dtardon at redhat.com
Wed Jul 24 04:44:00 PDT 2013


 scp2/source/ooo/file_library_ooo.scp |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 8d08d7985c98e095fad5dca683ceeff02a671aba
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jul 24 10:28:12 2013 +0200

    fdo#64916 put libsqlite3.so into instset on linux again
    
    Change-Id: Ib53b71d23575350d875abdfb2477bba7369c040f
    (cherry picked from commit 6ae0422de5b42fcf81e9d76f5a7b6ed16946fd21)
    Signed-off-by: David Tardon <dtardon at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/5060
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 03243b8..36ec8d4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -849,6 +849,13 @@ SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3)
 SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3)
 #ifdef WNT
 SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3)
+#else
+#if !defined(MACOSX)
+File gid_File_Lib_Sqlite3
+    Name = "sqlite/" SPECIAL_NAME(sqlite3);
+    PACKED_LIB_FILE_BODY;
+End
+#endif //!defined(MACOSX)
 #endif //WNT
 SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
 #endif //SYSTEM_NSS


More information about the Libreoffice-commits mailing list