Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [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
Date: Mon, 28 Jan 2013 22:49:51
Message-Id: 20130128224948.3A9082171E@flycatcher.gentoo.org
1 bicatali 13/01/28 22:49:48
2
3 Added: R-2.15.2-cairo.patch
4 Removed: R-2.14.2-library-writability.patch
5 R-2.14.2-prune-package-update.patch
6 R-2.14.1-pcre830.patch
7 Log:
8 Fixed for cairo graphics (bug #453048), use generic pkg-config, make sure Rexec links to libR.so on prefix. Removed old.
9
10 (Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
11
12 Revision Changes Path
13 1.1 dev-lang/R/files/R-2.15.2-cairo.patch
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.15.2-cairo.patch?rev=1.1&view=markup
16 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
17
18 Index: R-2.15.2-cairo.patch
19 ===================================================================
20 --- src/modules/X11/devX11.c (révision 61681)
21 +++ src/modules/X11/devX11.c (révision 61682)
22 @@ -244,6 +244,7 @@
23 {
24 if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
25 cairo_paint(xd->xcc);
26 + cairo_surface_flush(xd->xcs);
27 if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
28 XSync(display, 0);
29 xd->last = currentTime();
30 @@ -753,8 +754,10 @@
31 #ifdef HAVE_WORKING_CAIRO
32 pX11Desc xd = (pX11Desc) dd->deviceSpecific;
33 /* We can use the buffered copy where we have it */
34 - if(xd->buffered == 1) cairo_paint(xd->xcc);
35 - else if (xd->buffered > 1)
36 + if(xd->buffered == 1) {
37 + cairo_paint(xd->xcc);
38 + cairo_surface_flush(xd->xcs);
39 + } else if (xd->buffered > 1)
40 /* rely on timer to repaint eventually */
41 xd->last_activity = currentTime();
42 else
43 @@ -2691,7 +2694,11 @@
44 Cairo_update(xd);
45 return;
46 }
47 - if(xd->buffered) cairo_paint(xd->xcc);
48 + if(xd->buffered) {
49 + cairo_paint(xd->xcc);
50 + cairo_surface_flush(xd->xcs);
51 + }
52 +
53 #endif
54 if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
55 XSync(display, 0);