[arch-commits] Commit in rxvt-unicode/trunk (01-fix-screen-sel.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Friday, March 1, 2013 @ 22:26:42
  Author: seblu
Revision: 85461

upgpkg: rxvt-unicode 9.17-1

Modified:
  rxvt-unicode/trunk/PKGBUILD
Deleted:
  rxvt-unicode/trunk/01-fix-screen-sel.patch

-------------------------+
 01-fix-screen-sel.patch |   66 ----------------------------------------------
 PKGBUILD                |   11 ++-----
 2 files changed, 4 insertions(+), 73 deletions(-)

Deleted: 01-fix-screen-sel.patch
===================================================================
--- 01-fix-screen-sel.patch	2013-03-01 20:56:26 UTC (rev 85460)
+++ 01-fix-screen-sel.patch	2013-03-01 21:26:42 UTC (rev 85461)
@@ -1,66 +0,0 @@
---- 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++)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-01 20:56:26 UTC (rev 85460)
+++ PKGBUILD	2013-03-01 21:26:42 UTC (rev 85461)
@@ -5,8 +5,8 @@
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.16
-pkgrel=2
+pkgver=9.17
+pkgrel=1
 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -18,17 +18,14 @@
   'urxvt.desktop'
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
-  '01-fix-screen-sel.patch'
 )
-md5sums=('2e2942e8367624affebc0568e3671b66'
+md5sums=('1270432bdc7ce17dbb07d41a607081e0'
          'c2b828d37d06cbf4c32937a2959f2fc2'
          '10e80aebaef042fb63d2585440dc3637'
-         '830abe6f31fb926a1bcd2650731be15e'
-         '266e027bd4a998073f17d548d288d414')
+         '830abe6f31fb926a1bcd2650731be15e')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir/01-fix-screen-sel.patch"
   ./configure \
     --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \