[SCM] gtk2-engines-oxygen packaging branch, upstream, updated. upstream/1.1.5-3-g9c2c9c0

Fathi Boudra fabo at alioth.debian.org
Fri Dec 30 10:23:32 UTC 2011


The following commit has been merged in the upstream branch:
commit 9c2c9c0a9037b0a7558ac006464b247c58908f46
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Dec 30 12:23:00 2011 +0200

    Merge upstream
---
 oxygen.diff |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/oxygen.diff b/oxygen.diff
deleted file mode 100644
index 0f47b1c..0000000
--- a/oxygen.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/oxygentileset.cpp b/src/oxygentileset.cpp
-index 371e123..5d4def2 100644
---- a/src/oxygentileset.cpp
-+++ b/src/oxygentileset.cpp
-@@ -212,9 +212,9 @@ namespace Oxygen
- 
-             } else {
- 
--                #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
--                Cairo::Surface tile( cairo_surface_create_for_rectangle( source, sx, sy, sw, sh ) );
--                #else
-+//                 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
-+//                 Cairo::Surface tile( cairo_surface_create_for_rectangle( source, sx, sy, sw, sh ) );
-+//                 #else
-                 Cairo::Surface tile( cairo_surface_create_similar( source, CAIRO_CONTENT_COLOR_ALPHA, sw, sh ) );
-                 {
-                     Cairo::Context local( tile );
-@@ -222,7 +222,7 @@ namespace Oxygen
-                     cairo_rectangle( local, 0, 0, sw, sh );
-                     cairo_fill( local );
-                 }
--                #endif
-+//                 #endif
- 
-                 cairo_set_source_surface( context, tile, 0, 0 );
-                 cairo_pattern_set_extend( cairo_get_source( context ), CAIRO_EXTEND_REPEAT );

-- 
gtk2-engines-oxygen packaging



More information about the pkg-kde-commits mailing list