ooo-build r13228 - in trunk: . patches/cairo patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Jul 15 16:28:38 2008
New Revision: 13228
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13228&view=rev

Log:
	* patches/cairo/cairo-prj-build-lst-m21.diff:
	* patches/cairo/cairo-prj-build-lst.diff:
	* patches/cairo/cairo-prj-d-lst-m21.diff:
	* patches/cairo/cairo-prj-d-lst.diff:
	* patches/dev300/apply: adapted to m22 changes.



Added:
   trunk/patches/cairo/cairo-prj-build-lst-m21.diff
   trunk/patches/cairo/cairo-prj-d-lst-m21.diff
Modified:
   trunk/ChangeLog
   trunk/patches/cairo/cairo-prj-build-lst.diff
   trunk/patches/cairo/cairo-prj-d-lst.diff
   trunk/patches/dev300/apply

Added: trunk/patches/cairo/cairo-prj-build-lst-m21.diff
==============================================================================
--- (empty file)
+++ trunk/patches/cairo/cairo-prj-build-lst-m21.diff	Tue Jul 15 16:28:38 2008
@@ -0,0 +1,6 @@
+--- /dev/null	2007-05-04 12:54:50.000000000 +0200
++++ cairo/prj/build.lst	2007-10-24 10:56:23.000000000 +0200
+@@ -0,0 +1,3 @@
++ca	cairo		:	solenv FREETYPE:freetype NULL
++ca	cairo			usr1	-	all	ca_mkout NULL
++ca	cairo			nmake	-	all	ca_cairo NULL

Modified: trunk/patches/cairo/cairo-prj-build-lst.diff
==============================================================================
--- trunk/patches/cairo/cairo-prj-build-lst.diff	(original)
+++ trunk/patches/cairo/cairo-prj-build-lst.diff	Tue Jul 15 16:28:38 2008
@@ -1,6 +1,8 @@
---- /dev/null	2007-05-04 12:54:50.000000000 +0200
-+++ cairo/prj/build.lst	2007-10-24 10:56:23.000000000 +0200
-@@ -0,0 +1,3 @@
-+ca	cairo		:	solenv FREETYPE:freetype NULL
-+ca	cairo			usr1	-	all	ca_mkout NULL
-+ca	cairo			nmake	-	all	ca_cairo NULL
+--- cairo/prj/build.lst	3 Jun 2008 04:20:47 -0000	1.4
++++ cairo/prj/build.lst	15 Jul 2008 16:14:13 -0000
+@@ -1,4 +1,4 @@
+-lcairo	cairo	: soltools NULL
++lcairo	cairo	: soltools FREETYPE:freetype NULL
+ lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
+ lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
+ lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL

Added: trunk/patches/cairo/cairo-prj-d-lst-m21.diff
==============================================================================
--- (empty file)
+++ trunk/patches/cairo/cairo-prj-d-lst-m21.diff	Tue Jul 15 16:28:38 2008
@@ -0,0 +1,7 @@
+--- /dev/null	2007-05-04 12:54:50.000000000 +0200
++++ cairo/prj/d.lst	2007-10-24 11:07:14.000000000 +0200
+@@ -0,0 +1,4 @@
++mkdir: %_DEST%\inc%_EXT%\cairo
++..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\cairo\*.h
++..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
++..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a

Modified: trunk/patches/cairo/cairo-prj-d-lst.diff
==============================================================================
--- trunk/patches/cairo/cairo-prj-d-lst.diff	(original)
+++ trunk/patches/cairo/cairo-prj-d-lst.diff	Tue Jul 15 16:28:38 2008
@@ -1,7 +1,10 @@
---- /dev/null	2007-05-04 12:54:50.000000000 +0200
-+++ cairo/prj/d.lst	2007-10-24 11:07:14.000000000 +0200
-@@ -0,0 +1,4 @@
-+mkdir: %_DEST%\inc%_EXT%\cairo
-+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\cairo\*.h
-+..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
-+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+--- cairo/prj/d.lst	3 Jun 2008 04:20:47 -0000	1.4
++++ cairo/prj/d.lst	15 Jul 2008 16:24:10 -0000
+@@ -4,6 +4,7 @@ mkdir: %_DEST%\inc%_EXT%\cairo
+ mkdir: %_DEST%\inc%_EXT%\pixman-1
+ ..\%__SRC%\inc\pixman*.h %_DEST%\inc%_EXT%\pixman-1\pixman*.h
+ 
++..\%__SRC%\slb\*.lib   %_DEST%\lib%_EXT%\*.lib
+ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
+ ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
+ ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 15 16:28:38 2008
@@ -2449,11 +2449,17 @@
 ui-desktop-integration.diff, michael
 
 
+[ InternalCairo <= dev300-m21 ]
+cairo-prj-build-lst-m21.diff
+cairo-prj-d-lst-m21.diff
+
+[ InternalCairo >= dev300-m22 ]
+cairo-prj-build-lst.diff
+cairo-prj-d-lst.diff
+
 [ InternalCairo ]
 cairo-cairo-1-4-10-diff.diff
 cairo-makefile-mk.diff
-cairo-prj-build-lst.diff
-cairo-prj-d-lst.diff
 [ InternalCairo < dev300-m22 >= beb300-m1 ]
 cairo-canvas-cairo.diff
 cairo-config_office-configure-in.diff