Date: Saturday, March 23, 2013 @ 02:20:24 Author: eric Revision: 180544
upgpkg: r 2.15.3-1 Upstream update, Rebuild against icu 51.1, Add libRmath.so library (close FS#33775), Change openjdk6 makedepends to jdk7-openjdk, Remove old patch Modified: r/trunk/PKGBUILD Deleted: r/trunk/x11.patch -----------+ PKGBUILD | 32 +++++++++++++++++++------------- x11.patch | 36 ------------------------------------ 2 files changed, 19 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-23 00:31:47 UTC (rev 180543) +++ PKGBUILD 2013-03-23 01:20:24 UTC (rev 180544) @@ -4,8 +4,8 @@ # Contributor: K. Piche <[email protected]> pkgname=r -pkgver=2.15.2 -pkgrel=3 +pkgver=2.15.3 +pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') license=('GPL') @@ -13,21 +13,19 @@ depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') -makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0') +makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') options=('!makeflags' '!emptydirs') +install=r.install source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"; 'r.desktop' 'r.png' - 'R.conf' - 'x11.patch') -install=r.install -sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd' + 'R.conf') +sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978' - '43668da6cfd1b4455a99f23e79e2059294dddac9' - 'a11b91d53645bd545fddc382c991096502e8ac67') + '43668da6cfd1b4455a99f23e79e2059294dddac9') build() { cd "${srcdir}/R-${pkgver}" @@ -36,8 +34,8 @@ # 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 +# fix for texinfo 5.X + sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure ./configure --prefix=/usr \ --libdir=/usr/lib \ @@ -53,12 +51,20 @@ F77=gfortran \ LIBnn=lib make + +# make libRmath.so + cd src/nmath/standalone + make shared } package() { cd "${srcdir}/R-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install +# install libRmath.so + cd src/nmath/standalone + make DESTDIR="${pkgdir}" install + # Fixup R wrapper scripts. sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R" rm "${pkgdir}/usr/lib/R/bin/R" @@ -80,5 +86,5 @@ done # Install ld.so.conf.d file to ensure other applications access the shared lib - install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf + install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf" } Deleted: x11.patch =================================================================== --- x11.patch 2013-03-23 00:31:47 UTC (rev 180543) +++ x11.patch 2013-03-23 01:20:24 UTC (rev 180544) @@ -1,36 +0,0 @@ ---- 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);
