[gentoo-commits] gentoo-x86 commit in dev-lang/R/files: R-2.15.2-cairo.patch R-2.14.2-library-writability.patch R-2.14.2-prune-package-update.patch R-2.14.1-pcre830.patch

[gentoo-commits] gentoo-x86 commit in dev-lang/R/files: R-2.15.2-cairo.patch R-2.14.2-library-writability.patch R-2.14.2-prune-package-update.patch R-2.14.1-pcre830.patch

[Sebastien Fabbro (bicatali)]

bicatali    13/01/28 22:49:48

  Added:                R-2.15.2-cairo.patch
  Removed:              R-2.14.2-library-writability.patch
                        R-2.14.2-prune-package-update.patch
                        R-2.14.1-pcre830.patch
  Log:
  Fixed for cairo graphics (bug #453048), use generic pkg-config, make sure Rexec links to libR.so on prefix. Removed old.
  
  (Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

Revision  Changes    Path
1.1                  dev-lang/R/files/R-2.15.2-cairo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.15.2-cairo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.15.2-cairo.patch?rev=1.1&content-type=text/plain

Index: R-2.15.2-cairo.patch
===================================================================
--- src/modules/X11/devX11.c	(révision 61681)
+++ src/modules/X11/devX11.c	(révision 61682)
@@ -244,6 +244,7 @@ 
 {
     if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
     cairo_paint(xd->xcc);
+    cairo_surface_flush(xd->xcs);
     if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
     XSync(display, 0);
     xd->last = currentTime();
@@ -753,8 +754,10 @@ 
 #ifdef HAVE_WORKING_CAIRO
 	    pX11Desc xd = (pX11Desc) dd->deviceSpecific;
 	    /* We can use the buffered copy where we have it */ 
-	    if(xd->buffered == 1) cairo_paint(xd->xcc);
-	    else if (xd->buffered > 1)
+	    if(xd->buffered == 1) {
+		cairo_paint(xd->xcc);
+		cairo_surface_flush(xd->xcs);
+	    } else if (xd->buffered > 1)
 		/* rely on timer to repaint eventually */
 		xd->last_activity = currentTime();
 	    else
@@ -2691,7 +2694,11 @@ 
 		Cairo_update(xd);
 	    return;
 	}
-	if(xd->buffered) cairo_paint(xd->xcc);
+	if(xd->buffered) {
+	    cairo_paint(xd->xcc);
+	    cairo_surface_flush(xd->xcs);
+	}
+	
 #endif
 	if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
 	XSync(display, 0);