rxvt-unicode-better-wheel-scrolling: upgrade to 9.19

Signed-off-by: Olivier Brunel <jjk@jjacky.com>

5 files changed, 29 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a2b015e0d4a..6128495e50eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rxvt-unicode-better-wheel-scrolling
 	pkgdesc = An unicode enabled rxvt-clone terminal emulator (urxvt) w/ better wheel scrolling (VTE-like) (& no utmp/wtmp support)
-	pkgver = 9.18
-	pkgrel = 3
+	pkgver = 9.19
+	pkgrel = 1
 	url = http://software.schmorp.de/pkg/rxvt-unicode.html
 	arch = i686
 	arch = x86_64
@@ -12,21 +12,18 @@ pkgbase = rxvt-unicode-better-wheel-scrolling
 	optdepends = perl: lots of utilities
 	provides = rxvt-unicode
 	conflicts = rxvt-unicode
-	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.18.tar.bz2
+	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.19.tar.bz2
 	source = rxvt-unicode.desktop
-	source = fix-doc.patch
 	source = clear.patch
 	source = secondaryWheel.patch
-	md5sums = 963ccc748fe5bca925e7b92c0404d68b
+	md5sums = 45ad197eb9b5a840c0f65e3a8131921c
 	md5sums = af8e6ad4cd2d33c26f8df6a838685332
-	md5sums = 77d1079a047589b47cd536ea71dc2a9a
-	md5sums = 5714991c5b1bf5f7d7769961e391a0db
-	md5sums = 3ac56e66095db241c0a5f223f3e9b677
-	sha1sums = 5d12639c4b17019357ee62c08916b826e5d03259
+	md5sums = 9fecdb0265bd58c3896548e43ef00b6b
+	md5sums = 37fd5b2ca79d2e1c6c4ed5c75696388b
+	sha1sums = 979f990b73cf057d81f25884668f362b5a748154
 	sha1sums = 9a31b46324c0be44fb97be0828e1ead2311b3f9f
-	sha1sums = 2eb8b4c9099c48a47b3c9f30a62244ce514c9df2
-	sha1sums = 089e0263722412dd82008ae3e2b3eb335fc8116e
-	sha1sums = 7d980df213f9183e26626ebaca7f914d124e9c4b
+	sha1sums = 013bd0d29b922aaccebb6d48092ed3694ea92d6f
+	sha1sums = 332ac4885c0e0b3c83db9b94dd18ced5593191b8
 
 pkgname = rxvt-unicode-better-wheel-scrolling
 
diff --git a/PKGBUILD b/PKGBUILD
index 89fa36db8a32..615f2f38d36e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgname=rxvt-unicode
 pkgname=${_pkgname}-better-wheel-scrolling
-pkgver=9.18
-pkgrel=3
+pkgver=9.19
+pkgrel=1
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt) w/ better wheel scrolling (VTE-like) (& no utmp/wtmp support)"
 arch=('i686' 'x86_64')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -19,22 +19,18 @@ provides=('rxvt-unicode')
 conflicts=('rxvt-unicode')
 source=(http://dist.schmorp.de/rxvt-unicode/${_pkgname}-${pkgver}.tar.bz2 \
         ${_pkgname}.desktop
-        fix-doc.patch
         clear.patch secondaryWheel.patch)
-md5sums=('963ccc748fe5bca925e7b92c0404d68b'
+md5sums=('45ad197eb9b5a840c0f65e3a8131921c'
          'af8e6ad4cd2d33c26f8df6a838685332'
-         '77d1079a047589b47cd536ea71dc2a9a'
-         '5714991c5b1bf5f7d7769961e391a0db'
-         '3ac56e66095db241c0a5f223f3e9b677')
-sha1sums=('5d12639c4b17019357ee62c08916b826e5d03259'
+         '9fecdb0265bd58c3896548e43ef00b6b'
+         '37fd5b2ca79d2e1c6c4ed5c75696388b')
+sha1sums=('979f990b73cf057d81f25884668f362b5a748154'
           '9a31b46324c0be44fb97be0828e1ead2311b3f9f'
-          '2eb8b4c9099c48a47b3c9f30a62244ce514c9df2'
-          '089e0263722412dd82008ae3e2b3eb335fc8116e'
-          '7d980df213f9183e26626ebaca7f914d124e9c4b')
+          '013bd0d29b922aaccebb6d48092ed3694ea92d6f'
+          '332ac4885c0e0b3c83db9b94dd18ced5593191b8')
 
 prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
-  patch -p0 -i ../fix-doc.patch
   patch -p1 -i ../clear.patch
   patch -p1 -i ../secondaryWheel.patch
 }
