[arch-commits] Commit in r/repos (22 files)
Ronald van Haren
ronald at nymeria.archlinux.org
Fri Feb 8 07:48:31 UTC 2013
Date: Friday, February 8, 2013 @ 08:48:31
Author: ronald
Revision: 177618
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
r/repos/extra-i686/PKGBUILD
(from rev 177617, r/trunk/PKGBUILD)
r/repos/extra-i686/R.conf
(from rev 177617, r/trunk/R.conf)
r/repos/extra-i686/r.desktop
(from rev 177617, r/trunk/r.desktop)
r/repos/extra-i686/r.install
(from rev 177617, r/trunk/r.install)
r/repos/extra-i686/r.png
(from rev 177617, r/trunk/r.png)
r/repos/extra-i686/x11.patch
(from rev 177617, r/trunk/x11.patch)
r/repos/extra-x86_64/PKGBUILD
(from rev 177617, r/trunk/PKGBUILD)
r/repos/extra-x86_64/R.conf
(from rev 177617, r/trunk/R.conf)
r/repos/extra-x86_64/r.desktop
(from rev 177617, r/trunk/r.desktop)
r/repos/extra-x86_64/r.install
(from rev 177617, r/trunk/r.install)
r/repos/extra-x86_64/r.png
(from rev 177617, r/trunk/r.png)
r/repos/extra-x86_64/x11.patch
(from rev 177617, r/trunk/x11.patch)
Deleted:
r/repos/extra-i686/PKGBUILD
r/repos/extra-i686/R.conf
r/repos/extra-i686/r.desktop
r/repos/extra-i686/r.install
r/repos/extra-i686/r.png
r/repos/extra-x86_64/PKGBUILD
r/repos/extra-x86_64/R.conf
r/repos/extra-x86_64/r.desktop
r/repos/extra-x86_64/r.install
r/repos/extra-x86_64/r.png
------------------------+
extra-i686/PKGBUILD | 163 ++++++++++++++++++++++++-----------------------
extra-i686/R.conf | 4 -
extra-i686/r.desktop | 22 +++---
extra-i686/r.install | 32 ++++-----
extra-i686/x11.patch | 36 ++++++++++
extra-x86_64/PKGBUILD | 163 ++++++++++++++++++++++++-----------------------
extra-x86_64/R.conf | 4 -
extra-x86_64/r.desktop | 22 +++---
extra-x86_64/r.install | 32 ++++-----
extra-x86_64/x11.patch | 36 ++++++++++
10 files changed, 298 insertions(+), 216 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-i686/PKGBUILD 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Contributor: K. Piche <kpiche at rogers.com>
-
-pkgname=r
-pkgver=2.15.2
-pkgrel=2
-pkgdesc="Language and environment for statistical computing and graphics"
-arch=('i686' 'x86_64')
-license=('GPL')
-url=('http://www.r-project.org/')
-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')
-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')
-source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
- 'r.desktop'
- 'r.png'
- 'R.conf')
-install=r.install
-sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
- '13aa29219bcaa102e575de8c1c8e0833d233e836'
- 'a69a07ec363440efc18ce0a7f2af103375dea978'
- '43668da6cfd1b4455a99f23e79e2059294dddac9')
-
-build() {
- cd "${srcdir}/R-${pkgver}"
- sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
-
- # set texmf dir correctly in makefile
- sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
-
- ./configure --prefix=/usr \
- --libdir=/usr/lib \
- --sysconfdir=/etc/R \
- --datarootdir=/usr/share \
- rsharedir=/usr/share/R/ \
- rincludedir=/usr/include/R/ \
- rdocdir=/usr/share/doc/R/ \
- --with-x \
- --enable-R-shlib \
- --with-lapack \
- --with-blas \
- F77=gfortran \
- LIBnn=lib
- make
-}
-
-package() {
- cd "${srcdir}/R-${pkgver}"
- make -j1 DESTDIR="${pkgdir}" install
-
- # Fixup R wrapper scripts.
- sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
- rm "${pkgdir}/usr/lib/R/bin/R"
- cd "${pkgdir}/usr/lib/R/bin"
- ln -s ../../../bin/R
-
- # install some freedesktop.org compatibility
- install -Dm644 "${srcdir}/r.desktop" \
- "${pkgdir}/usr/share/applications/r.desktop"
- install -Dm644 "${srcdir}/r.png" \
- "${pkgdir}/usr/share/pixmaps/r.png"
-
- # move the config directory to /etc and create symlinks
- install -d "${pkgdir}/etc/R"
- cd "${pkgdir}/usr/lib/R/etc"
- for i in *; do
- mv -f ${i} "${pkgdir}/etc/R"
- ln -s /etc/R/${i} ${i}
- 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
-}
Copied: r/repos/extra-i686/PKGBUILD (from rev 177617, r/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Contributor: K. Piche <kpiche at rogers.com>
+
+pkgname=r
+pkgver=2.15.2
+pkgrel=3
+pkgdesc="Language and environment for statistical computing and graphics"
+arch=('i686' 'x86_64')
+license=('GPL')
+url=('http://www.r-project.org/')
+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')
+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')
+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'
+ '13aa29219bcaa102e575de8c1c8e0833d233e836'
+ 'a69a07ec363440efc18ce0a7f2af103375dea978'
+ '43668da6cfd1b4455a99f23e79e2059294dddac9'
+ 'a11b91d53645bd545fddc382c991096502e8ac67')
+
+build() {
+ cd "${srcdir}/R-${pkgver}"
+ sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
+
+ # 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 \
+ --datarootdir=/usr/share \
+ rsharedir=/usr/share/R/ \
+ rincludedir=/usr/include/R/ \
+ rdocdir=/usr/share/doc/R/ \
+ --with-x \
+ --enable-R-shlib \
+ --with-lapack \
+ --with-blas \
+ F77=gfortran \
+ LIBnn=lib
+ make
+}
+
+package() {
+ cd "${srcdir}/R-${pkgver}"
+ make -j1 DESTDIR="${pkgdir}" install
+
+ # Fixup R wrapper scripts.
+ sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
+ rm "${pkgdir}/usr/lib/R/bin/R"
+ cd "${pkgdir}/usr/lib/R/bin"
+ ln -s ../../../bin/R
+
+ # install some freedesktop.org compatibility
+ install -Dm644 "${srcdir}/r.desktop" \
+ "${pkgdir}/usr/share/applications/r.desktop"
+ install -Dm644 "${srcdir}/r.png" \
+ "${pkgdir}/usr/share/pixmaps/r.png"
+
+ # move the config directory to /etc and create symlinks
+ install -d "${pkgdir}/etc/R"
+ cd "${pkgdir}/usr/lib/R/etc"
+ for i in *; do
+ mv -f ${i} "${pkgdir}/etc/R"
+ ln -s /etc/R/${i} ${i}
+ 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
+}
Deleted: extra-i686/R.conf
===================================================================
--- extra-i686/R.conf 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-i686/R.conf 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,2 +0,0 @@
-/usr/lib/R/lib
-
Copied: r/repos/extra-i686/R.conf (from rev 177617, r/trunk/R.conf)
===================================================================
--- extra-i686/R.conf (rev 0)
+++ extra-i686/R.conf 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,2 @@
+/usr/lib/R/lib
+
Deleted: extra-i686/r.desktop
===================================================================
--- extra-i686/r.desktop 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-i686/r.desktop 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=R
-GenericName=environment for statistical computing
-Comment=language and environment for statistical computing and graphics
-Exec=R
-Icon=/usr/share/pixmaps/r.png
-DocPath=/usr/lib/R/doc/html/index.html
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Education;Science;Math;
Copied: r/repos/extra-i686/r.desktop (from rev 177617, r/trunk/r.desktop)
===================================================================
--- extra-i686/r.desktop (rev 0)
+++ extra-i686/r.desktop 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=R
+GenericName=environment for statistical computing
+Comment=language and environment for statistical computing and graphics
+Exec=R
+Icon=/usr/share/pixmaps/r.png
+DocPath=/usr/lib/R/doc/html/index.html
+StartupNotify=true
+Terminal=true
+Type=Application
+Categories=Education;Science;Math;
Deleted: extra-i686/r.install
===================================================================
--- extra-i686/r.install 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-i686/r.install 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,16 +0,0 @@
-post_install() {
- update-desktop-database -q
- if [[ -x /usr/bin/mktexlsr ]]; then
- echo ">>> updating the filename database for texlive..."
- mktexlsr --quiet usr/share/texmf
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: r/repos/extra-i686/r.install (from rev 177617, r/trunk/r.install)
===================================================================
--- extra-i686/r.install (rev 0)
+++ extra-i686/r.install 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,16 @@
+post_install() {
+ update-desktop-database -q
+ if [[ -x /usr/bin/mktexlsr ]]; then
+ echo ">>> updating the filename database for texlive..."
+ mktexlsr --quiet usr/share/texmf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: extra-i686/r.png
===================================================================
(Binary files differ)
Copied: r/repos/extra-i686/r.png (from rev 177617, r/trunk/r.png)
===================================================================
(Binary files differ)
Copied: r/repos/extra-i686/x11.patch (from rev 177617, r/trunk/x11.patch)
===================================================================
--- extra-i686/x11.patch (rev 0)
+++ extra-i686/x11.patch 2013-02-08 07:48:31 UTC (rev 177618)
@@ -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);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-x86_64/PKGBUILD 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Contributor: K. Piche <kpiche at rogers.com>
-
-pkgname=r
-pkgver=2.15.2
-pkgrel=2
-pkgdesc="Language and environment for statistical computing and graphics"
-arch=('i686' 'x86_64')
-license=('GPL')
-url=('http://www.r-project.org/')
-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')
-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')
-source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
- 'r.desktop'
- 'r.png'
- 'R.conf')
-install=r.install
-sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
- '13aa29219bcaa102e575de8c1c8e0833d233e836'
- 'a69a07ec363440efc18ce0a7f2af103375dea978'
- '43668da6cfd1b4455a99f23e79e2059294dddac9')
-
-build() {
- cd "${srcdir}/R-${pkgver}"
- sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
-
- # set texmf dir correctly in makefile
- sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
-
- ./configure --prefix=/usr \
- --libdir=/usr/lib \
- --sysconfdir=/etc/R \
- --datarootdir=/usr/share \
- rsharedir=/usr/share/R/ \
- rincludedir=/usr/include/R/ \
- rdocdir=/usr/share/doc/R/ \
- --with-x \
- --enable-R-shlib \
- --with-lapack \
- --with-blas \
- F77=gfortran \
- LIBnn=lib
- make
-}
-
-package() {
- cd "${srcdir}/R-${pkgver}"
- make -j1 DESTDIR="${pkgdir}" install
-
- # Fixup R wrapper scripts.
- sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
- rm "${pkgdir}/usr/lib/R/bin/R"
- cd "${pkgdir}/usr/lib/R/bin"
- ln -s ../../../bin/R
-
- # install some freedesktop.org compatibility
- install -Dm644 "${srcdir}/r.desktop" \
- "${pkgdir}/usr/share/applications/r.desktop"
- install -Dm644 "${srcdir}/r.png" \
- "${pkgdir}/usr/share/pixmaps/r.png"
-
- # move the config directory to /etc and create symlinks
- install -d "${pkgdir}/etc/R"
- cd "${pkgdir}/usr/lib/R/etc"
- for i in *; do
- mv -f ${i} "${pkgdir}/etc/R"
- ln -s /etc/R/${i} ${i}
- 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
-}
Copied: r/repos/extra-x86_64/PKGBUILD (from rev 177617, r/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Contributor: K. Piche <kpiche at rogers.com>
+
+pkgname=r
+pkgver=2.15.2
+pkgrel=3
+pkgdesc="Language and environment for statistical computing and graphics"
+arch=('i686' 'x86_64')
+license=('GPL')
+url=('http://www.r-project.org/')
+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')
+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')
+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'
+ '13aa29219bcaa102e575de8c1c8e0833d233e836'
+ 'a69a07ec363440efc18ce0a7f2af103375dea978'
+ '43668da6cfd1b4455a99f23e79e2059294dddac9'
+ 'a11b91d53645bd545fddc382c991096502e8ac67')
+
+build() {
+ cd "${srcdir}/R-${pkgver}"
+ sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
+
+ # 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 \
+ --datarootdir=/usr/share \
+ rsharedir=/usr/share/R/ \
+ rincludedir=/usr/include/R/ \
+ rdocdir=/usr/share/doc/R/ \
+ --with-x \
+ --enable-R-shlib \
+ --with-lapack \
+ --with-blas \
+ F77=gfortran \
+ LIBnn=lib
+ make
+}
+
+package() {
+ cd "${srcdir}/R-${pkgver}"
+ make -j1 DESTDIR="${pkgdir}" install
+
+ # Fixup R wrapper scripts.
+ sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
+ rm "${pkgdir}/usr/lib/R/bin/R"
+ cd "${pkgdir}/usr/lib/R/bin"
+ ln -s ../../../bin/R
+
+ # install some freedesktop.org compatibility
+ install -Dm644 "${srcdir}/r.desktop" \
+ "${pkgdir}/usr/share/applications/r.desktop"
+ install -Dm644 "${srcdir}/r.png" \
+ "${pkgdir}/usr/share/pixmaps/r.png"
+
+ # move the config directory to /etc and create symlinks
+ install -d "${pkgdir}/etc/R"
+ cd "${pkgdir}/usr/lib/R/etc"
+ for i in *; do
+ mv -f ${i} "${pkgdir}/etc/R"
+ ln -s /etc/R/${i} ${i}
+ 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
+}
Deleted: extra-x86_64/R.conf
===================================================================
--- extra-x86_64/R.conf 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-x86_64/R.conf 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,2 +0,0 @@
-/usr/lib/R/lib
-
Copied: r/repos/extra-x86_64/R.conf (from rev 177617, r/trunk/R.conf)
===================================================================
--- extra-x86_64/R.conf (rev 0)
+++ extra-x86_64/R.conf 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,2 @@
+/usr/lib/R/lib
+
Deleted: extra-x86_64/r.desktop
===================================================================
--- extra-x86_64/r.desktop 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-x86_64/r.desktop 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=R
-GenericName=environment for statistical computing
-Comment=language and environment for statistical computing and graphics
-Exec=R
-Icon=/usr/share/pixmaps/r.png
-DocPath=/usr/lib/R/doc/html/index.html
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Education;Science;Math;
Copied: r/repos/extra-x86_64/r.desktop (from rev 177617, r/trunk/r.desktop)
===================================================================
--- extra-x86_64/r.desktop (rev 0)
+++ extra-x86_64/r.desktop 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=R
+GenericName=environment for statistical computing
+Comment=language and environment for statistical computing and graphics
+Exec=R
+Icon=/usr/share/pixmaps/r.png
+DocPath=/usr/lib/R/doc/html/index.html
+StartupNotify=true
+Terminal=true
+Type=Application
+Categories=Education;Science;Math;
Deleted: extra-x86_64/r.install
===================================================================
--- extra-x86_64/r.install 2013-02-08 07:48:10 UTC (rev 177617)
+++ extra-x86_64/r.install 2013-02-08 07:48:31 UTC (rev 177618)
@@ -1,16 +0,0 @@
-post_install() {
- update-desktop-database -q
- if [[ -x /usr/bin/mktexlsr ]]; then
- echo ">>> updating the filename database for texlive..."
- mktexlsr --quiet usr/share/texmf
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: r/repos/extra-x86_64/r.install (from rev 177617, r/trunk/r.install)
===================================================================
--- extra-x86_64/r.install (rev 0)
+++ extra-x86_64/r.install 2013-02-08 07:48:31 UTC (rev 177618)
@@ -0,0 +1,16 @@
+post_install() {
+ update-desktop-database -q
+ if [[ -x /usr/bin/mktexlsr ]]; then
+ echo ">>> updating the filename database for texlive..."
+ mktexlsr --quiet usr/share/texmf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: extra-x86_64/r.png
===================================================================
(Binary files differ)
Copied: r/repos/extra-x86_64/r.png (from rev 177617, r/trunk/r.png)
===================================================================
(Binary files differ)
Copied: r/repos/extra-x86_64/x11.patch (from rev 177617, r/trunk/x11.patch)
===================================================================
--- extra-x86_64/x11.patch (rev 0)
+++ extra-x86_64/x11.patch 2013-02-08 07:48:31 UTC (rev 177618)
@@ -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);
More information about the arch-commits
mailing list