rxvt-unicode-better-wheel-scrolling: update to 9.16

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

4 files changed, 51 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9ede067ff0d..fb9fdde3e323 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.15
-	pkgrel = 4
+	pkgver = 9.16
+	pkgrel = 1
 	url = http://software.schmorp.de/pkg/rxvt-unicode.html
 	arch = i686
 	arch = x86_64
@@ -12,18 +12,18 @@ pkgbase = rxvt-unicode-better-wheel-scrolling
 	optdepends = perl: lots of utilities
 	provides = rxvt-unicode=9.15
 	conflicts = rxvt-unicode
-	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.15.tar.bz2
+	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.16.tar.bz2
 	source = rxvt-unicode.desktop
 	source = clear.patch
 	source = secondaryWheel.patch
-	md5sums = 15595aa326167ac5eb68c28d95432faf
+	md5sums = 2e2942e8367624affebc0568e3671b66
 	md5sums = 3de6c13126a45bc3bc9f6bba077a1311
-	md5sums = 061b851e89e53a71d1afad6947c51ca7
-	md5sums = ee638fc295bd563b9afd7e243e759c2c
-	sha1sums = e6fdf091860ecb458730dc68b0176f67f207a2f7
+	md5sums = cd307bca4920050db4d6d2fe8058e905
+	md5sums = 5cbfc7e25f807d461d577383f9f7a97c
+	sha1sums = 1b721969d6a6ed0f84529a29cfff0a05aee015ab
 	sha1sums = 962aebc88982dbeb62a7c4a051ff567e015f61a0
-	sha1sums = 584b15ee837acb4a10dc39a83c4fbe2d3a6bcb7f
-	sha1sums = d42765636661e6f0df64d23c8b7fdd4537675409
+	sha1sums = 8a166a8e50f9b7400582e2d665986f46c8297a87
+	sha1sums = 908c2ea08592c46e7071012d7e9a09595310ca38
 
 pkgname = rxvt-unicode-better-wheel-scrolling
 
diff --git a/PKGBUILD b/PKGBUILD
index 1c6b8586a546..60ed478e6144 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgname=rxvt-unicode
 pkgname=${_pkgname}-better-wheel-scrolling
-pkgver=9.15
-pkgrel=4
+pkgver=9.16
+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"
@@ -20,14 +20,14 @@ conflicts=('rxvt-unicode')
 source=(http://dist.schmorp.de/rxvt-unicode/${_pkgname}-${pkgver}.tar.bz2 \
         ${_pkgname}.desktop
 	clear.patch secondaryWheel.patch)
-md5sums=('15595aa326167ac5eb68c28d95432faf'
+md5sums=('2e2942e8367624affebc0568e3671b66'
          '3de6c13126a45bc3bc9f6bba077a1311'
-         '061b851e89e53a71d1afad6947c51ca7'
-         'ee638fc295bd563b9afd7e243e759c2c')
-sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7'
+         'cd307bca4920050db4d6d2fe8058e905'
+         '5cbfc7e25f807d461d577383f9f7a97c')
+sha1sums=('1b721969d6a6ed0f84529a29cfff0a05aee015ab'
           '962aebc88982dbeb62a7c4a051ff567e015f61a0'
-          '584b15ee837acb4a10dc39a83c4fbe2d3a6bcb7f'
-          'd42765636661e6f0df64d23c8b7fdd4537675409')
+          '8a166a8e50f9b7400582e2d665986f46c8297a87'
+          '908c2ea08592c46e7071012d7e9a09595310ca38')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/clear.patch b/clear.patch
index 402287677a61..d9c8ee18594e 100644
--- a/clear.patch
+++ b/clear.patch
@@ -1,7 +1,8 @@
-diff -r 4399ffb6a87c -r 48f53e1cf599 src/command.C
---- a/src/command.C	Sat Jan 21 13:57:22 2012 +0100
-+++ b/src/command.C	Mon Apr 30 16:22:25 2012 +0200
-@@ -2869,6 +2869,10 @@
+diff --git a/src/command.C b/src/command.C
+index ab1a4cd..4880f02 100644
+--- a/src/command.C
++++ b/src/command.C
+@@ -2899,6 +2899,10 @@ rxvt_term::process_csi_seq ()
        return;
      }
  
