update to 9.31

6 files changed, 56 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dc5c7af7ee5..b0ba022849c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rxvt-unicode-truecolor-wide-glyphs
 	pkgdesc = Unicode enabled rxvt-clone terminal emulator (urxvt) with true color, enhanced glyphs and improved font rendering support
-	pkgver = 9.30
-	pkgrel = 6
+	pkgver = 9.31
+	pkgrel = 1
 	url = http://software.schmorp.de/pkg/rxvt-unicode.html
 	arch = i686
 	arch = x86_64
@@ -10,7 +10,9 @@ pkgbase = rxvt-unicode-truecolor-wide-glyphs
 	depends = libxt
 	depends = perl
 	depends = startup-notification
+	depends = libnsl
 	depends = libptytty
+	depends = libxext
 	optdepends = gtk2-perl: to use the urxvt-tabbed
 	provides = rxvt-unicode
 	provides = rxvt-unicode-terminfo
@@ -20,8 +22,7 @@ pkgbase = rxvt-unicode-truecolor-wide-glyphs
 	conflicts = rxvt-unicode-terminfo
 	conflicts = urxvt-resize-font
 	conflicts = urxvt-perls
-	conflicts = urxvt-perls-git
-	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.30.tar.bz2
+	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.31.tar.bz2
 	source = urxvt.desktop
 	source = urxvtc.desktop
 	source = urxvt-tabbed.desktop
@@ -30,16 +31,14 @@ pkgbase = rxvt-unicode-truecolor-wide-glyphs
 	source = 24-bit-color.patch
 	source = enable-wide-glyphs.patch
 	source = improve-font-rendering.patch
-	source = perl-background-fix.patch
-	b2sums = 645164e37e9e484c66f5047836689e4e4727575dfdcbefc64affb70d9110497529fdcc7d476f77737efed5cee4af314e1e1ccbcb42b506bb7e653b827c24a0c7
+	b2sums = 439a8c33b7260e0f2fd68b8a4409773c06c3bb7623b5dfbbb0742cc198c9fd25e8a247907878639db5fac3dcd3b6be3d839347787bcf08ca602ae246607f750b
 	b2sums = eff2407a1551d57d7a9e9000a9bad760afd4d9b7a0fa15c375ec821d185561a99c3761319c1cbed5cdd512b39faf339fb78387220eae161c9a33a859fc4733d2
 	b2sums = 2c4bc054e89b1bbd9ebce18cee64728b5ebb3aa915ce3ec7957e1a95da34c26ea757d324041b6c65db5902b60d0009176ff6aabc5093c5b2665c4b6997a3f60f
 	b2sums = 71072f1f262b0759f0251654b7563e0dc5b3f73bc3705321d4e75230c51692541a8f5aa289657714baeab93a9e7b404a0b3ce0eecafb116c389a640209916916
 	b2sums = 7f760beda37d781ae5bfff280fb912b3210ed4e60c82d279706feb023e5e10e9c5abe8eaa9bef6d7da460df39808c56de91ee2d5ffc63ea0c2e402810fa3dfb5
 	b2sums = 9e3c03390d44a53b933fd6e11f3b644c43f377d3848975d9a5d1b964b042aca08995c968ada22b143bdc014691282242c8e718820f16086b35588242eb71a15b
-	b2sums = 714c6f6b25dded535be85107ff1495175fbec1568f46eac7f59a0ef1af873bf3ac73bc312611c4a4443127f66d5fde48f30f342ca1f632541066d1bd6e11b560
-	b2sums = f9c56c35579155f33f2c09a580554a58e82e1de328d3bf3037386ab1cecb2970abeffe215ad9909706c398c506e369936584024672aac379f78a7f5bbcecc560
-	b2sums = c2e0b6be3df3cf037ffa1db9a5acff92dacd8ad6244b152bcb83cfd13bc3fc7a72dbd39b0ee97855c27ba960f2de5d5558516d12e4ec876d5d8bdba9eef11e1a
-	b2sums = d7f8b1472de6563d329f0edac6839a1625af4b74a782fb7080d30b804a5bb7292cf8b136c0682e535e5806092eddbe970399f3591e9150c6929ab85056c30be1
+	b2sums = 03c250e1aedbe50924b34cc9261921b3bf7af6786ce3fea61cbcf145b79b6eb4e101e63fa08f00baaabe530bb164e6bcfd4c04ddbacf0dcc28fdebef0519b9e0
+	b2sums = 8d360d8b0cd274b63f3c0c7651b358cf94aa71c39adb15ca5d8f3c8a05d930bf96ac559e6b7eceb6b3706a2caa3bf7002f75f596a1efdb5e54e43d20b9341590
+	b2sums = 77b2a764558660cbc16325eacca3a2b17d3071d59c7a956a43c796a8d9374f5d202012e13a50ef4d978e2826009d9f1a93fb118d97e27e4cfbf0569e1d781082
 
 pkgname = rxvt-unicode-truecolor-wide-glyphs