diff --git a/clear.patch b/clear.patch
index 325de211dcc7..20dbc93dabde 100644
--- a/clear.patch
+++ b/clear.patch
@@ -1,8 +1,8 @@
 diff --git a/src/command.C b/src/command.C
-index 82ad10a..4491e2d 100644
+index 542d14c..d8c1b27 100644
 --- a/src/command.C
 +++ b/src/command.C
-@@ -2895,6 +2895,10 @@ rxvt_term::process_csi_seq ()
+@@ -2898,6 +2898,10 @@ rxvt_term::process_csi_seq ()
        return;
      }
  
@@ -13,7 +13,7 @@ index 82ad10a..4491e2d 100644
    switch (ch)
      {
          /*
-@@ -2958,6 +2962,12 @@ rxvt_term::process_csi_seq ()
+@@ -2961,6 +2965,12 @@ rxvt_term::process_csi_seq ()
  
        case CSI_CUP:		/* 8.3.21: (1,1) CURSOR POSITION */
        case CSI_HVP:		/* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
@@ -26,7 +26,7 @@ index 82ad10a..4491e2d 100644
          scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
          break;
  
-@@ -2969,6 +2979,16 @@ rxvt_term::process_csi_seq ()
+@@ -2972,6 +2982,16 @@ rxvt_term::process_csi_seq ()
          break;
  
        case CSI_ED:		/* 8.3.40: (0) ERASE IN PAGE */
@@ -43,7 +43,7 @@ index 82ad10a..4491e2d 100644
          scr_erase_screen (arg[0]);
          break;
  
-@@ -3112,6 +3132,16 @@ rxvt_term::process_csi_seq ()
+@@ -3120,6 +3140,16 @@ rxvt_term::process_csi_seq ()
        default:
          break;
      }
diff --git a/fix-doc.patch b/fix-doc.patch
deleted file mode 100644
index f4ccc435e771..000000000000
--- a/fix-doc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- doc/rxvt.1.pod.orig	2013-05-26 12:41:15.483013688 +0200
-+++ doc/rxvt.1.pod	2013-05-26 12:43:36.189671709 +0200
-@@ -1219,8 +1219,12 @@
- 
- Turn on/off ISO 14755 5.2 mode (default enabled).
- 
-+=back
-+
- =head1 BACKGROUND IMAGE OPTIONS AND RESOURCES
- 
-+=over 4
-+
- =item B<-pixmap> I<file[;oplist]>
- 
- =item B<backgroundPixmap:> I<file[;oplist]>
diff --git a/secondaryWheel.patch b/secondaryWheel.patch
index 070d4c74819b..b3cd921104c8 100644
--- a/secondaryWheel.patch
+++ b/secondaryWheel.patch
@@ -1,5 +1,5 @@
 diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
-index 4c93c4b..8b429a0 100644
+index 7e2ae26..b7f993f 100644
 --- a/doc/rxvt.1.pod
 +++ b/doc/rxvt.1.pod
 @@ -417,6 +417,11 @@ B<secondaryScreen>.
@@ -29,16 +29,16 @@ index 4c93c4b..8b429a0 100644
  
  Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
 diff --git a/src/command.C b/src/command.C
-index 82ad10a..9bc5e79 100644
+index 542d14c..cd4066d 100644
 --- a/src/command.C
 +++ b/src/command.C
-@@ -2221,10 +2221,46 @@ rxvt_term::button_release (XButtonEvent &ev)
+@@ -2222,10 +2222,46 @@ rxvt_term::button_release (XButtonEvent &ev)
                  }
                else
  # endif
 +#ifndef NO_SECONDARY_SCREEN
                  {
--                  scr_page (v, i);
+-                  scr_page (dirn, lines);
 -                  scrollBar.show (1);
 +                  /* on SECONDARY screen, we send "fake" UP/DOWN keys instead
 +                   * (this allows to scroll within man, less, etc) */
@@ -57,8 +57,8 @@ index 82ad10a..9bc5e79 100644
 +                       event.same_screen = ev.same_screen;
 +                       event.state       = 0;
 +                       event.keycode     = XKeysymToKeycode(ev.display,
-+                                            (v == UP) ? XK_Up : XK_Down);
-+                       for (i = 0; i < 3; ++i)
++                                            (dirn == UP) ? XK_Up : XK_Down);
++                       for (lines = 0; lines < 3; ++lines)
 +                         {
 +                            event.type = KeyPress;
 +                            XSendEvent (event.display, event.window, True,
@@ -72,7 +72,7 @@ index 82ad10a..9bc5e79 100644
 +                  else
 +#endif
 +                    {
-+                       scr_page (v, i);
++                       scr_page (dirn, lines);
 +                       scrollBar.show (1);
 +                    }
 +#ifndef NO_SECONDARY_SCREEN