ooo-build r12383 - in trunk: . patches/emf+

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Tue Apr 29 15:51:40 2008
New Revision: 12383
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12383&view=rev

Log:
2008-04-29  Jan Holesovsky  <kendy suse cz>

        * patches/emf+/emf+-canvas.diff: Update to apply again.

        * configure.in: patches/src680 does not exist any more.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/emf+/emf+-canvas.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Apr 29 15:51:40 2008
@@ -23,7 +23,7 @@
   --with-tag              define the tag to use, defaults to the latest
 			  release
 			  
-			  Example:  --with-tag=src680-mXYZ],
+			  Example:  --with-tag=dev300-mXYZ],
 ,)
 
 AC_ARG_WITH(srcdir,
@@ -1250,7 +1250,6 @@
 patches/mono/Makefile
 patches/ooxml/Makefile
 patches/postgresql/Makefile
-patches/src680/Makefile
 patches/64bit/Makefile
 po/Makefile
 doc/Makefile

Modified: trunk/patches/emf+/emf+-canvas.diff
==============================================================================
--- trunk/patches/emf+/emf+-canvas.diff	(original)
+++ trunk/patches/emf+/emf+-canvas.diff	Tue Apr 29 15:51:40 2008
@@ -156,7 +156,7 @@
 diff -rup canvas-orig/source/cairo/cairo_cairo.hxx canvas/source/cairo/cairo_cairo.hxx
 --- canvas-orig/source/cairo/cairo_cairo.hxx	2007-08-21 13:19:18.000000000 +0200
 +++ canvas/source/cairo/cairo_cairo.hxx	2007-10-10 17:35:34.000000000 +0200
-@@ -103,6 +103,11 @@ namespace cairo {
+@@ -100,6 +100,11 @@ namespace cairo {
  		{
  			return mpRenderFormat;
  		}
@@ -165,9 +165,9 @@
 +        {
 +            mbFreePixmap = false;
 +        }
-    #endif
  
          int getXFormat( Content aContent );
+             
 diff -rup canvas-orig/source/cairo/cairo_canvasbitmap.hxx canvas/source/cairo/cairo_canvasbitmap.hxx
 --- canvas-orig/source/cairo/cairo_canvasbitmap.hxx	2007-08-21 13:19:18.000000000 +0200
 +++ canvas/source/cairo/cairo_canvasbitmap.hxx	2007-10-24 13:07:12.000000000 +0200