[arch-commits] Commit in rxvt-unicode/repos (12 files)
seblu at nymeria.archlinux.org
seblu at nymeria.archlinux.org
Thu Jan 24 13:11:32 UTC 2013
Date: Thursday, January 24, 2013 @ 14:11:32
Author: seblu
Revision: 82789
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
rxvt-unicode/repos/community-staging-i686/
rxvt-unicode/repos/community-staging-i686/01-fix-screen-sel.patch
(from rev 82788, rxvt-unicode/trunk/01-fix-screen-sel.patch)
rxvt-unicode/repos/community-staging-i686/PKGBUILD
(from rev 82788, rxvt-unicode/trunk/PKGBUILD)
rxvt-unicode/repos/community-staging-i686/urxvt-tabbed.desktop
(from rev 82788, rxvt-unicode/trunk/urxvt-tabbed.desktop)
rxvt-unicode/repos/community-staging-i686/urxvt.desktop
(from rev 82788, rxvt-unicode/trunk/urxvt.desktop)
rxvt-unicode/repos/community-staging-i686/urxvtc.desktop
(from rev 82788, rxvt-unicode/trunk/urxvtc.desktop)
rxvt-unicode/repos/community-staging-x86_64/
rxvt-unicode/repos/community-staging-x86_64/01-fix-screen-sel.patch
(from rev 82788, rxvt-unicode/trunk/01-fix-screen-sel.patch)
rxvt-unicode/repos/community-staging-x86_64/PKGBUILD
(from rev 82788, rxvt-unicode/trunk/PKGBUILD)
rxvt-unicode/repos/community-staging-x86_64/urxvt-tabbed.desktop
(from rev 82788, rxvt-unicode/trunk/urxvt-tabbed.desktop)
rxvt-unicode/repos/community-staging-x86_64/urxvt.desktop
(from rev 82788, rxvt-unicode/trunk/urxvt.desktop)
rxvt-unicode/repos/community-staging-x86_64/urxvtc.desktop
(from rev 82788, rxvt-unicode/trunk/urxvtc.desktop)
--------------------------------------------------+
community-staging-i686/01-fix-screen-sel.patch | 66 +++++++++++++++++
community-staging-i686/PKGBUILD | 79 +++++++++++++++++++++
community-staging-i686/urxvt-tabbed.desktop | 9 ++
community-staging-i686/urxvt.desktop | 9 ++
community-staging-i686/urxvtc.desktop | 9 ++
community-staging-x86_64/01-fix-screen-sel.patch | 66 +++++++++++++++++
community-staging-x86_64/PKGBUILD | 79 +++++++++++++++++++++
community-staging-x86_64/urxvt-tabbed.desktop | 9 ++
community-staging-x86_64/urxvt.desktop | 9 ++
community-staging-x86_64/urxvtc.desktop | 9 ++
10 files changed, 344 insertions(+)
Copied: rxvt-unicode/repos/community-staging-i686/01-fix-screen-sel.patch (from rev 82788, rxvt-unicode/trunk/01-fix-screen-sel.patch)
===================================================================
--- community-staging-i686/01-fix-screen-sel.patch (rev 0)
+++ community-staging-i686/01-fix-screen-sel.patch 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,66 @@
+--- a/src/rxvt.h 2012-11-30 07:52:10.000000000 +0100
++++ b/src/rxvt.h 2013-01-19 18:14:07.477653413 +0100
+@@ -1488,6 +1488,7 @@
+ void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
+ void scr_kill_char (line_t &l, int col) const NOTHROW;
+ int scr_scroll_text (int row1, int row2, int count) NOTHROW;
++ void copy_line (line_t &dst, line_t &src);
+ void scr_reset ();
+ void scr_release () NOTHROW;
+ void scr_clear (bool really = false) NOTHROW;
+--- a/src/screen.C 2012-11-30 08:13:38.000000000 +0100
++++ b/src/screen.C 2013-01-19 18:17:13.431014964 +0100
+@@ -190,6 +190,16 @@
+ row_buf = swap_buf + nrow;
+ }
+
++void
++rxvt_term::copy_line (line_t &dst, line_t &src)
++{
++ scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
++ dst.l = min (src.l, ncol);
++ memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
++ memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
++ dst.f = src.f;
++}
++
+ void ecb_cold
+ rxvt_term::scr_reset ()
+ {
+@@ -232,8 +242,6 @@
+ line_t *prev_swap_buf = swap_buf;
+ line_t *prev_row_buf = row_buf;
+
+- int common_col = min (prev_ncol, ncol);
+-
+ scr_alloc ();
+
+ if (!prev_row_buf)
+@@ -277,13 +285,8 @@
+
+ for (int row = min (nrow, prev_nrow); row--; )
+ {
+- scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
+- scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
+-
+- memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
+- memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
+- memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
+- memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
++ copy_line (drawn_buf [row], prev_drawn_buf [row]);
++ copy_line (swap_buf [row], prev_swap_buf [row]);
+ }
+
+ int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
+@@ -388,10 +391,7 @@
+ line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
+ line_t &dst = row_buf [row];
+
+- scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
+-
+- memcpy (dst.t, src.t, sizeof (text_t) * common_col);
+- memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
++ copy_line (dst, src);
+ }
+
+ for (int row = prev_nrow; row < nrow; row++)
Copied: rxvt-unicode/repos/community-staging-i686/PKGBUILD (from rev 82788, rxvt-unicode/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+
+pkgname=rxvt-unicode
+pkgver=9.16
+pkgrel=2
+pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
+arch=('i686' 'x86_64')
+url='http://software.schmorp.de/pkg/rxvt-unicode.html'
+license=('GPL')
+depends=('libxft' 'gdk-pixbuf2' 'perl' 'startup-notification')
+optdepends=('gtk2-perl: to use the urxvt-tabbed')
+source=(
+ "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2"
+ 'urxvt.desktop'
+ 'urxvtc.desktop'
+ 'urxvt-tabbed.desktop'
+ '01-fix-screen-sel.patch'
+)
+md5sums=('2e2942e8367624affebc0568e3671b66'
+ 'c2b828d37d06cbf4c32937a2959f2fc2'
+ '10e80aebaef042fb63d2585440dc3637'
+ '830abe6f31fb926a1bcd2650731be15e'
+ '266e027bd4a998073f17d548d288d414')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/01-fix-screen-sel.patch"
+ ./configure \
+ --prefix=/usr \
+ --with-terminfo=/usr/share/terminfo \
+ --enable-256-color \
+ --enable-combining \
+ --enable-fading \
+ --enable-font-styles \
+ --enable-iso14755 \
+ --enable-keepscrolling \
+ --enable-lastlog \
+ --enable-mousewheel \
+ --enable-next-scroll \
+ --enable-perl \
+ --enable-pixbuf \
+ --enable-pointer-blank \
+ --enable-rxvt-scroll \
+ --enable-selectionscrolling \
+ --enable-slipwheeling \
+ --enable-smart-resize \
+ --enable-startup-notification \
+ --enable-transparency \
+ --enable-unicode3 \
+ --enable-utmp \
+ --enable-wtmp \
+ --enable-xft \
+ --enable-xim \
+ --enable-xterm-scroll \
+ --disable-frills
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ # workaround terminfo installation
+ export TERMINFO="$pkgdir/usr/share/terminfo"
+ install -d "$TERMINFO"
+ make DESTDIR="$pkgdir" install
+ # install the tabbing wrapper ( requires gtk2-perl! )
+ sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
+ install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed"
+ popd
+ # install freedesktop menu
+ for _f in urxvt urxvtc urxvt-tabbed; do
+ install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Copied: rxvt-unicode/repos/community-staging-i686/urxvt-tabbed.desktop (from rev 82788, rxvt-unicode/trunk/urxvt-tabbed.desktop)
===================================================================
--- community-staging-i686/urxvt-tabbed.desktop (rev 0)
+++ community-staging-i686/urxvt-tabbed.desktop 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=urxvt (tabbed)
+Comment=An unicode capable and tabbed rxvt clone
+Exec=urxvt-tabbed
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
Copied: rxvt-unicode/repos/community-staging-i686/urxvt.desktop (from rev 82788, rxvt-unicode/trunk/urxvt.desktop)
===================================================================
--- community-staging-i686/urxvt.desktop (rev 0)
+++ community-staging-i686/urxvt.desktop 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=urxvt
+Comment=An unicode capable rxvt clone
+Exec=urxvt
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
Copied: rxvt-unicode/repos/community-staging-i686/urxvtc.desktop (from rev 82788, rxvt-unicode/trunk/urxvtc.desktop)
===================================================================
--- community-staging-i686/urxvtc.desktop (rev 0)
+++ community-staging-i686/urxvtc.desktop 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=urxvt (client)
+Comment=An unicode capable rxvt clone client for urxvtd
+Exec=urxvtc
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
Copied: rxvt-unicode/repos/community-staging-x86_64/01-fix-screen-sel.patch (from rev 82788, rxvt-unicode/trunk/01-fix-screen-sel.patch)
===================================================================
--- community-staging-x86_64/01-fix-screen-sel.patch (rev 0)
+++ community-staging-x86_64/01-fix-screen-sel.patch 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,66 @@
+--- a/src/rxvt.h 2012-11-30 07:52:10.000000000 +0100
++++ b/src/rxvt.h 2013-01-19 18:14:07.477653413 +0100
+@@ -1488,6 +1488,7 @@
+ void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
+ void scr_kill_char (line_t &l, int col) const NOTHROW;
+ int scr_scroll_text (int row1, int row2, int count) NOTHROW;
++ void copy_line (line_t &dst, line_t &src);
+ void scr_reset ();
+ void scr_release () NOTHROW;
+ void scr_clear (bool really = false) NOTHROW;
+--- a/src/screen.C 2012-11-30 08:13:38.000000000 +0100
++++ b/src/screen.C 2013-01-19 18:17:13.431014964 +0100
+@@ -190,6 +190,16 @@
+ row_buf = swap_buf + nrow;
+ }
+
++void
++rxvt_term::copy_line (line_t &dst, line_t &src)
++{
++ scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
++ dst.l = min (src.l, ncol);
++ memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
++ memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
++ dst.f = src.f;
++}
++
+ void ecb_cold
+ rxvt_term::scr_reset ()
+ {
+@@ -232,8 +242,6 @@
+ line_t *prev_swap_buf = swap_buf;
+ line_t *prev_row_buf = row_buf;
+
+- int common_col = min (prev_ncol, ncol);
+-
+ scr_alloc ();
+
+ if (!prev_row_buf)
+@@ -277,13 +285,8 @@
+
+ for (int row = min (nrow, prev_nrow); row--; )
+ {
+- scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
+- scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
+-
+- memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
+- memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
+- memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
+- memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
++ copy_line (drawn_buf [row], prev_drawn_buf [row]);
++ copy_line (swap_buf [row], prev_swap_buf [row]);
+ }
+
+ int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
+@@ -388,10 +391,7 @@
+ line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
+ line_t &dst = row_buf [row];
+
+- scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
+-
+- memcpy (dst.t, src.t, sizeof (text_t) * common_col);
+- memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
++ copy_line (dst, src);
+ }
+
+ for (int row = prev_nrow; row < nrow; row++)
Copied: rxvt-unicode/repos/community-staging-x86_64/PKGBUILD (from rev 82788, rxvt-unicode/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+
+pkgname=rxvt-unicode
+pkgver=9.16
+pkgrel=2
+pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
+arch=('i686' 'x86_64')
+url='http://software.schmorp.de/pkg/rxvt-unicode.html'
+license=('GPL')
+depends=('libxft' 'gdk-pixbuf2' 'perl' 'startup-notification')
+optdepends=('gtk2-perl: to use the urxvt-tabbed')
+source=(
+ "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2"
+ 'urxvt.desktop'
+ 'urxvtc.desktop'
+ 'urxvt-tabbed.desktop'
+ '01-fix-screen-sel.patch'
+)
+md5sums=('2e2942e8367624affebc0568e3671b66'
+ 'c2b828d37d06cbf4c32937a2959f2fc2'
+ '10e80aebaef042fb63d2585440dc3637'
+ '830abe6f31fb926a1bcd2650731be15e'
+ '266e027bd4a998073f17d548d288d414')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/01-fix-screen-sel.patch"
+ ./configure \
+ --prefix=/usr \
+ --with-terminfo=/usr/share/terminfo \
+ --enable-256-color \
+ --enable-combining \
+ --enable-fading \
+ --enable-font-styles \
+ --enable-iso14755 \
+ --enable-keepscrolling \
+ --enable-lastlog \
+ --enable-mousewheel \
+ --enable-next-scroll \
+ --enable-perl \
+ --enable-pixbuf \
+ --enable-pointer-blank \
+ --enable-rxvt-scroll \
+ --enable-selectionscrolling \
+ --enable-slipwheeling \
+ --enable-smart-resize \
+ --enable-startup-notification \
+ --enable-transparency \
+ --enable-unicode3 \
+ --enable-utmp \
+ --enable-wtmp \
+ --enable-xft \
+ --enable-xim \
+ --enable-xterm-scroll \
+ --disable-frills
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ # workaround terminfo installation
+ export TERMINFO="$pkgdir/usr/share/terminfo"
+ install -d "$TERMINFO"
+ make DESTDIR="$pkgdir" install
+ # install the tabbing wrapper ( requires gtk2-perl! )
+ sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
+ install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed"
+ popd
+ # install freedesktop menu
+ for _f in urxvt urxvtc urxvt-tabbed; do
+ install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Copied: rxvt-unicode/repos/community-staging-x86_64/urxvt-tabbed.desktop (from rev 82788, rxvt-unicode/trunk/urxvt-tabbed.desktop)
===================================================================
--- community-staging-x86_64/urxvt-tabbed.desktop (rev 0)
+++ community-staging-x86_64/urxvt-tabbed.desktop 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=urxvt (tabbed)
+Comment=An unicode capable and tabbed rxvt clone
+Exec=urxvt-tabbed
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
Copied: rxvt-unicode/repos/community-staging-x86_64/urxvt.desktop (from rev 82788, rxvt-unicode/trunk/urxvt.desktop)
===================================================================
--- community-staging-x86_64/urxvt.desktop (rev 0)
+++ community-staging-x86_64/urxvt.desktop 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=urxvt
+Comment=An unicode capable rxvt clone
+Exec=urxvt
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
Copied: rxvt-unicode/repos/community-staging-x86_64/urxvtc.desktop (from rev 82788, rxvt-unicode/trunk/urxvtc.desktop)
===================================================================
--- community-staging-x86_64/urxvtc.desktop (rev 0)
+++ community-staging-x86_64/urxvtc.desktop 2013-01-24 13:11:32 UTC (rev 82789)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=urxvt (client)
+Comment=An unicode capable rxvt clone client for urxvtd
+Exec=urxvtc
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
More information about the arch-commits
mailing list