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

[Petr Mladek]

 patches/dev300/apply                                         |    6 +++++-
 patches/dev300/canvas-cairopattern-revert-for-cairo-1.0.diff |   10 ++++++++++
 patches/dev300/canvas-cairopattern.diff                      |    4 +---
 3 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 1ff6ab7035d8685ccab30c8f2f6d6dcc9a1cd15c
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Mon Aug 30 13:55:29 2010 +0200

    Disable the fix for n#629546 only on SLED10
    
    * patches/dev300/canvas-cairopattern.diff: revert the fix for SLED10;
      it disable the change everywhere :-(
    * patches/dev300/canvas-cairopattern-revert-for-cairo-1.0.diff: revert
      the change added by canvas-cairopattern.diff
    * patches/dev300/apply: apply the reverting diff only on SLED10

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ede62d2..a506041 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -71,7 +71,7 @@ SUSE-9.1  : NovellBase, DisableGCJ
 SUSE-9.2  : NovellBase, DisableGCJ
 SUSE-9.3  : NovellBase, DisableGCJ
 SUSE-10.0 : NovellBase, DisableGCJ
-SUSE-10.1 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, GTK28, SUSE101
+SUSE-10.1 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, GTK28, Cairo10, SUSE101
 SUSE-10.2 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
 SUSE-10.3 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, Java14, GCC41
 SUSE-11.0 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, CairoFonts, PostgreSQL
@@ -433,6 +433,10 @@ svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
 # set border treatment for cairocanvas correctly
 canvas-cairopattern.diff, n#629546, thorsten
 
+[ Cairo10 ]
+# revert the fix for n#629546; CAIRO_EXTEND_PAD is not available in cairo-1.0.2
+canvas-cairopattern-revert-for-cairo-1.0.diff, pmladek
+
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
diff --git a/patches/dev300/canvas-cairopattern-revert-for-cairo-1.0.diff b/patches/dev300/canvas-cairopattern-revert-for-cairo-1.0.diff
new file mode 100644
index 0000000..1195fc2
--- /dev/null
+++ b/patches/dev300/canvas-cairopattern-revert-for-cairo-1.0.diff
@@ -0,0 +1,10 @@
+--- canvas/source/cairo/cairo_canvashelper.cxx.old1	2010-08-30 13:45:29.000000000 +0200
++++ canvas/source/cairo/cairo_canvashelper.cxx	2010-08-30 13:45:39.000000000 +0200
+@@ -1265,7 +1265,6 @@ namespace cairocanvas
+                 ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
+                 ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
+                  cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
+-            cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
+             cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
+             cairo_clip( mpCairo.get() );
+             cairo_paint( mpCairo.get() );
diff --git a/patches/dev300/canvas-cairopattern.diff b/patches/dev300/canvas-cairopattern.diff
index 5473ab9..5cbc170 100644
--- a/patches/dev300/canvas-cairopattern.diff
+++ b/patches/dev300/canvas-cairopattern.diff
@@ -1,12 +1,10 @@
 --- canvas/source/cairo/cairo_canvashelper.cxx.old	2010-08-19 18:28:30.000000000 +0200
 +++ canvas/source/cairo/cairo_canvashelper.cxx	2010-08-19 18:17:36.000000000 +0200
-@@ -1265,6 +1265,9 @@ namespace cairocanvas
+@@ -1265,6 +1265,7 @@ namespace cairocanvas
                  ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
                  ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
                   cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
-+#ifdef CAIRO_EXTEND_PAD
 +            cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
-+#endif
              cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
              cairo_clip( mpCairo.get() );
              cairo_paint( mpCairo.get() );