[ooo-build-commit] .: 2 commits - configure.in scp2/source

[Fridrich Strba]

 configure.in                         |    5 +----
 scp2/source/ooo/file_library_ooo.scp |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit edaf87fe00e7c82e0b94d638aca8a5b7666ecc87
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 12:36:26 2010 +0200

    package-pixman-scp2-source-ooo-file_library_ooo_scp.diff: package pixmap

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3a049c5..92759a2 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -650,6 +650,21 @@ File gid_File_Lib_Cairo
   #endif
 End
 
+File gid_File_Lib_Pixman
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+  #ifdef UNX
+    #ifdef MACOSX
+       Name = STRING(CONCAT3(libpixman-1,.0,UNXSUFFIX));
+    #else
+       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+    #endif
+  #elif defined(WNT)
+    Name = "libpixman-1-0.dll";
+  #endif
+End
+
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm)
commit 9c79a9b62efd466ef1579f616df3d2f1021b454a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 12:33:35 2010 +0200

    internal-cairo-configure.diff: build internal cairo on x86 and x86_64 alike

diff --git a/configure.in b/configure.in
index 04636fb..b1cdb26 100644
--- a/configure.in
+++ b/configure.in
@@ -5876,10 +5876,7 @@ int main(int argc, char **argv) {
            fi
         else
            BUILD_TYPE="$BUILD_TYPE CAIRO"
-	   dnl === compiler fails on pixman with 64bit architectures...===
-	   if test "$build_cpu" != "x86_64"; then
-	      BUILD_PIXMAN=YES
-	   fi
+           BUILD_PIXMAN=YES
            AC_MSG_RESULT([internal])	   
         fi
     else