diff --git a/24-bit-color.patch b/24-bit-color.patch
index fcce87d1dbfb..3fa3b1d86efc 100644
--- a/24-bit-color.patch
+++ b/24-bit-color.patch
@@ -120,16 +120,16 @@
      }
  #endif
  }
-@@ -3411,7 +3411,7 @@
-         return;
- 
+@@ -3415,7 +3415,7 @@
+   if (str[0] == '?' && !str[1])
+     {
        rgba c;
 -      pix_colors_focused[color].get (c);
 +      lookup_color(color, pix_colors_focused).get (c);
-       color -= minCOLOR;
+       char rgba_str[32];
  
  #if XFT
-@@ -3915,7 +3915,7 @@
+@@ -3924,7 +3924,7 @@
  {
    unsigned int i;
    short rendset;
@@ -138,7 +138,7 @@
  
    if (nargs == 0)
      {
-@@ -4021,6 +4021,20 @@
+@@ -4030,6 +4030,20 @@
              break;
  
            case 38: // set fg color, ISO 8613-6
@@ -159,7 +159,7 @@
            case 48: // set bg color, ISO 8613-6
              {
                unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
-@@ -4033,6 +4047,14 @@
+@@ -4042,6 +4056,14 @@
  
                    scr_color (idx, fgbg);
                  }
@@ -176,7 +176,7 @@
                    unsigned int r = arg[i + 2];
 --- src/init.C
 +++ src/init.C
-@@ -1121,7 +1121,7 @@
+@@ -1138,7 +1138,7 @@
  
    for (i = 0; i < NRS_COLORS; i++)
      if (const char *name = rs[Rs_color + i])
@@ -185,7 +185,7 @@
  
    /*
     * get scrollBar shadow colors
-@@ -1130,13 +1130,13 @@
+@@ -1147,13 +1147,13 @@
     * from the fvwm window manager.
     */
  #ifdef RXVT_SCROLLBAR
@@ -202,7 +202,7 @@
                     rgba (
                       min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
                       min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
-@@ -1378,8 +1378,8 @@
+@@ -1395,8 +1395,8 @@
    window_calc (0, 0);
  
    /* sub-window placement & size in rxvt_term::resize_all_windows () */
@@ -213,7 +213,7 @@
    attributes.colormap         = cmap;
  
    top = XCreateWindow (dpy, parent,
-@@ -1476,8 +1476,8 @@
+@@ -1493,8 +1493,8 @@
                              window_vt_x, window_vt_y,
                              vt_width, vt_height,
                              0,
@@ -224,7 +224,7 @@
  
    attributes.bit_gravity = NorthWestGravity;
    XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
-@@ -1494,8 +1494,8 @@
+@@ -1511,8 +1511,8 @@
    vt_ev.start (display, vt);
  
    /* graphics context for the vt window */
@@ -583,7 +583,7 @@
    void scr_tab (int count, bool ht = false) noexcept;
 --- src/rxvtperl.xs
 +++ src/rxvtperl.xs
-@@ -795,6 +795,18 @@
+@@ -802,6 +802,18 @@
  
  PROTOTYPES: ENABLE
  
@@ -602,7 +602,7 @@
  BOOT:
  {
    sv_setsv (get_sv ("urxvt::LIBDIR",   1), newSVpvn (LIBDIR,   sizeof (LIBDIR)   - 1));
-@@ -1107,43 +1119,43 @@
+@@ -1128,43 +1140,43 @@
          OUTPUT:
          RETVAL
  
@@ -658,7 +658,7 @@
  	CODE:
  {
          if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
-@@ -1563,8 +1575,8 @@
+@@ -1619,8 +1631,8 @@
          THIS->vt_emask_perl |= emask;
          THIS->vt_select_input ();
  
@@ -669,7 +669,7 @@
  	CODE:
          RETVAL = THIS->rstyle;
          THIS->rstyle = new_rstyle;
-@@ -2050,10 +2062,10 @@
+@@ -2106,10 +2118,10 @@
          RETVAL
  
  void
@@ -682,7 +682,7 @@
  
  void
  rxvt_term::scr_bell ()
-@@ -2119,7 +2131,7 @@
+@@ -2175,7 +2187,7 @@
  }
  
  SV *
@@ -691,7 +691,7 @@
  	CODE:
  {
          overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
-@@ -2218,8 +2230,8 @@
+@@ -2297,8 +2309,8 @@
  XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
  	C_ARGS: term->dpy, (Window)parent,
                  x, y, width, height, 0,
@@ -702,7 +702,7 @@
  
  #endif
  
-@@ -2353,7 +2365,7 @@
+@@ -2432,7 +2444,7 @@
              img->reify ()
                 ->replace (img);
  
@@ -713,7 +713,7 @@
              THIS->bg_img = img;
 --- src/screen.C
 +++ src/screen.C
-@@ -626,12 +626,51 @@
+@@ -627,12 +627,51 @@
      rstyle = SET_BGCOLOR (rstyle, color);
  }
  
@@ -766,7 +766,7 @@
  {
    if (set)
      rstyle |= style;
-@@ -1389,13 +1428,13 @@
+@@ -1390,13 +1429,13 @@
  
        if (mapped)
          {
@@ -782,7 +782,7 @@
            XChangeGC (dpy, gc, GCForeground, &gcvalue);
          }
      }
-@@ -1724,15 +1763,15 @@
+@@ -1725,15 +1764,15 @@
          }
        else
  #endif
@@ -802,7 +802,7 @@
        XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
  
        scr_clear ();
-@@ -2430,14 +2469,14 @@
+@@ -2431,14 +2470,14 @@
              {
                if (showcursor && focus && row == screen.cur.row
                    && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
@@ -820,7 +820,7 @@
  
                XDrawLine (dpy, vt, gc,
                           xpixel, ypixel + font->ascent + 1,
-@@ -2457,7 +2496,7 @@
+@@ -2458,7 +2497,7 @@
              scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
            else if (oldcursor.row >= 0)
              {
@@ -829,7 +829,7 @@
                if (cursor_type == 1)
                  XFillRectangle (dpy, vt, gc,
                                  Col2Pixel (cur_col),
-@@ -2474,7 +2513,7 @@
+@@ -2475,7 +2514,7 @@
          }
        else if (oldcursor.row >= 0)
          {
@@ -838,7 +838,7 @@
  
            XDrawRectangle (dpy, vt, gc,
                            Col2Pixel (cur_col),
-@@ -2543,15 +2582,15 @@
+@@ -2544,15 +2583,15 @@
        else
  # endif
          {
@@ -857,7 +857,7 @@
      }
  
    XClearWindow (dpy, parent);
-@@ -2561,7 +2600,7 @@
+@@ -2562,7 +2601,7 @@
        if (transparent)
          XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
        else
diff --git a/PKGBUILD b/PKGBUILD
index 2f784cc5c7b9..1408f44f2032 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: ferdig <ferdinand.goldmann@jku.at>
 _pkgname=rxvt-unicode
 pkgname=rxvt-unicode-truecolor-wide-glyphs
-pkgver=9.30
-pkgrel=6
+pkgver=9.31
+pkgrel=1
 pkgdesc="Unicode enabled rxvt-clone terminal emulator (urxvt) with true color, enhanced glyphs and improved font rendering support"
 arch=('i686' 'x86_64')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -13,7 +13,9 @@ depends=(
     'libxt'
     'perl'
     'startup-notification'
+    'libnsl'
     'libptytty'
+    'libxext'
 )
 optdepends=(
     'gtk2-perl: to use the urxvt-tabbed'
@@ -29,7 +31,6 @@ conflicts=(
     'rxvt-unicode-terminfo'
     'urxvt-resize-font'
     'urxvt-perls'
-    'urxvt-perls-git'
 )
 source=(
     http://dist.schmorp.de/$_pkgname/$_pkgname-$pkgver.tar.bz2
@@ -41,23 +42,28 @@ source=(
     '24-bit-color.patch'
     'enable-wide-glyphs.patch'
     'improve-font-rendering.patch'
-    'perl-background-fix.patch'
 )
-b2sums=('645164e37e9e484c66f5047836689e4e4727575dfdcbefc64affb70d9110497529fdcc7d476f77737efed5cee4af314e1e1ccbcb42b506bb7e653b827c24a0c7'
+b2sums=('439a8c33b7260e0f2fd68b8a4409773c06c3bb7623b5dfbbb0742cc198c9fd25e8a247907878639db5fac3dcd3b6be3d839347787bcf08ca602ae246607f750b'
         'eff2407a1551d57d7a9e9000a9bad760afd4d9b7a0fa15c375ec821d185561a99c3761319c1cbed5cdd512b39faf339fb78387220eae161c9a33a859fc4733d2'
         '2c4bc054e89b1bbd9ebce18cee64728b5ebb3aa915ce3ec7957e1a95da34c26ea757d324041b6c65db5902b60d0009176ff6aabc5093c5b2665c4b6997a3f60f'
         '71072f1f262b0759f0251654b7563e0dc5b3f73bc3705321d4e75230c51692541a8f5aa289657714baeab93a9e7b404a0b3ce0eecafb116c389a640209916916'
         '7f760beda37d781ae5bfff280fb912b3210ed4e60c82d279706feb023e5e10e9c5abe8eaa9bef6d7da460df39808c56de91ee2d5ffc63ea0c2e402810fa3dfb5'
         '9e3c03390d44a53b933fd6e11f3b644c43f377d3848975d9a5d1b964b042aca08995c968ada22b143bdc014691282242c8e718820f16086b35588242eb71a15b'
-        '714c6f6b25dded535be85107ff1495175fbec1568f46eac7f59a0ef1af873bf3ac73bc312611c4a4443127f66d5fde48f30f342ca1f632541066d1bd6e11b560'
-        'f9c56c35579155f33f2c09a580554a58e82e1de328d3bf3037386ab1cecb2970abeffe215ad9909706c398c506e369936584024672aac379f78a7f5bbcecc560'
-        'c2e0b6be3df3cf037ffa1db9a5acff92dacd8ad6244b152bcb83cfd13bc3fc7a72dbd39b0ee97855c27ba960f2de5d5558516d12e4ec876d5d8bdba9eef11e1a'
-        'd7f8b1472de6563d329f0edac6839a1625af4b74a782fb7080d30b804a5bb7292cf8b136c0682e535e5806092eddbe970399f3591e9150c6929ab85056c30be1')
+        '03c250e1aedbe50924b34cc9261921b3bf7af6786ce3fea61cbcf145b79b6eb4e101e63fa08f00baaabe530bb164e6bcfd4c04ddbacf0dcc28fdebef0519b9e0'
+        '8d360d8b0cd274b63f3c0c7651b358cf94aa71c39adb15ca5d8f3c8a05d930bf96ac559e6b7eceb6b3706a2caa3bf7002f75f596a1efdb5e54e43d20b9341590'
+        '77b2a764558660cbc16325eacca3a2b17d3071d59c7a956a43c796a8d9374f5d202012e13a50ef4d978e2826009d9f1a93fb118d97e27e4cfbf0569e1d781082')
 _dir="$_pkgname-$pkgver"
 
 prepare() {
     cd $_dir
 
+    ################################################################
+    #                                                              #
+    #  If someone has better solutions for the rewritten patches,  #
+    #                      please contact me!                      #
+    #                                                              #
+    ################################################################
+
     # the repo with original 24-bit-color.patch is no longer available:
     # https://gist.githubusercontent.com/dan-santana/63271adf12171e0fc0bc/raw/70c6343d1c0b3bca0aba4f587ed501e6cbd98d00/24-bit-color.patch
     # patch rewritten to work with version ≥ 9.26
@@ -69,16 +75,6 @@ prepare() {
     # https://gist.githubusercontent.com/emonkak/28bbc5474697695321452b6d9bf1d0bd/raw/a888c37ae10376598e663cf989132648f89219c0/rxvt-unicode-9.22-improve-font-endering.patch
     # patch rewritten to work with version ≥ 9.29
     patch -p0 -i ../improve-font-rendering.patch
-
-    ################################################################
-    #                                                              #
-    #  If someone has better solutions for the rewritten patches,  #
-    #                      please contact me!                      #
-    #                                                              #
-    ################################################################
-
-    # patch to fix perl module background by ferdig
-    patch -p0 -i ../perl-background-fix.patch
 }
 
 build() {
@@ -88,11 +84,10 @@ build() {
     #                                                              #
     #   This is an opinionated build. If you miss features, feel   #
     #   free to enable them below before you build the package.    #
-    #           (eg. --enable-pixbuf and --enable-fading)          #
+    #          (e.g. --enable-pixbuf and --enable-fading)          #
     #                                                              #
     ################################################################
 
-    # disable smart-resize (FS#34807)
     # do not specify --with-terminfo (FS#46424)
     ./configure \
         --prefix=/usr \
diff --git a/enable-wide-glyphs.patch b/enable-wide-glyphs.patch
index cf49b06e23c6..cb15659b1a78 100644
--- a/enable-wide-glyphs.patch
+++ b/enable-wide-glyphs.patch
@@ -173,7 +173,7 @@
            // the xft font cell might differ from the terminal font cell,
 --- src/screen.C
 +++ src/screen.C
-@@ -975,7 +975,61 @@
+@@ -976,7 +976,61 @@
  # endif
  #endif
  
@@ -236,7 +236,7 @@
  
            // if the character doesn't fit into the remaining columns...
            if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
-@@ -2434,7 +2488,12 @@
+@@ -2435,7 +2489,12 @@
                  text--, count++, xpixel -= fwidth;
  
                // force redraw after "careful" characters to avoid pixel droppings
@@ -252,7 +252,7 @@
                // force redraw before "careful" characters to avoid pixel droppings
 --- src/xdefaults.C
 +++ src/xdefaults.C
-@@ -298,6 +298,9 @@
+@@ -299,6 +299,9 @@
  #if ENABLE_STYLES
                                      "styles,"
  #endif
diff --git a/improve-font-rendering.patch b/improve-font-rendering.patch
index daac7b6838d8..2432483dde8c 100644
--- a/improve-font-rendering.patch
+++ b/improve-font-rendering.patch
@@ -150,7 +150,7 @@
            // in which case we use the average between the two.
 --- src/screen.C
 +++ src/screen.C
-@@ -2538,8 +2538,8 @@
+@@ -2539,8 +2539,8 @@
                  XSetForeground (dpy, gc, lookup_color(fore, pix_colors));
  
                XDrawLine (dpy, vt, gc,
diff --git a/perl-background-fix.patch b/perl-background-fix.patch
deleted file mode 100644
index 4fbe8cade475..000000000000
--- a/perl-background-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/perl/background
-+++ src/perl/background
-@@ -988,7 +988,7 @@
-          if FOCUS;
- 
-       my $fade   = @_ >= 1 ? $_[0] : defined $self->resource ("fade") ? $self->resource ("fade") * 0.01 : 0;
--      my $color  = @_ >= 2 ? $_[1] : $self->resource ("color+" . urxvt::Color_fade);
-+      my $color  = @_ >= 2 ? $_[1] : $self->resource ("color+" . 'urxvt::Color_fade');
- 
-       $img = $img->tint ($color)         if $color ne "rgb:00/00/00";
-       $img = $img->muladd (1 - $fade, 0) if $fade;