[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Fridrich Strba]

 patches/dev300/apply                                                    |    1 
 patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff |   24 ++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit 522700957aec7857e6a571d9f0420c17f5f89eda
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 17 10:39:51 2009 +0200

    Package libpixman-1 if building with internal cairo
    
    * patches/dev300/apply:
    * patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4489b31..8dfbedb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2834,6 +2834,7 @@ ui-desktop-integration.diff, michael
 cairo-pixman-makefile-mk.diff
 cairo-cairo-makefile-mk.diff
 internal-cairo-configure.diff
+package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
 
 
 [ WWInProgress ]
diff --git a/patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff b/patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
new file mode 100644
index 0000000..fb1fd93
--- /dev/null
+++ b/patches/dev300/package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
@@ -0,0 +1,24 @@
+--- scp2/source/ooo/file_library_ooo.scp	2009-09-17 10:28:37.000000000 +0200
++++ scp2/source/ooo/file_library_ooo.scp	2009-09-17 10:27:52.000000000 +0200
+@@ -698,6 +698,21 @@
+   #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)