@@ -12,7 +13,7 @@ diff -r 4399ffb6a87c -r 48f53e1cf599 src/command.C
    switch (ch)
      {
          /*
-@@ -2932,6 +2936,12 @@
+@@ -2962,6 +2966,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 */
@@ -25,7 +26,7 @@ diff -r 4399ffb6a87c -r 48f53e1cf599 src/command.C
          scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
          break;
  
-@@ -2943,6 +2953,16 @@
+@@ -2973,6 +2983,16 @@ rxvt_term::process_csi_seq ()
          break;
  
        case CSI_ED:		/* 8.3.40: (0) ERASE IN PAGE */
@@ -42,7 +43,7 @@ diff -r 4399ffb6a87c -r 48f53e1cf599 src/command.C
          scr_erase_screen (arg[0]);
          break;
  
-@@ -3086,6 +3106,16 @@
+@@ -3116,6 +3136,16 @@ rxvt_term::process_csi_seq ()
        default:
          break;
      }
diff --git a/secondaryWheel.patch b/secondaryWheel.patch
index b588b53527fa..a94d1c25a33e 100644
--- a/secondaryWheel.patch
+++ b/secondaryWheel.patch
@@ -1,7 +1,8 @@
-diff -r 4399ffb6a87c doc/rxvt.1.pod
---- a/doc/rxvt.1.pod	Sat Jan 21 13:57:22 2012 +0100
-+++ b/doc/rxvt.1.pod	Sat Jan 21 14:03:04 2012 +0100
-@@ -456,6 +456,11 @@
+diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
+index 4c93c4b..8b429a0 100644
+--- a/doc/rxvt.1.pod
++++ b/doc/rxvt.1.pod
+@@ -417,6 +417,11 @@ B<secondaryScreen>.
  Turn on/off secondary screen scroll (default enabled); resource
  B<secondaryScroll>.
  
@@ -13,7 +14,7 @@ diff -r 4399ffb6a87c doc/rxvt.1.pod
  =item B<-hold>|B<+hold>
  
  Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
-@@ -1168,6 +1173,13 @@
+@@ -1029,6 +1034,13 @@ option is enabled, scrolls on the secondary screen will change the
  scrollback buffer and, when secondaryScreen is off, switching
  to/from the secondary screen will instead scroll the screen up.
  
@@ -27,10 +28,11 @@ diff -r 4399ffb6a87c doc/rxvt.1.pod
  =item B<hold>: I<boolean>
  
  Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
-diff -r 4399ffb6a87c src/command.C
---- a/src/command.C	Sat Jan 21 13:57:22 2012 +0100
-+++ b/src/command.C	Sat Jan 21 14:03:04 2012 +0100
-@@ -2197,10 +2197,46 @@
+diff --git a/src/command.C b/src/command.C
+index ab1a4cd..9fde946 100644
+--- a/src/command.C
++++ b/src/command.C
+@@ -2225,10 +2225,46 @@ rxvt_term::button_release (XButtonEvent &ev)
                  }
                else
  # endif
@@ -79,9 +81,10 @@ diff -r 4399ffb6a87c src/command.C
              }
              break;
  #endif
-diff -r 4399ffb6a87c src/optinc.h
---- a/src/optinc.h	Sat Jan 21 13:57:22 2012 +0100
-+++ b/src/optinc.h	Sat Jan 21 14:03:04 2012 +0100
+diff --git a/src/optinc.h b/src/optinc.h
+index d814035..a365037 100644
+--- a/src/optinc.h
++++ b/src/optinc.h
 @@ -26,6 +26,7 @@
   def(cursorBlink)
   def(secondaryScreen)
@@ -90,21 +93,23 @@ diff -r 4399ffb6a87c src/optinc.h
   def(pastableTabs)
   def(cursorUnderline)
  #if ENABLE_FRILLS
-diff -r 4399ffb6a87c src/rsinc.h
---- a/src/rsinc.h	Sat Jan 21 13:57:22 2012 +0100
-+++ b/src/rsinc.h	Sat Jan 21 14:03:04 2012 +0100
-@@ -102,6 +102,7 @@
+diff --git a/src/rsinc.h b/src/rsinc.h
+index 2906837..2e77fa1 100644
+--- a/src/rsinc.h
++++ b/src/rsinc.h
+@@ -103,6 +103,7 @@
  #ifndef NO_SECONDARY_SCREEN
    def (secondaryScreen)
    def (secondaryScroll)
 +  def (secondaryWheel)
  #endif
- #ifdef OFF_FOCUS_FADING
+ #if OFF_FOCUS_FADING
    def (fade)
-diff -r 4399ffb6a87c src/xdefaults.C
---- a/src/xdefaults.C	Sat Jan 21 13:57:22 2012 +0100
-+++ b/src/xdefaults.C	Sat Jan 21 14:03:04 2012 +0100
-@@ -261,6 +261,7 @@
+diff --git a/src/xdefaults.C b/src/xdefaults.C
+index 856acaf..7394852 100644
+--- a/src/xdefaults.C
++++ b/src/xdefaults.C
+@@ -262,6 +262,7 @@ optList[] = {
  #ifndef NO_SECONDARY_SCREEN
                BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
                BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),