[arch-commits] Commit in r/trunk (PKGBUILD x11.patch)

[Ronald van Haren]

    Date: Friday, February 8, 2013 @ 08:48:10
  Author: ronald
Revision: 177617

upgpkg: r 2.15.2-3

add upstream fix for empty plot windows: FS#32597

Added:
  r/trunk/x11.patch
Modified:
  r/trunk/PKGBUILD

-----------+
 PKGBUILD  |   11 ++++++++---
 x11.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-08 04:40:45 UTC (rev 177616)
+++ PKGBUILD	2013-02-08 07:48:10 UTC (rev 177617)
@@ -5,7 +5,7 @@
 
 pkgname=r
 pkgver=2.15.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -20,12 +20,14 @@
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
-	'R.conf')
+	'R.conf'
+	'x11.patch')
 install=r.install
 sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
-          '43668da6cfd1b4455a99f23e79e2059294dddac9')
+          '43668da6cfd1b4455a99f23e79e2059294dddac9'
+          'a11b91d53645bd545fddc382c991096502e8ac67')
 
 build() {
    cd "${srcdir}/R-${pkgver}"
@@ -34,6 +36,9 @@
   # set texmf dir correctly in makefile
   sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
 
+  # upstream patch fixing empty plots FS#32597
+  patch -Np0 -i ${srcdir}/x11.patch
+
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
 		--sysconfdir=/etc/R \

Added: x11.patch
===================================================================
--- x11.patch	                        (rev 0)
+++ x11.patch	2013-02-08 07:48:10 UTC (rev 177617)
@@ -0,0 +1,36 @@
+--- 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);