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

[Fridrich Å trba]

 scp2/source/ooo/file_library_ooo.scp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 662f0c0d4f07927534359a17055ffaa78508c8bc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Feb 8 16:31:44 2013 +0100

    Package the right pixman and cairo
    
    Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608
    Reviewed-on: https://gerrit.libreoffice.org/2051
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 86dde44..642cd81 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -560,7 +560,7 @@ File gid_File_Lib_Cairo
     #ifdef MACOSX
        Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT2(libcairo,UNXSUFFIX));
+       Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
     #endif
   #elif defined(WNT)
     #ifdef _gcc3
@@ -578,7 +578,11 @@ File gid_File_Lib_Pixman
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
+    #ifdef MACOSX
        Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX));
+    #else
+       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+    #endif
   #endif
 End